From 6086920c9c6bbadb0040f125b37cbed3317cda17 Mon Sep 17 00:00:00 2001 From: Mike Ng Date: Wed, 6 Jun 2018 11:53:27 +0400 Subject: [PATCH] update breakpoint and modify ui of search bar --- resources/www/_shared/styles/_main-menu.scss | 28 +++++++++++++++----- templates/web/common/menubar.html.twig | 4 +-- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/resources/www/_shared/styles/_main-menu.scss b/resources/www/_shared/styles/_main-menu.scss index ee135a49d1..64173e339b 100644 --- a/resources/www/_shared/styles/_main-menu.scss +++ b/resources/www/_shared/styles/_main-menu.scss @@ -129,22 +129,36 @@ $mainMenuBottomBorder: none !default; } } -@media screen and (max-width: 760px) { - .mobilemenu { - display: block; +@media screen and (max-width: 1064px) { + #rightFrame { + #idFrameT { + top: 100px; + } + } + .searchFormWrapper { + .controls-row { + .input-append { + float: none !important; + } + .control-group { + float: none !important; + } + } } #mainMenu { .show-menu { display: inline-block; cursor: pointer; } + .mobilemenu { + display: block; + } .desktopmenu { display: none; } #nav_menu_container, #nav_customlink_container, #nav_account_container { position: absolute; top: 35px; - width: 172px; z-index: 1000; .nav_menu { z-index: 1000; @@ -193,12 +207,13 @@ $mainMenuBottomBorder: none !default; } } #nav_menu_container { - top: 35px; + left: 10px; + width: 172px; .nav_menu { top: 9px; } .arrow-up { - left: 62px; + left: 52px; display: block; position: absolute; } @@ -236,6 +251,7 @@ $mainMenuBottomBorder: none !default; } } #nav_account_container { + display: none; position: relative; right: 10px; width: auto; diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig index 9df99b36b4..5be849ec7f 100644 --- a/templates/web/common/menubar.html.twig +++ b/templates/web/common/menubar.html.twig @@ -359,7 +359,7 @@ var windowSize = $(window).width(); $(window).resize(function (event) { windowSize = $(window).width(); - if (windowSize > 760) { + if (windowSize > 1064) { if ($('#nav_menu_container').is(":hidden")) { $('#nav_menu_container').show(); } @@ -370,7 +370,7 @@ if ($('#nav_account_container').is(":visible")) { $('#nav_account_container').hide(); } - } else if (windowSize <= 760) { + } else if (windowSize <= 1064) { if ($('#nav_customlink_container').is(":visible")) { $('#nav_customlink_container').hide(); }