Adjust header sizing

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index ba3583eeada2a6b91364730bb0c3a303e6779b28..6468635cfddabfbe2e7fc5ec80bd620b7267f267 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -248,7 +248,7 @@ header {
   height: $headerHeight;
   position: relative;
   z-index: 1001;
   height: $headerHeight;
   position: relative;
   z-index: 1001;

-  font-size: 13px;
+  font-size: 14px;

 
   h1, nav, nav > ul, nav > ul > li, .dropdown {
     display: inline-block;
 
   h1, nav, nav > ul, nav > ul > li, .dropdown {
     display: inline-block;


@@ -270,7 +270,7 @@ header {
   img.logo {
     width: 30px;
     height: 30px;
   img.logo {
     width: 30px;
     height: 30px;

-    margin-top: -4px;
+    margin-top: -2px;

     vertical-align: middle;
   }
 
     vertical-align: middle;
   }
 


@@ -357,7 +357,7 @@ nav.secondary {
       display: inline-block;
       text-decoration: none;
       color: $darkgrey;
       display: inline-block;
       text-decoration: none;
       color: $darkgrey;

-      padding: 5px;
+      padding: 3px 5px 5px 5px;

 
       &:hover { color: darken($darkgrey, 25%); }
     }
 
       &:hover { color: darken($darkgrey, 25%); }
     }


@@ -369,8 +369,6 @@ nav.secondary {
 
   .user-menu {
     $border: 1px solid $grey;
 
   .user-menu {
     $border: 1px solid $grey;

-    font-weight: bold;
-    font-weight: 500;

     border: $border;
     border-radius: $border-radius;
     margin-left: 10px;
     border: $border;
     border-radius: $border-radius;
     margin-left: 10px;


@@ -397,7 +395,8 @@ nav.secondary {
     &.logged-in > a {
       padding: 0;
       > .user-button {
     &.logged-in > a {
       padding: 0;
       > .user-button {

-        padding: 5px 10px 5px 6px;
+        line-height: 1.8;
+        padding: 5px 10px 3px 6px;

         display: inline-block;
         color: $darkgrey;
       }
         display: inline-block;
         color: $darkgrey;
       }


@@ -414,7 +413,7 @@ nav.secondary {
     border: 0;
     vertical-align: top;
     margin-top: 0px;
     border: 0;
     vertical-align: top;
     margin-top: 0px;

-    margin: 3px 0 0 3px;
+    margin: 4px 0 0 4px;

     border-radius: 2px;
   }
 
     border-radius: 2px;
   }
 

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 2e3651aca1cb5f3d2b03175271219da11388927a..536562cf368d5e306265ee5f25644c69c2e9d37b 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -11,7 +11,7 @@ $red: red;
 $lightgrey: #EEE;
 $darkgrey: #888;
 $hovercolor: 20%;
 $lightgrey: #EEE;
 $darkgrey: #888;
 $hovercolor: 20%;

-$headerHeight: 54px;
+$headerHeight: 55px;

 $sidebarWidth: 300px;
 $keyline: 1px solid $lightgrey;
 $border-radius: 3px;
 $sidebarWidth: 300px;
 $keyline: 1px solid $lightgrey;
 $border-radius: 3px;