From 0a85145ad23d93fd8a7ff6270e6172b654e80540 Mon Sep 17 00:00:00 2001 From: Mike Ng Date: Mon, 4 Jun 2018 17:27:31 +0400 Subject: [PATCH 1/2] refactor dialog for subdef creation and new user --- resources/www/_shared/styles/_main-menu.scss | 115 ++++- .../www/common/images/icons/menu-admin.png | Bin 0 -> 513 bytes .../www/common/images/icons/menu-burger.png | Bin 0 -> 859 bytes .../www/common/images/icons/menu-help.png | Bin 0 -> 680 bytes .../www/common/images/icons/menu-lightbox.png | Bin 0 -> 508 bytes .../www/common/images/icons/menu-logout.png | Bin 0 -> 495 bytes .../common/images/icons/menu-name-user.png | Bin 0 -> 513 bytes .../www/common/images/icons/menu-prod.png | Bin 0 -> 582 bytes .../common/images/icons/menu-publication.png | Bin 0 -> 782 bytes .../www/common/images/icons/menu-report.png | Bin 0 -> 632 bytes .../common/images/icons/menu-thesaurus.png | Bin 0 -> 610 bytes .../www/common/images/icons/menu-upload.png | Bin 0 -> 373 bytes .../www/common/images/icons/menu-user.png | Bin 0 -> 807 bytes .../www/common/images/icons/menu-web-site.png | Bin 0 -> 1326 bytes templates/web/common/menubar.html.twig | 428 ++++++++++++------ 15 files changed, 373 insertions(+), 170 deletions(-) create mode 100644 resources/www/common/images/icons/menu-admin.png create mode 100644 resources/www/common/images/icons/menu-burger.png create mode 100644 resources/www/common/images/icons/menu-help.png create mode 100644 resources/www/common/images/icons/menu-lightbox.png create mode 100644 resources/www/common/images/icons/menu-logout.png create mode 100644 resources/www/common/images/icons/menu-name-user.png create mode 100644 resources/www/common/images/icons/menu-prod.png create mode 100644 resources/www/common/images/icons/menu-publication.png create mode 100644 resources/www/common/images/icons/menu-report.png create mode 100644 resources/www/common/images/icons/menu-thesaurus.png create mode 100644 resources/www/common/images/icons/menu-upload.png create mode 100644 resources/www/common/images/icons/menu-user.png create mode 100644 resources/www/common/images/icons/menu-web-site.png diff --git a/resources/www/_shared/styles/_main-menu.scss b/resources/www/_shared/styles/_main-menu.scss index dc99bdaf3f..27ebf231d7 100644 --- a/resources/www/_shared/styles/_main-menu.scss +++ b/resources/www/_shared/styles/_main-menu.scss @@ -10,6 +10,7 @@ $mainMenuLinkHoverColor: #000000 !default; $mainMenuMarginBottom: 0 !default; $mainMenuBottomBorder: none !default; + #mainMenu { height: $mainMenuHeight; line-height: $mainMenuLineHeight; @@ -19,6 +20,20 @@ $mainMenuBottomBorder: none !default; margin-bottom: $mainMenuMarginBottom; z-index: 100; box-sizing: border-box; + .arrow-up { + display: none; + width: 0; + height: 0; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 9px solid #d8d8d8; + } + .mobilemenu { + display: none; + } + .desktopmenu { + display: inline-block; + } .show-menu { display: none; i { @@ -26,6 +41,9 @@ $mainMenuBottomBorder: none !default; vertical-align: middle; color: $mainMenuLinkActiveColor; } + img { + margin-top: 5px; + } } ol { display: block; @@ -33,9 +51,8 @@ $mainMenuBottomBorder: none !default; padding: 0; list-style: none outside none; } - #custom-link-container { + #nav_notification_container { display: inline-block; - margin-left: 10px; } #mainLogo { margin:0 10px; @@ -110,34 +127,92 @@ $mainMenuBottomBorder: none !default; } @media screen and (max-width: 760px) { + .mobilemenu { + display: block; + } #mainMenu { .show-menu { - display: block; + display: inline-block; + cursor: pointer; } - #nav_menu { + .desktopmenu { display: none; + } + #nav_menu_container, #nav_customlink_container, #nav_account_container { + position: absolute; + top: 35px; + width: 172px; z-index: 1000; - ol { - position: static; - } - li.menu-bar-item { - width: 100%; - clear: both; - background: $mainMenuBackgroundColor; - border-bottom: 1px solid $mainMenuLinkActiveColor; + .nav_menu { z-index: 1000; - } - li.menu-bar-item a { + position: absolute; + border-radius: 5px; + background-color: #d8d8d8; width: 100%; - > span { - text-align: center; - font-size: 14px; - font-weight: bold; - &.selected { - border-top: none !important; + .bullet-type { + padding: 0; + } + .bullet-type:before { + content: "• "; + } + li.menu-bar-item { + left: 10px; + width: 151px; + clear: both; + border-bottom: 1px solid #b7b7b7; + z-index: 1000; + } + li.menu-bar-item a { + width: 100%; + > img { + float: left; + margin-top: 11px; + margin-right: 11px; + display: block; } + > span { + text-align: left; + font-size: 14px; + font-family: Roboto; + font-weight: 500; + font-style: normal; + font-stretch: normal; + letter-spacing: normal; + color: #4a4a4a; + &.selected { + border-top: 3px solid transparent; + } + } + } + li.menu-bar-item:last-child { + border-bottom: none; } } } + #nav_customlink_container { + left: 10px; + .arrow-up { + margin-left: 82px; + display: block; + } + } + #nav_menu_container { + left: 10px; + .arrow-up { + margin-left: 51px; + display: block; + } + } + #nav_account_container { + right: 10px; + .arrow-up { + margin-left: 147px; + display: block; + } + } + #nav_notification_container { + float: right; + margin-right: 50px; + } } } diff --git a/resources/www/common/images/icons/menu-admin.png b/resources/www/common/images/icons/menu-admin.png new file mode 100644 index 0000000000000000000000000000000000000000..f9546ed1fe0ba5b7a7d33ad3ba06827fd1828e8b GIT binary patch literal 513 zcmV+c0{;DpP)Px$yGcYrR5%f>Q$0(=P!#P;G;Tr%kbmMd5_nmg@Rsa?$^2Jo?OyG0cM)!J9&j3FqIz6FpQXj z=_cBY`oJE+olx9vw^_o(7(1rIgf$wCb)fI4xIm9E4ByC;@v#lWE)`h4Ue|}i;d7EO zcCGM)3UM6oCF?0^Hk-@7@BdJoS`SiIDdsO$2!cQiq@Zk`mS;GITb*L>;f#J#o}k3Q z4F)Q>M%DAYS3W2}xW)&HCEn09t>`#TpK>8w22dl4BAYy!0Aa=FxHNuZ?Iq6z2pUQN z-lNe|6lD{+&p~tfL^$5+iq0=jfVB_Cs_VKh;`5LJat!d9&?GnHm<}!OBsXxgZR8Gq zOL85o0VM1~!h>9=I7d{g)r`?-Rn1{?1;XO8CfqGZ zwRD!d5P_9d!<+x&bBZj>QU`-U1$WwlqBU$;NjH7r*d4@=x~@O9TCGS{z--%I>~_27 zDDKORd1H`Yl*{D<`on!=b8+6mX*iJi%3n!{m^gj`4Um=ocVyC%00000NkvXXu0mjf Dzd7ek literal 0 HcmV?d00001 diff --git a/resources/www/common/images/icons/menu-burger.png b/resources/www/common/images/icons/menu-burger.png new file mode 100644 index 0000000000000000000000000000000000000000..9eb5ca72f9dbb2dc641d67551385fbdd2763c60e GIT binary patch literal 859 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 Dzd7ek literal 0 HcmV?d00001 diff --git a/resources/www/common/images/icons/menu-prod.png b/resources/www/common/images/icons/menu-prod.png new file mode 100644 index 0000000000000000000000000000000000000000..9a4affbbbc9ac5149d8033dd971fdbbfc76dbfa9 GIT binary patch literal 582 zcmV-M0=fN(P)Px%07*naR5%fhRKH6?Q55#R_xgd9LqV&9C=E5#;Lz64@>CqcA=Gqwtt}BGk^~OX z9}ol$QA5zIG`Cs}E)EhTfs3|8+TgFgb9+ahFBKp7&adzL?!D)pr-(!%YNOF;3n5Yp zIr)5E^m@Il>ht+pUa$Abfk)`N-Xljo6bv%fQXml69;&LUs&_h_Jn;mo?~r!?sZ4qU zS&|fb@dDW5&tO@Tu97IWS}&K&MKd>Kh^^47xm@nfS_y~4>mb)Tr?3OY0SeC)w_2?t z$jhNnXqRHSzM?2GBzGube~?emK~Lah?L~@lii*?e^k@X2W{(0vAl7U)-}-y9f>1o8 zm<|LH_ec;5X~QsPnAiv5!k0Knwpy)TbF8t0LHGnv!yZnd>cLSY4f8_5!bgJK}|D94}#vu!p3a%y5TZG^F*6yiA=*K{izShwHr z|Hx!AUCuMV-%2h_vRL`CP$*oE!b~khH;!hm;%5YdLESF)PlZ1)voyUAdPtU(~n zG5q^vGC9vN*&(55H0r`2RFU7nmAydV&;&o2RvHK`)@rp|Yp(yD;`|;IN&w9c0fcBG z=d|Y72Pcl26x0w@5YV5-7AAg6r4swVn_ha6+YbaUy;rC U3a@y$iU0rr07*qoM6N<$f;dkIaR2}S literal 0 HcmV?d00001 diff --git a/resources/www/common/images/icons/menu-publication.png b/resources/www/common/images/icons/menu-publication.png new file mode 100644 index 0000000000000000000000000000000000000000..fb050222d66b328738c3e76ec4e4035d95ded9ee GIT binary patch literal 782 zcmV+p1M&QcP)Px%$Vo&&R5%fJluKw6Q51$VlQBWFunVoV1PX?j7DNPTs&r$q_(+=&Te1+U;ilGpL4_BH8I48{ISx_8 z>FnfsX_}^!!a@!Y4O~IXNkg{y-qmtwH(=(rq}@ z`qAFr-Z4ErT~-d=2AI08k7Y6$4QVTtN=uTMJ9Y}tDQje8#9uC#KZ{eqQZiW@-1f4L zvLL56Ha1ccWZe;)-82m27~m;4pw(b7I1mbj-WQ9-FT(Wql1|DkoV3(-DVsiTuN`>P{pQo@%w)S+Cc-q;4dRbT{K6U1S)s zR4TRH>{q%}bedT&d%fP`%*@QH3aFi?Bp|(wz1{Z7Q#`^fvI-;n|E^Yme0*+huAspD zt#;6`ETnsEU*7Nc_a~FdszpRVYmxLcO=@Y#pCe+jlRdBFkk_mA+RJM z`q#zw7V(Nre3aNj(W&ePXD-_Q2^|voX!Hq={Q&ZciVOkJ&`-R!Q=;4J0g2m0XM#7C zlRc(0tsXKxLDrGyyqh3I&exBIKL%*oByscIJ1zt~gAd@>L}wlR4eQcZ_Ii=fwEzGB M07*qoM6N<$g4xP&9{>OV literal 0 HcmV?d00001 diff --git a/resources/www/common/images/icons/menu-report.png b/resources/www/common/images/icons/menu-report.png new file mode 100644 index 0000000000000000000000000000000000000000..f115d86760f117a103ce8522e4e5d4e7d5610b73 GIT binary patch literal 632 zcmV-;0*C#HP)Px%GD$>1R45fqlFMsTQ4q#+Zyt*TgNOlz(9#qN3erGobQ5q>7kNjFkFF|07K)2* z>aGMt-RVLU8U@>h3PwywNJ?w}fD$Zd1w}y{y2!#JltLsV+?)R9z^NXX%r`UNd~?p+ zI2@crBJoJPAwThWeB0%6LhF-y}E z@Db^bMx)MFt7QpRN&@Jd#XUDoa{=NMHs#O{voMQD7ZVFPJ!Y$?^&tUY9FLo zjv_Jg7kHQX=O7umTyC`A@5?$SA#ce7>FxJSbr_@q2HfH_0~g6x92 zaT)(v^5DlNl4m8zX0xYAJOH*sp-_OPMX+4qx*8#i>vp>vkhZap5bi;^31J!kZv_&d zc62Zp$alDf`LUPMgqQ0~;cj62*fY1={j^%G?t#@&)8s>1mQ{u9CA-g>&eZGm9bxd6 zQQQ{xmfgPx%97#k$R5%fhluc_BVGzf6lf^Dcsm-k@w3tJMUaTne8we&b?LqKpytD_&L4-mN zdhqJSi#O36>OoRN2}!<#Ctq$J;-ys~S}C=nw2<`of4UR4=^`DNotgiRU|Po#)a@IQE|P$&!pIP%R3Fqa%;NU2o1e;mZqz#$-oh&!D1+(4bTmQJT{ z8{p&p4LB|!o6U}S03XaNsbkX=UyQ&_*AOW?sZ?qUIWI>Th8G%*#`h@bxSi2bl}aTn zm&=zeNTp9vuh;tsI1Br7y5oG`|AIbTl^i0De}M?p^|nKJp#Nd;duE%|@E38uM^3^S z_$AI)79goh@Y?P6)lR2#33WA>%bgc?f|8aEwh#{*UR)fE^h2tjlkQf4;YJlee>wX4 z#d4p?c9e9S`AoV>WZyNwWWV2^W`EkxxYz?NUjiuiB?L2!dY_I;~p3m?`Vhj?twW* zr9K|MjVtVLm(f3u`s0O0eJAW%t){=sI|Et6JR{!ZB6|6Jemy?gKA`(GSnye;UXOss wV-i-74;k&vS(2;O>R7kieNE0Sbwp>&M|3jEUGBMA#{d8T07*qoM6N<$f*jBpBme*a literal 0 HcmV?d00001 diff --git a/resources/www/common/images/icons/menu-upload.png b/resources/www/common/images/icons/menu-upload.png new file mode 100644 index 0000000000000000000000000000000000000000..6007c191e22e44c2c6d7cb28b4e32a285417edaa GIT binary patch literal 373 zcmV-*0gC>KP)Px$FG)l}R5%f1U;qLyFR%X~nh8Vz!9x(i2onWy;DFK3&(HAh-@mI^{`~oK4lWF0 zAghO&#K6eN*omSF#PRm_P6N?!RUi%suz(1l?Ct;m|1$!avp{?>2n`Jt1u-yO#SD>0 zkRWHMsi{4`ef#!Vm?(xtFbQNDMG?%2K!?l(+RcfqkaRY3(7<$~SO*hCr>Un16r5lH zbjwv>tgr!n#tNi=1M!M2Tej4KB;krc9GIhl3XW{uy44mWh7|x6-oPqBNDw13v1veY z6E+1%?o0=|6Om@n6cZJeXnL@62cJP$!^p?SCma~b%YYc0i?_?j$oS8iHS0IBAF&z) zQvl2pnizq$P9mg;7Px%;Ymb6R7ee-mOX0}Q51$V$%-Ngq%nnG#Af{gTPRqHMVdsgw+dQlDcf533zQW8 z11rH`p)e*0f{p1?Ehwm)LR9=(35YD~^WM30=iHk+A@RUF_k6tP%-Q?3Gc|=wCX+7c zOP6upj|=F-X^a&)ilX?;ur6J!-(c4n-Z8SqBp8uGP7^`DZ==|Ho2wp*DFgZL{j)V; zy7GtTR~M)sxJxjoZ8ba-46oqZ3;~Q~&~#U`<&@NR`v_^xQR7FLv7Yg7MP&%gfE|rd z00ZADSd083M~)T)-W=$4c$BQ*Y0JZBf7O_HM{&jxp#?3*S)1VX6O4bsH*m!J>fxPJ z$X=DgsNeMor1GlHAh1#EO4v-9iTwwAJ|tL$KpzZ%`qu{N+IXZB)MB|dZ2(_>DF~>w zYKPhkqZ5Ci0?vh^6`wQlRux{go+!hVh3_Yjys0! zI{+rDNRmcM+B2p29{HqOHbFZ6fgbVhO<9QzzptdQEzs|PoLus6Y1R?eI#|iEjZgPS z(-p=%cxwnb^<~m&Wy0J7yGe#F$X+%fb&3c!zz}F(E&*N2vmVmrQ%oFj4_sV7O?y}K za-i*K8&rhkF#{{$f(9vsD|E1rL3rya0>*S&dURab3X| zfSS1o7Qr!~?+ASrXtAG>`++eMpZgx?Wf#Dq!?^?8*%1Le2Zxn03D;GWQD;gu-60Ma zEe>^Ff^DFVZ-D=mha_sIuHG{~002ovPDHLkV1gYkdOQFC literal 0 HcmV?d00001 diff --git a/resources/www/common/images/icons/menu-web-site.png b/resources/www/common/images/icons/menu-web-site.png new file mode 100644 index 0000000000000000000000000000000000000000..6f7c0f2d5c10545a07b02e623fcaf11da7508378 GIT binary patch literal 1326 zcmV+}1=0G6P)Px(=t)FDR7ee_m(5G%WfaHnTitPV(koFjOm_w$YCsoiy0ArrV4G%Fxp2`!W|feX zFffADCZd9wAgonxg8B;_T8Kglf`}sMMkJYpn1Ru;rm4B!mtWt{<8yxf?)ARR*nxA; zdCqg*p7T7<0 z;r&D+fkDC&E3y&^Sbu(JXXhL|U^R?sS(Z<1cz76(4$OlaM3h1~Oi>AK`Cb zaLW>#Jr!|4;c~*qD1eF4(b2PGV`JO#c>KJ^H6aLsyVKLtuguKM{4FK7^+ag(+ref& zFLc{bg)(>1>pmww$r@Y+q5xhW3f++^A2VA zrN5)vP`DFd`w?(MG)r1eCc~Gj@XRH>uGs(9&rxj=LV>E$B)4U-gh62x=Fh;KK@oQ93#@o@c@l}m=j<3t$EiMUEw`|M|qLfOP zty$xLq6!s!nQjxH{2@9rZPHbGw*knX@j!YREMY4&G z&G0ldy#F!|1B-Xx6$G)RrYzrV>Z4;p>g?HO5E0`QzsfS_~%rzFZIBMV`Ee*TTN zwzi)S4-elS92{H-Cytq@PZni&DE>kQPxl>WNt^Uc~c_6(9(mN;= z3b*_F`@e}QRq~XfF7);FeJzJKwc1;1SRd9>mX2NYh3@X|Q6+$?mAk4L2cjX!QArNR z^*Uatr<_Wq`gEw?mpLPG#(L$ zr#d1lW3BAmVTT6?2jA-J=f}y($;*<_k$Aw)dJ6v}h(6ylY5d?1zZwI?aX@w?K>1yV z6D1%Wk2yMd?!Nm+XbBLIB*?#wE)NYG~OS kJyle1WWk|SFggzY1xatLmMN8@zyJUM07*qoM6N<$g2YE}RsaA1 literal 0 HcmV?d00001 diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig index 484e98b052..94aed445a4 100644 --- a/templates/web/common/menubar.html.twig +++ b/templates/web/common/menubar.html.twig @@ -7,179 +7,261 @@ -
  • - +
  • +
    • - - - -
    -
      - - {% if app.getAuthenticator().isAuthenticated() and module == "prod" %} -
    1. - +
    +
    + +
  • + +
    • + +     + + + + +
    +
      +
    1. + {% if app.getAuthenticator().isAuthenticated() %} + {% if app.getAuthenticatedUser().isGuest %} + {{ 'Guest' | trans }} - {% else %} - + {% else %} + {{ app.getAuthenticatedUser().getDisplayName() }} - - {% endif %} - {% endif %} -
      2. -
    2. - + + {% endif %} + {% endif %} +
      3. +
    3. + {{ 'phraseanet:: aide' | trans }} - - - - - - - - -
      4. -
    4. - {% if app.getAuthenticator().isAuthenticated() %} - + + + + + + + + +
      5. +
    5. + {% if app.getAuthenticator().isAuthenticated() %} + {{ 'phraseanet:: deconnection' | trans }} - - {% endif %} -
      6. -
    + + {% endif %} + + +
    + + ">{{ 'phraseanet:: a propos' | trans }} + + + @@ -207,10 +289,10 @@ styleAttr += linksData.linkColor ? "color: " + linksData.linkColor + ";" : ""; styleAttr += linksData.linkBold == true ? "font-weight: bold;" : ""; - var spanElement = $('').attr('style', styleAttr).html(linksData.linkName); - var links = '
  • ' + + var spanElement = $('').attr('style', styleAttr).attr('class', 'bullet-type').html(linksData.linkName); + var links = '
  • ' + spanElement.prop("outerHTML") + '
    • '; - $('#mainMenu #custom-link-container').append(links); + $('#mainMenu #nav_customlink_container .nav_menu').append(links); } }); } else if (key === 'help-menu') { @@ -228,22 +310,68 @@ '' + spanElement.prop("outerHTML") + ''; $('.helpcontextmenu .context-menu-theme-vista').append(links); + + var spanElementMobile = $('').attr('style', styleAttr).attr('class', 'bullet-type').html(linksData.linkName); + var linksMobile = '
  • ' + + spanElementMobile.prop("outerHTML") + '
    • '; + $('#mainMenu #nav_account_container .nav_menu').append(linksMobile); } }); } } - $('#toggle-menu').on('click', function (event) { - $('#nav_menu').toggle(); + $('#toggle-menu-main').on('click', function (event) { + $('#nav_menu_container').toggle(); + if ($('#nav_customlink_container').is(":visible")) { + $('#nav_customlink_container').hide(); + } + if ($('#nav_account_container').is(":visible")) { + $('#nav_account_container').hide(); + } }); - var windowsize = $(window).width(); + $('#toggle-menu-link').on('click', function (event) { + $('#nav_customlink_container').toggle(); + if ($('#nav_menu_container').is(":visible")) { + $('#nav_menu_container').hide(); + } + if ($('#nav_account_container').is(":visible")) { + $('#nav_account_container').hide(); + } + }); + + $('#toggle-menu-account').on('click', function (event) { + $('#nav_account_container').toggle(); + if ($('#nav_menu_container').is(":visible")) { + $('#nav_menu_container').hide(); + } + if ($('#nav_customlink_container').is(":visible")) { + $('#nav_customlink_container').hide(); + } + }); + + + var windowSize = $(window).width(); $(window).resize(function (event) { - windowsize = $(window).width(); - if (windowsize > 760) { - if ($('#nav_menu').is(":hidden")) { - $('#nav_menu').show(); + windowSize = $(window).width(); + if (windowSize > 760) { + if ($('#nav_menu_container').is(":hidden")) { + $('#nav_menu_container').show(); } + if ($('#nav_customlink_container').is(":hidden")) { + $('#nav_customlink_container').show(); + } + if ($('#nav_account_container').is(":visible")) { + $('#nav_account_container').hide(); + } + } else if (windowSize <= 760) { + if ($('#nav_customlink_container').is(":visible")) { + $('#nav_customlink_container').hide(); + } + if ($('#nav_menu_container').is(":visible")) { + $('#nav_menu_container').hide(); + } + } }); }); From 233e6f2a6e2a1e1e24b0643d3c39c66fa4375cd2 Mon Sep 17 00:00:00 2001 From: Mike Ng Date: Tue, 5 Jun 2018 14:28:17 +0400 Subject: [PATCH 2/2] add breakpoint for small display on custom links and account make width of dialog dynamic --- resources/www/_shared/styles/_main-menu.scss | 69 ++++++++++++-- templates/web/common/menubar.html.twig | 95 +++++++++++--------- 2 files changed, 114 insertions(+), 50 deletions(-) diff --git a/resources/www/_shared/styles/_main-menu.scss b/resources/www/_shared/styles/_main-menu.scss index 27ebf231d7..ee135a49d1 100644 --- a/resources/www/_shared/styles/_main-menu.scss +++ b/resources/www/_shared/styles/_main-menu.scss @@ -34,6 +34,9 @@ $mainMenuBottomBorder: none !default; .desktopmenu { display: inline-block; } + .inline { + display: inline-block !important; + } .show-menu { display: none; i { @@ -189,25 +192,79 @@ $mainMenuBottomBorder: none !default; } } } - #nav_customlink_container { - left: 10px; + #nav_menu_container { + top: 35px; + .nav_menu { + top: 9px; + } .arrow-up { - margin-left: 82px; + left: 62px; display: block; + position: absolute; } } - #nav_menu_container { + #nav_customlink_container { + display: none; + position: relative; left: 10px; + width: auto; + .nav-wrapper-box { + position: absolute; + background: #d8d8d8; + border-radius: 5px; + padding-right: 10px; + padding-left: 10px; + top: 9px; + .nav_menu { + position: relative; + li.menu-bar-item { + width: 100%; + left: 0; + } + li.menu-bar-item a { + > span { + padding: 0; + display: inline-block; + } + } + } + } .arrow-up { - margin-left: 51px; + left: 82px; display: block; + position: absolute; } } #nav_account_container { + position: relative; right: 10px; + width: auto; + .nav-wrapper-box { + position: absolute; + right: 10px; + background: #d8d8d8; + border-radius: 5px; + padding-right: 10px; + padding-left: 10px; + top: 9px; + .nav_menu { + position: relative; + li.menu-bar-item { + width: 100%; + left: 0; + } + li.menu-bar-item a { + > span { + padding: 0; + display: inline-block; + } + } + } + } .arrow-up { - margin-left: 147px; + right: 23px; display: block; + position: absolute; } } #nav_notification_container { diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig index 94aed445a4..9df99b36b4 100644 --- a/templates/web/common/menubar.html.twig +++ b/templates/web/common/menubar.html.twig @@ -122,7 +122,9 @@ - @@ -360,6 +365,7 @@ } if ($('#nav_customlink_container').is(":hidden")) { $('#nav_customlink_container').show(); + $('#nav_customlink_container').addClass('inline'); } if ($('#nav_account_container').is(":visible")) { $('#nav_account_container').hide(); @@ -371,6 +377,7 @@ if ($('#nav_menu_container').is(":visible")) { $('#nav_menu_container').hide(); } + $('#nav_customlink_container').removeClass('inline'); } });