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

diff --git a/resources/assets/sass/_header.scss b/resources/assets/sass/_header.scss
index aa7c2f471..c4ca4607a 100644
--- a/resources/assets/sass/_header.scss
+++ b/resources/assets/sass/_header.scss
@@ -2,118 +2,116 @@
  * Includes the main navigation header and the faded toolbar.
  */
 
+header .grid {
+  grid-template-columns: auto min-content auto;
+}
+
+@include smaller-than($l) {
+  header .grid {
+    grid-template-columns: 1fr;
+    grid-row-gap: 0;
+  }
+}
+
 header {
+  position: relative;
   display: block;
-  z-index: 2;
+  z-index: 6;
   top: 0;
   background-color: $primary-dark;
   color: #fff;
-  .padded {
-    padding: $-m;
-  }
+  fill: #fff;
   border-bottom: 1px solid #DDD;
-  //margin-bottom: $-l;
+  box-shadow: $bs-card;
+  padding: $-xxs 0;
   .links {
     display: inline-block;
     vertical-align: top;
-    margin-right: $-xl;
-    @include smaller-than($screen-md) {
-      margin-right: $-m;
-    }
   }
   .links a {
     display: inline-block;
-    padding: $-l;
+    padding: $-m;
     color: #FFF;
-    &:last-child {
-      padding-right: 0;
-    }
-    @include smaller-than($screen-md) {
-      padding: $-l $-s;
-    }
+    fill: #FFF;
+  }
+  .dropdown-container {
+    padding-left: $-m;
+    padding-right: 0;
   }
   .avatar, .user-name {
     display: inline-block;
   }
   .avatar {
-    //margin-top: (45px/2);
     width: 30px;
     height: 30px;
   }
   .user-name {
     vertical-align: top;
-    padding-top: $-l;
+    padding-top: $-m;
+    position: relative;
+    top: -3px;
     display: inline-block;
     cursor: pointer;
     > * {
       vertical-align: top;
     }
-    > span, > i {
+    > span {
       padding-left: $-xs;
       display: inline-block;
-    }
-    > span {
       padding-top: $-xxs;
     }
-    > i {
+    > svg {
       padding-top: 4px;
       font-size: 18px;
     }
-    @include smaller-than($screen-md) {
+    @include between($l, $xl) {
       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 {
-  margin-top: $-l *0.9;
+
+
+.header-search {
   display: inline-block;
-  position: relative;
-  text-align: left;
+}
+header .search-box {
+  display: inline-block;
+  margin-top: 10px;
   input {
-    background-color: transparent;
-    border-radius: 24px;
-    border: 2px solid #EEE;
+    background-color: rgba(0, 0, 0, 0.2);
+    border: 1px solid rgba(255, 255, 255, 0.2);
+    border-radius: 40px;
     color: #EEE;
-    padding-left: $-m;
-    padding-right: $-l;
-    outline: 0;
+    z-index: 2;
+    padding-left: 40px;
   }
   button {
-    vertical-align: top;
-    margin-left: -$-l;
-    color: #FFF;
-    top: 6px;
-    right: 4px;
-    display: inline-block;
-    position: absolute;
-    &:hover {
-      color: #FFF;
+    fill: #EEE;
+    z-index: 1;
+    left: 16px;
+    svg {
+      margin-right: 0;
     }
   }
+  ::-webkit-input-placeholder { /* Chrome/Opera/Safari */
+    color: #DDD;
+  }
+  ::-moz-placeholder { /* Firefox 19+ */
+    color: #DDD;
+  }
+  :-ms-input-placeholder { /* IE 10+ */
+    color: #DDD;
+  }
+  :-moz-placeholder { /* Firefox 18- */
+    color: #DDD;
+  }
+  @include between($l, $xl) {
+    max-width: 200px;
+  }
 }
 
 .logo {
@@ -128,24 +126,199 @@ form.search-box {
   font-size: 1.8em;
   color: #fff;
   font-weight: 400;
-  padding: $-l $-l $-l 0;
+  padding: 14px $-l 14px 0;
   vertical-align: top;
   line-height: 1;
 }
 .logo-image {
-  margin: $-m $-s $-m 0;
+  margin: $-xs $-s $-xs 0;
   vertical-align: top;
   height: 43px;
 }
 
-.breadcrumbs span.sep {
-  color: #aaa;
+.mobile-menu-toggle {
+  color: #FFF;
+  fill: #FFF;
+  font-size: 2em;
+  border: 2px solid rgba(255, 255, 255, 0.8);
+  border-radius: 4px;
   padding: 0 $-xs;
+  position: absolute;
+  right: $-m;
+  top: 13px;
+  line-height: 1;
+  cursor: pointer;
+  user-select: none;
+  svg {
+    margin: 0;
+    bottom: -2px;
+  }
+}
+
+@include smaller-than($l) {
+  header .header-links {
+    display: none;
+    background-color: #FFF;
+    z-index: 10;
+    right: $-m;
+    border-radius: 4px;
+    overflow: hidden;
+    position: absolute;
+    box-shadow: $bs-hover;
+    margin-top: -$-xs;
+    &.show {
+      display: block;
+    }
+  }
+  header .links a, header .dropdown-container ul li a {
+    text-align: left;
+    display: block;
+    padding: $-s $-m;
+    color: $text-dark;
+    fill: $text-dark;
+    svg {
+      margin-right: $-s;
+    }
+    &:hover {
+      background-color: #EEE;
+      color: #444;
+      fill: #444;
+      text-decoration: none;
+    }
+  }
+  header .dropdown-container {
+    display: block;
+    padding-left: 0;
+  }
+  header .links {
+    display: block;
+  }
+  header .dropdown-container ul {
+    display: block !important;
+    position: relative;
+    background-color: transparent;
+    border: 0;
+    padding: 0;
+    margin: 0;
+    box-shadow: none;
+  }
+}
+
+.tri-layout-mobile-tabs {
+  position: sticky;
+  top: 0;
+  z-index: 5;
+  background-color: #FFF;
+  border-bottom: 1px solid #DDD;
+  box-shadow: $bs-card;
+}
+.tri-layout-mobile-tab {
+  text-align: center;
+  border-bottom: 3px solid #BBB;
+  cursor: pointer;
+  &:first-child {
+    border-right: 1px solid #DDD;
+  }
+  &.active {
+    border-bottom-color: currentColor;
+  }
+}
+
+.breadcrumbs {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start;
+  flex-wrap: wrap;
+  opacity: 0.7;
+  .icon-list-item {
+    width: auto;
+    padding-top: $-xs;
+    padding-bottom: $-xs;
+  }
+  .separator {
+    display: inline-block;
+    fill: #aaa;
+    font-size: 1.6em;
+    line-height: 0.8;
+    margin: -2px 0 0;
+  }
+  &:hover {
+    opacity: 1;
+  }
+}
+
+@include smaller-than($l) {
+  .breadcrumbs .icon-list-item {
+    padding: $-xs;
+    > span + span {
+      display: none;
+    }
+    > span:first-child {
+      margin-right: 0;
+    }
+  }
+}
+
+.breadcrumb-listing {
+  position: relative;
+  .breadcrumb-listing-toggle {
+    padding: 6px;
+    border: 1px solid transparent;
+    border-radius: 4px;
+    &:hover {
+      border-color: #DDD;
+    }
+  }
+  .svg-icon {
+    margin-right: 0;
+  }
+}
+
+.breadcrumb-listing-dropdown {
+  box-shadow: $bs-med;
+  overflow: hidden;
+  min-height: 100px;
+  width: 240px;
+  display: none;
+  position: absolute;
+  z-index: 80;
+  right: -$-m;
+  .breadcrumb-listing-search .svg-icon {
+    position: absolute;
+    left: $-s;
+    top: 11px;
+    fill: #888;
+    pointer-events: none;
+  }
+  .breadcrumb-listing-entity-list {
+    max-height: 400px;
+    overflow-y: scroll;
+    text-align: left;
+  }
+  input {
+    padding-left: $-xl;
+    border-radius: 0;
+    border: 0;
+    border-bottom: 1px solid #DDD;
+  }
+}
+
+@include smaller-than($m) {
+  .breadcrumb-listing-dropdown {
+    position: fixed;
+    right: auto;
+    left: $-m;
+  }
+  .breadcrumb-listing-dropdown .breadcrumb-listing-entity-list {
+    max-height: 240px;
+  }
 }
 
 .faded {
   a, button, span, span > div {
     color: #666;
+    fill: #666;
   }
   .text-button {
     opacity: 0.5;
@@ -162,18 +335,21 @@ form.search-box {
   padding: $-s;
 }
 
-.faded-small {
-  color: #000;
-  font-size: 0.9em;
-  background-color: $primary-faded;
-}
-
-.breadcrumbs .text-button, .action-buttons .text-button {
+.action-buttons .text-button {
   display: inline-block;
-  padding: $-s;
+  padding: $-xs $-s;
   &:last-child {
     padding-right: 0;
   }
+  &:first-child {
+    padding-left: 0;
+  }
+}
+
+
+.action-buttons .dropdown-container:last-child a {
+  padding-right: 0;
+  padding-left: $-s;
 }
 .action-buttons {
   text-align: right;
@@ -189,12 +365,23 @@ form.search-box {
   }
 }
 
-.setting-nav {
+@include smaller-than($m) {
+  .action-buttons .text-button {
+    padding: $-xs $-xs;
+  }
+  .action-buttons .dropdown-container:last-child a {
+    padding-left: $-xs;
+  }
+}
+
+.nav-tabs {
   text-align: center;
-  a {
+  a, .tab-item {
     padding: $-m;
     display: inline-block;
     color: #666;
+    fill: #666;
+    cursor: pointer;
     &.selected {
       border-bottom: 2px solid $primary;
     }