issue #717: Добавить в меню ссылки на создание материала

DrupalRU · Oct 28, 2017 · 53dc9b9 · 53dc9b9
1 parent 717f82b
commit 53dc9b9
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 17 deletions.
diff --git a/profiles/drupalru/themes/druru/css/style.css b/profiles/drupalru/themes/druru/css/style.css
@@ -6858,7 +6858,7 @@ fieldset[disabled] .btn-accent.focus {
 .navbar.navbar-default .nav.secondary > li > a {
   position: relative;
   color: #fff;
-  background-color: #3a6483;
+  background-color: rgba(0, 0, 0, 0.1);
 }
 .navbar.navbar-default .nav > li {
   background: none;
@@ -9427,7 +9427,7 @@ body:not(.front) #navbar {
   background: #4e86af;
 }
 #block-advanced-sphinx-searchbox .search-sphinx {
-  height: 38px;
+  height: 100%;
   border: none;
   position: absolute;
   right: 0;
@@ -9442,10 +9442,30 @@ body:not(.front) #navbar {
   -o-transition: all width 0.2s, background 0.2s ease-out;
   transition: all width 0.2s, background 0.2s ease-out;
 }
+#block-advanced-sphinx-searchbox .search-sphinx::-moz-placeholder {
+  color: transparent;
+  opacity: 1;
+}
+#block-advanced-sphinx-searchbox .search-sphinx:-ms-input-placeholder {
+  color: transparent;
+}
+#block-advanced-sphinx-searchbox .search-sphinx::-webkit-input-placeholder {
+  color: transparent;
+}
 #block-advanced-sphinx-searchbox .search-sphinx:focus {
   background: #fafafa;
   border-top-color: #df9b10;
 }
+#block-advanced-sphinx-searchbox .search-sphinx:focus::-moz-placeholder {
+  color: #999999;
+  opacity: 1;
+}
+#block-advanced-sphinx-searchbox .search-sphinx:focus:-ms-input-placeholder {
+  color: #999999;
+}
+#block-advanced-sphinx-searchbox .search-sphinx:focus::-webkit-input-placeholder {
+  color: #999999;
+}
 #block-advanced-sphinx-searchbox .search-sphinx:focus + button {
   color: #fafafa;
   background-color: #df9b10;
@@ -9514,7 +9534,7 @@ fieldset[disabled] #block-advanced-sphinx-searchbox .search-sphinx:focus + butto
 }
 #block-advanced-sphinx-searchbox .btn {
   border: none;
-  background: #3a6483;
+  background: rgba(0, 0, 0, 0.1);
   z-index: 2;
   position: relative;
   -webkit-transition: background 0.2s;
@@ -9627,11 +9647,6 @@ fieldset[disabled] #block-advanced-sphinx-searchbox .search-sphinx:focus + butto
     left: 100%;
   }
 }
-@media screen and (min-width: 1004px) {
-  #block-advanced-sphinx-searchbox .search-sphinx {
-    height: 50px;
-  }
-}
 @media screen and (min-width: 748px) {
   #block-advanced-sphinx-searchbox .search-sphinx:focus {
     width: 27em;

diff --git a/profiles/drupalru/themes/druru/less/bootstrap/overrides/_navbar.less b/profiles/drupalru/themes/druru/less/bootstrap/overrides/_navbar.less
@@ -93,7 +93,7 @@
           > a {
             position: relative;
             color: #fff;
-            background-color: desaturate(darken(@navbar-default-bg, @tone), @tone);
+            background-color: @little-darker;
           }
         }
       }

diff --git a/profiles/drupalru/themes/druru/less/drupal/components/_search.less b/profiles/drupalru/themes/druru/less/drupal/components/_search.less
@@ -17,18 +17,20 @@
 
   .search-sphinx {
     &:extend(.navbar-nav > li > a);
-    height: 38px;
+    height: 100%;
     border: none;
     position: absolute;
     right: 0;
     z-index: 1;
     max-width: initial;
     width: 100%;
     .transition(~'width @{transition-speed}, background @{transition-speed}');
+    .placeholder(transparent);
 
     &:focus {
       background: @body-bg;
       border-top-color: @brand-accent;
+      .placeholder(@gray-light);
       + button {
         .button-variant(@body-bg, @brand-accent, darken(@brand-accent, @tone));
 
@@ -46,7 +48,7 @@
   .btn {
     &:extend(.navbar-nav > li > a);
     border: none;
-    background: desaturate(darken(@navbar-default-bg, @tone), @tone);
+    background: @little-darker;
     z-index: 2;
     position: relative;
     .transition(background @transition-speed);
@@ -96,12 +98,6 @@
     }
   }
 
-  @media @very-smalld {
-    .search-sphinx {
-      height: 50px;
-    }
-  }
-
   @media @tablet {
     .search-sphinx {
       &:focus {