diff --git a/include/views/default/seven/frontend/help.phtml b/include/views/default/seven/frontend/help.phtml index 13914761e..8a9268dce 100644 --- a/include/views/default/seven/frontend/help.phtml +++ b/include/views/default/seven/frontend/help.phtml @@ -1,4 +1,4 @@ - +
diff --git a/include/views/default/seven/frontend/location.phtml b/include/views/default/seven/frontend/location.phtml index d6e04a0d8..7b9cfef16 100644 --- a/include/views/default/seven/frontend/location.phtml +++ b/include/views/default/seven/frontend/location.phtml @@ -1,5 +1,5 @@
- +
diff --git a/include/views/default/seven/layout/html.body.phtml b/include/views/default/seven/layout/html.body.phtml index f1bedf14f..5e3288d0c 100644 --- a/include/views/default/seven/layout/html.body.phtml +++ b/include/views/default/seven/layout/html.body.phtml @@ -183,4 +183,3 @@
- diff --git a/include/views/default/seven/layout/html.phtml b/include/views/default/seven/layout/html.phtml index e238d2538..29ad524b0 100644 --- a/include/views/default/seven/layout/html.phtml +++ b/include/views/default/seven/layout/html.phtml @@ -5,6 +5,7 @@ +bundle) : ?> @@ -12,4 +13,23 @@ display('bundle/js', ['set' => ['scripts' => ['app']]])?> -display('layout/html.bottom')?> \ No newline at end of file +display('layout/html.bottom')?> + + + + diff --git a/www/assets/css/seven.css b/www/assets/css/seven.css index 2914d21be..7f60ddec7 100644 --- a/www/assets/css/seven.css +++ b/www/assets/css/seven.css @@ -114,14 +114,13 @@ html { .menu { - background: url(/assets/images/micro/menu.svg) no-repeat; - background-position: center center; + background: url(/assets/images/micro/menu.svg) center center no-repeat; + background-size: 100%; width: 44px; height: 28px; - background-size: 100%; float: left; margin: 8px 0 0 25px; - -webkit-transition: all 0.2s; + -webkit-transition: opacity 0.2s; cursor: pointer; } @@ -374,6 +373,9 @@ p { .menu.side { display: none; } + .top-pad { + height: 90px; + } } @media(max-width:499px) { .logo { @@ -389,6 +391,9 @@ p { .menu.side { display: block; } + .top-pad { + height: 65px; + } } .divider { clear: both; @@ -603,4 +608,25 @@ p { .nav-top { background: #f78155; padding-top: 15px; +} + +.nav-cart { + display:none; +} + +.page-location .nav-top { + -webkit-transition:background 0.2s ease; + -moz-transition:background 0.2s ease; + -ms-transition:background 0.2s ease; + -o-transition:background 0.2s ease; + transition:background 0.2s ease; +} + +.page-location .nav-top.at-top { + background: none; +} + +.page-location .nav-top.at-top .menu { + background: url(/assets/images/micro/menu-location.svg) center center no-repeat; + background-size: 100%; } \ No newline at end of file diff --git a/www/assets/images/micro/menu-location.svg b/www/assets/images/micro/menu-location.svg new file mode 100644 index 000000000..0ef532057 --- /dev/null +++ b/www/assets/images/micro/menu-location.svg @@ -0,0 +1,39 @@ + + + + + + + + + + diff --git a/www/assets/images/micro/menu.svg b/www/assets/images/micro/menu.svg index 0ef532057..563fc97ca 100644 --- a/www/assets/images/micro/menu.svg +++ b/www/assets/images/micro/menu.svg @@ -3,8 +3,8 @@ - +