Merge branch 'hotfix/fix_155'

prestarocket-agence · May 8, 2020 · bdc6bf8 · bdc6bf8
2 parents dfda6e7 + 9650106
commit bdc6bf8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/_dev/css/layout/_header.scss b/_dev/css/layout/_header.scss
@@ -19,7 +19,8 @@
   padding-right: $grid-gutter-width/2;
   padding-left: $grid-gutter-width/2;
 }
-.header__right{
+.header__right,
+.header-nav__right{
   display: flex;
   align-items: center;
   justify-content: flex-end;

diff --git a/assets/css/theme.css b/assets/css/theme.css
diff --git a/assets/img/c135a20aa76cea4876a24bf50c7c821d.svg b/assets/img/c135a20aa76cea4876a24bf50c7c821d.svg
diff --git a/config/theme.yml b/config/theme.yml
@@ -1,6 +1,6 @@
 name: classic-rocket
 display_name: Classic Rocket
-version: 2.1.0
+version: 3.0.1
 author:
   name: "Prestarocket"
   email: "[email protected]"
@@ -150,4 +150,4 @@ theme_settings:
 
 dependencies:
   modules:
-    - ps_searchbarjqauto
+    - ps_searchbarjqauto
diff --git a/templates/_partials/header.tpl b/templates/_partials/header.tpl
@@ -35,7 +35,7 @@
                 <div class="small">
                     {hook h='displayNav1'}
                 </div>
-                <div>
+                <div class="header-nav__right">
                     {hook h='displayNav2'}
                 </div>
             </div>