hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

update breakpoint and modify ui of search bar

Browse Source
This commit is contained in:
Mike Ng
2018-06-06 11:53:27 +04:00
parent 109cda896d
commit 6086920c9c
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
resources/www/_shared/styles/_main-menu.scss
View File

@@ -129,22 +129,36 @@ $mainMenuBottomBorder: none !default;
} }
} }
@media screen and (max-width: 760px) { @media screen and (max-width: 1064px) {
.mobilemenu { #rightFrame {
display: block; #idFrameT {
top: 100px;
}
}
.searchFormWrapper {
.controls-row {
.input-append {
float: none !important;
}
.control-group {
float: none !important;
}
}
} }
#mainMenu { #mainMenu {
.show-menu { .show-menu {
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
} }
.mobilemenu {
display: block;
}
.desktopmenu { .desktopmenu {
display: none; display: none;
} }
#nav_menu_container, #nav_customlink_container, #nav_account_container { #nav_menu_container, #nav_customlink_container, #nav_account_container {
position: absolute; position: absolute;
top: 35px; top: 35px;
width: 172px;
z-index: 1000; z-index: 1000;
.nav_menu { .nav_menu {
z-index: 1000; z-index: 1000;
@@ -193,12 +207,13 @@ $mainMenuBottomBorder: none !default;
} }
} }
#nav_menu_container { #nav_menu_container {
top: 35px; left: 10px;
width: 172px;
.nav_menu { .nav_menu {
top: 9px; top: 9px;
} }
.arrow-up { .arrow-up {
left: 62px; left: 52px;
display: block; display: block;
position: absolute; position: absolute;
} }
@@ -236,6 +251,7 @@ $mainMenuBottomBorder: none !default;
} }
} }
#nav_account_container { #nav_account_container {
display: none;
position: relative; position: relative;
right: 10px; right: 10px;
width: auto; width: auto;

4
templates/web/common/menubar.html.twig
View File

@@ -359,7 +359,7 @@
var windowSize = $(window).width(); var windowSize = $(window).width();
$(window).resize(function (event) { $(window).resize(function (event) {
windowSize = $(window).width(); windowSize = $(window).width();
if (windowSize > 760) { if (windowSize > 1064) {
if ($('#nav_menu_container').is(":hidden")) { if ($('#nav_menu_container').is(":hidden")) {
$('#nav_menu_container').show(); $('#nav_menu_container').show();
} }
@@ -370,7 +370,7 @@
if ($('#nav_account_container').is(":visible")) { if ($('#nav_account_container').is(":visible")) {
$('#nav_account_container').hide(); $('#nav_account_container').hide();
} }
} else if (windowSize <= 760) { } else if (windowSize <= 1064) {
if ($('#nav_customlink_container').is(":visible")) { if ($('#nav_customlink_container').is(":visible")) {
$('#nav_customlink_container').hide(); $('#nav_customlink_container').hide();
} }