Merge pull request gitcoinco#46 from mbeacom/top-bar

Top bar
jasonrhaas · Oct 16, 2018 · 7152830 · 7152830
2 parents d619dd6 + f824989
commit 7152830
Show file tree

Hide file tree

Showing 54 changed files with 157 additions and 64 deletions.
diff --git a/app/assets/v2/css/top-nav.css b/app/assets/v2/css/top-nav.css
@@ -6,19 +6,16 @@
   /* max-height: 43px; */
   flex-wrap: wrap;
   flex-shrink: 0;
-  flex-direction: column;
-  flex: 1 0 45px;
-}
+  /* flex-direction: column; */
+  flex: 1 0 96px;
+  background: #0D023B;
+  justify-content: space-around;
+  border-bottom: 1px solid rgba(255,255,255,0.3);
+  padding: 0.5rem 0;
 
-@media (min-width: 768px) {
-  .top-nav {
-    background: black;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-  }
 }
 
+
 .top-nav a {
   padding: 0.6rem 1rem;
 }
@@ -33,8 +30,24 @@
   filter: grayscale(1);
   opacity: 0.6;
   transition: all 0.2s linear;
+  height: 60px;
 }
 
+@media (min-width: 768px) {
+  .top-nav {
+    flex: 1 0 45px;
+    background: black;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    border: none;
+    padding: 0;
+  }
+
+  .top-nav a img {
+    height: auto;
+  }
+}
 .top-nav a:hover img,
 .top-nav a.selected img {
   /* opacity: 1; */

diff --git a/app/assets/v2/images/top-bar/codefund-symbol.svg b/app/assets/v2/images/top-bar/codefund-symbol.svg
diff --git a/app/assets/v2/images/top-bar/gitcoin-logo.svg b/app/assets/v2/images/top-bar/gitcoin-logo.svg
diff --git a/app/assets/v2/images/top-bar/gitcoin-symbol.svg b/app/assets/v2/images/top-bar/gitcoin-symbol.svg
diff --git a/app/assets/v2/images/top-bar/grants-symbol.svg b/app/assets/v2/images/top-bar/grants-symbol.svg
diff --git a/app/assets/v2/images/top-bar/kudos-logo.svg b/app/assets/v2/images/top-bar/kudos-logo.svg
diff --git a/app/assets/v2/images/top-bar/kudos-symbol.svg b/app/assets/v2/images/top-bar/kudos-symbol.svg
diff --git a/app/bounty_requests/templates/bounty_request_form.html b/app/bounty_requests/templates/bounty_request_form.html
@@ -23,7 +23,7 @@
   </head>
   <body class="interior {{ active }} g-font-muli">
     <div class="container-fluid header dash">
-      {% include 'shared/top_nav.html' with class='d-none d-md-flex' %}
+      {% include 'shared/top_nav.html' with class='d-md-flex' %}
       {% include 'shared/nav.html' %}
     </div>
     <div class="row no-gutter">

diff --git a/app/dashboard/templates/bounty/change.html b/app/dashboard/templates/bounty/change.html
@@ -25,7 +25,7 @@
 <body class="interior submit_bounty g-font-muli">
   {% include 'shared/tag_manager_2.html' %}
   <div class="container-fluid header dash">
-    {% include 'shared/top_nav.html' with class='d-none d-md-flex' %}
+    {% include 'shared/top_nav.html' with class='d-md-flex' %}
     {% include 'shared/nav.html' %}
   </div>
   <div class="container-fluid submit_bounty_content">

diff --git a/app/dashboard/templates/bounty/details.html b/app/dashboard/templates/bounty/details.html
@@ -12,7 +12,7 @@
   <body class="interior {{active}} g-font-muli">
     {% include 'shared/tag_manager_2.html' %}
     <div class="container-fluid header dash">
-      {% include 'shared/top_nav.html' with class='d-none d-md-flex' %}
+      {% include 'shared/top_nav.html' with class='d-md-flex' %}
       {% include 'shared/nav.html' %}
     </div>
     <div class="row no-gutter">