X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/d990c3cec9de1177cd6281bb7c932f34a4f921be..refs/pull/360/head:/resources/assets/sass/_header.scss

diff --git a/resources/assets/sass/_header.scss b/resources/assets/sass/_header.scss
index 14a9626ed..12bd17076 100644
--- a/resources/assets/sass/_header.scss
+++ b/resources/assets/sass/_header.scss
@@ -17,6 +17,9 @@ header {
     display: inline-block;
     vertical-align: top;
     margin-right: $-xl;
+    @include smaller-than($screen-md) {
+      margin-right: $-m;
+    }
   }
   .links a {
     display: inline-block;
@@ -25,25 +28,64 @@ header {
     &:last-child {
       padding-right: 0;
     }
+    @include smaller-than($screen-md) {
+      padding: $-l $-s;
+    }
   }
   .avatar, .user-name {
     display: inline-block;
   }
   .avatar {
-    margin-top: (45px/2);
+    //margin-top: (45px/2);
     width: 30px;
     height: 30px;
   }
   .user-name {
     vertical-align: top;
-    padding-top: 25.5px;
-    padding-left: $-m;
+    padding-top: $-l;
     display: inline-block;
     cursor: pointer;
-    i {
+    > * {
+      vertical-align: top;
+    }
+    > span, > i {
+      padding-left: $-xs;
+      display: inline-block;
+    }
+    > span {
+      padding-top: $-xxs;
+    }
+    > i {
+      padding-top: 4px;
+      font-size: 18px;
+    }
+    @include smaller-than($screen-md) {
       padding-left: $-xs;
+      .name {
+        display: none;
+      }
+    }
+  }
+  @include smaller-than($screen-md) {
+    text-align: center;
+    .float.right {
+      float: none;
+    }
+  }
+  @include smaller-than($screen-sm) {
+    .links a {
+      padding: $-s;
+    }
+    form.search-box {
+      margin-top: 0;
+    }
+    .user-name {
+      padding-top: $-s;
     }
   }
+  .dropdown-container {
+    font-size: 0.9em;
+  }
 }
 
 form.search-box {
@@ -53,10 +95,10 @@ form.search-box {
   text-align: left;
   input {
     background-color: transparent;
-    border-radius: 0;
-    border: none;
-    border-bottom: 2px solid #EEE;
+    border-radius: 24px;
+    border: 2px solid #EEE;
     color: #EEE;
+    padding-left: $-m;
     padding-right: $-l;
     outline: 0;
   }
@@ -64,8 +106,8 @@ form.search-box {
     vertical-align: top;
     margin-left: -$-l;
     color: #FFF;
-    top: 0;
-    right: 0;
+    top: 6px;
+    right: 4px;
     display: inline-block;
     position: absolute;
     &:hover {
@@ -76,57 +118,24 @@ form.search-box {
 
 .logo {
   display: inline-block;
-  font-size: 1.8em;
-  color: #fff;
-  font-weight: 400;
-  padding: $-l $-l $-l 0;
-  vertical-align: top;
-  line-height: 1;
   &:hover {
     color: #FFF;
     text-decoration: none;
   }
 }
-
-.dropdown-container {
+.logo-text {
   display: inline-block;
+  font-size: 1.8em;
+  color: #fff;
+  font-weight: 400;
+  padding: $-l $-l $-l 0;
   vertical-align: top;
-  position: relative;
+  line-height: 1;
 }
-
-.dropdown-container ul {
-  display: none;
-  position: absolute;
-  z-index: 999;
-  top: 0;
-  left: 0;
-  margin: $-m 0;
-  background-color: #FFFFFF;
-  list-style: none;
-  box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.1);
-  border-radius: 1px;
-  border: 1px solid #EEE;
-  min-width: 180px;
-  padding: $-xs 0;
-  color: #555;
-  a {
-    display: block;
-    padding: $-xs $-m;
-    color: #555;
-    &:hover {
-      text-decoration: none;
-      background-color: #EEE;
-    }
-    i {
-      margin-right: $-m;
-      padding-right: 0;
-      display: inline;
-      width: 22px;
-    }
-  }
-  li.border-bottom {
-    border-bottom: 1px solid #DDD;
-  }
+.logo-image {
+  margin: $-m $-s $-m 0;
+  vertical-align: top;
+  height: 43px;
 }
 
 .breadcrumbs span.sep {
@@ -135,7 +144,7 @@ form.search-box {
 }
 
 .faded {
-  a, button, span {
+  a, button, span, span > div {
     color: #666;
   }
   .text-button {
@@ -146,12 +155,18 @@ form.search-box {
       text-decoration: none;
     }
   }
+
+}
+
+.faded span.faded-text {
+  display: inline-block;
+  padding: $-s;
 }
 
 .faded-small {
   color: #000;
   font-size: 0.9em;
-  background-color: rgba(21, 101, 192, 0.15);
+  background-color: $primary-faded;
 }
 
 .breadcrumbs .text-button, .action-buttons .text-button {
@@ -170,14 +185,18 @@ form.search-box {
       padding-left: 0;
     }
   }
+  &.text-center {
+    text-align: center;
+  }
 }
 
-.setting-nav {
+.nav-tabs {
   text-align: center;
-  a {
+  a, .tab-item {
     padding: $-m;
     display: inline-block;
     color: #666;
+    cursor: pointer;
     &.selected {
       border-bottom: 2px solid $primary;
     }