Merge branch 'release/1.6.1'

getgrav · Dec 10, 2016 · 4f51bd2 · 4f51bd2
2 parents 4bba462 + f00cc7e
commit 4f51bd2
Show file tree

Hide file tree

Showing 5 changed files with 106 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v1.6.1
+## 12/10/2016
+
+1. [](#improved)
+    * Added background animation when scrolling the menu in sticky mode
+1. [](#bugfix)
+    * Fixed some mobile alignments for hamburger and search icons in sticky mode
+
 # v1.6.0
 ## 12/09/2016
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Deliver
-version: 1.6.0
+version: 1.6.1
 description: "Deliver theme is a port of the Michael Reimer's Deliver Free PSD theme."
 icon: newspaper-o
 author:

diff --git a/css-compiled/template.css b/css-compiled/template.css
diff --git a/css-compiled/template.css.map b/css-compiled/template.css.map
diff --git a/scss/template/_header.scss b/scss/template/_header.scss
@@ -26,6 +26,11 @@
         width: 100%;
         opacity: 0.9;
         box-shadow: 0 0px 20px 0px rgba(0,0,0,0.2);
+
+        @include breakpoint(mobile-only) {
+            padding-left: 10px;
+            padding-right: 10px;
+        }
     }
 
     .logo {
@@ -92,14 +97,19 @@
             color: transparent;
         }
 
-        @include breakpoint(mobile-only) {
-            float: left;
-            text-align: left;
+        @include breakpoint(desktop-only) {
+            text-align: right;
+            position: absolute;
+            right: 10px;
+
+            top: 50%;
+            @include transform(translateY(1rem));
+
             i {
                 left: 0.6rem;
             }
             input[type=search] {
-                padding-left: 2rem;
+                padding-right: 2rem;
                 &:focus {
                     width: 8rem;
                 }
@@ -108,8 +118,34 @@
 
     }
 
+    .fixed {
+        .search-box {
+            @include breakpoint(desktop-only) {
+                top: 50%;
+                @include transform(translateY(-50%));
+            }
+        }
+
+        .panel-activation {
+            @include breakpoint(desktop-only) {
+                top: 50% !important;
+                @include transform(translateY(-50%) !important);
+            }
+        }
+    }
+
     #navbar {
         font-size: $core-font-size + 0.1rem;
+
+        @include breakpoint(mobile-only) {
+            margin-left: -1rem;
+            margin-right: -1rem;
+
+            &.fixed {
+                margin: 0;
+            }
+        }
+
         ul {
 
             margin: 0;
@@ -196,13 +232,18 @@
             float: right;
             @include breakpoint(desktop-only) {
                 display: inline-block;
+                position: absolute;
+                left: 0;
+                top: 50%;
+                @include transform(translateY(0));
             }
         }
     }
 }
 
 .modular.header-image #header .fixed {
     background: #666;
+    @include transition(background 0.3s ease-in-out);
 }
 
 .header-image {
@@ -291,4 +332,4 @@
             }
         }
     }
-}
+}