From dcc0c033f55a9a5d657ec50744f556dea2d27d3c Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Wed, 15 Jan 2014 15:27:30 +0100 Subject: [PATCH] Bug 922834 - Australis: Need a more high-res version of the bookmarks toolbar item placeholder icon for the palette/panel, r=mconley --- .../customizableui/src/CustomizeMode.jsm | 7 +++++++ browser/themes/linux/browser.css | 5 +++++ browser/themes/linux/jar.mn | 1 + .../linux/places/bookmarksToolbar-menuPanel.png | Bin 0 -> 700 bytes browser/themes/osx/browser.css | 10 ++++++++++ browser/themes/osx/jar.mn | 2 ++ .../osx/places/bookmarksToolbar-menuPanel.png | Bin 0 -> 787 bytes .../osx/places/bookmarksToolbar-menuPanel@2x.png | Bin 0 -> 1728 bytes browser/themes/windows/browser.css | 5 +++++ browser/themes/windows/jar.mn | 2 ++ .../places/bookmarksToolbar-menuPanel-aero.png | Bin 0 -> 845 bytes .../places/bookmarksToolbar-menuPanel.png | Bin 0 -> 700 bytes 12 files changed, 32 insertions(+) create mode 100644 browser/themes/linux/places/bookmarksToolbar-menuPanel.png create mode 100644 browser/themes/osx/places/bookmarksToolbar-menuPanel.png create mode 100644 browser/themes/osx/places/bookmarksToolbar-menuPanel@2x.png create mode 100644 browser/themes/windows/places/bookmarksToolbar-menuPanel-aero.png create mode 100644 browser/themes/windows/places/bookmarksToolbar-menuPanel.png diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm index c7cbccb981a2..7e97946d01a5 100644 --- a/browser/components/customizableui/src/CustomizeMode.jsm +++ b/browser/components/customizableui/src/CustomizeMode.jsm @@ -582,6 +582,9 @@ CustomizeMode.prototype = { if (aNode.hasAttribute("flex")) { wrapper.setAttribute("flex", aNode.getAttribute("flex")); + if (aPlace == "palette") { + aNode.removeAttribute("flex"); + } } @@ -648,6 +651,10 @@ CustomizeMode.prototype = { toolbarItem.checked = true; } + if (aWrapper.hasAttribute("flex") && !toolbarItem.hasAttribute("flex")) { + toolbarItem.setAttribute("flex", aWrapper.getAttribute("flex")); + } + if (aWrapper.hasAttribute("itemcommand")) { let commandID = aWrapper.getAttribute("itemcommand"); toolbarItem.setAttribute("command", commandID); diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index 5fffb04ed28d..db511562e4bb 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -112,6 +112,11 @@ toolbarbutton.bookmark-item[open="true"] { list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important; } +toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-placeholder, +#personal-bookmarks[cui-areatype="menu-panel"] > #bookmarks-toolbar-placeholder { + list-style-image: url("chrome://browser/skin/places/bookmarksToolbar-menuPanel.png") !important; +} + /* Bookmark menus */ menu.bookmark-item, menuitem.bookmark-item { diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index 4af246a985bd..06af20e890ec 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -93,6 +93,7 @@ browser.jar: skin/classic/browser/newtab/controls.png (newtab/controls.png) skin/classic/browser/places/bookmarksMenu.png (places/bookmarksMenu.png) skin/classic/browser/places/bookmarksToolbar.png (places/bookmarksToolbar.png) + skin/classic/browser/places/bookmarksToolbar-menuPanel.png (places/bookmarksToolbar-menuPanel.png) skin/classic/browser/places/calendar.png (places/calendar.png) * skin/classic/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css) skin/classic/browser/places/livemark-item.png (places/livemark-item.png) diff --git a/browser/themes/linux/places/bookmarksToolbar-menuPanel.png b/browser/themes/linux/places/bookmarksToolbar-menuPanel.png new file mode 100644 index 0000000000000000000000000000000000000000..367a9090d3dafe6e369349b39107a8f11c16438b GIT binary patch literal 700 zcmV;t0z>_YP)_NYVCpOj`u^O zJ$%AW-hlUx^F_GSk_}h`ud6U%*U109m9Jd|ZeV`IwXl3@$#=l)A8+YAn7xV6O2&)- zT+Cl`Ei9i}l7WiZ6Sn)*7oFWbVGSM&qdUTFwvSR;>DuuN(#p56_J=X%FgK_cwPXXW zuCPg*K?mn+IIbug&gWdE^=ezM_cMjs-B~`??jbfr&THfzl0&YlCbc93Wuptio&;{K zUhj+-{je1q_H%MoHK`>LN`~Xz>{*!oiO5yWFB>WCdRTGf-ptjkZ{(_KQcE__v_%`| zr$W=-6`MQdPaDbXmAT@{Y;-eMIV8ug9<>x())5vQ`=QYpig-r<@F1~$-cKB{%gFi2 z+@M<2QX1fv1))%H3v_tf&%ncE_6~FA)lnNDu{RC`iI0-nnx6s0E_#j3s{<{GtYfi- zckBl~D?G8UCpq`ynM=ThlWX~^`GdJZwRDvMZXG`)erVuQX=UT>KjAgNNn}gE64~NU z%q`#?V|X#|n=lYmtDrPcv%D_-z*~)+X)IkBL3El&J}(=At_9Yrd zzG^|l4FrEg@PYCEs$zOw9h(KUBm+2KughhCT9SdS9R4N4*%VJ1)S#ARAePQY menupopup { list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important; } +toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-placeholder, +#personal-bookmarks[cui-areatype="menu-panel"] > #bookmarks-toolbar-placeholder { + list-style-image: url("chrome://browser/skin/places/bookmarksToolbar-menuPanel.png") !important; +} + @media (min-resolution: 2dppx) { #bookmarks-toolbar-placeholder { list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png") !important; } + toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-placeholder, + #personal-bookmarks[cui-areatype="menu-panel"] > #bookmarks-toolbar-placeholder { + list-style-image: url("chrome://browser/skin/places/bookmarksToolbar-menuPanel@2x.png") !important; + } + #bookmarks-toolbar-placeholder > .toolbarbutton-icon { width: 16px; } diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index 2b850ff73cb4..bcec71771c96 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -152,6 +152,8 @@ browser.jar: skin/classic/browser/places/bookmarksMenu.png (places/bookmarksMenu.png) skin/classic/browser/places/bookmarksToolbar.png (places/bookmarksToolbar.png) skin/classic/browser/places/bookmarksToolbar@2x.png (places/bookmarksToolbar@2x.png) + skin/classic/browser/places/bookmarksToolbar-menuPanel.png (places/bookmarksToolbar-menuPanel.png) + skin/classic/browser/places/bookmarksToolbar-menuPanel@2x.png (places/bookmarksToolbar-menuPanel@2x.png) skin/classic/browser/places/history.png (places/history.png) skin/classic/browser/places/history@2x.png (places/history@2x.png) skin/classic/browser/places/star-icons.png (places/star-icons.png) diff --git a/browser/themes/osx/places/bookmarksToolbar-menuPanel.png b/browser/themes/osx/places/bookmarksToolbar-menuPanel.png new file mode 100644 index 0000000000000000000000000000000000000000..892125ad3b808d02f33176da97024974939d50d1 GIT binary patch literal 787 zcmV+u1MK{XP){~N})weC@qvIola?IhCYT4eZQcahNLSu#x-S$ ztRPClqAmzVVu+8O5lKK@2-n{s)R^3v=^!a?y7-dG+;h(Fo0;30^bBL{ztR?H3;a3g zcMf(t1_tk(29(7KxQ0F3;zW=ILvl-@49emJf+2|&ibYl|mRbsBP!=bkD3h#QE?Z`H zc9xY&C4!ER)r+i?3uJRS3f`KTnfaK@=T9ym%L)y&1YNbNs=wCP*Ts7MjS`E+_HoW~ zKeBiMNs<|^#uDjFhMwmd`Z~bHd_G^tIm`XX(igy07*Z${ST>twsZ@pybEozA?gR4U80g@xznxd0mdUA0>61=dzjv#Dv? z4tl89xsbcM!jPndixw#n}zrGIlEE& z89mgiI}=&FKp-$d4Z37-7s8P!8*;ffZT9{yqj0QUak)M3Bhe`J7|uf$FCYd2w1W*v zVuuTUkv$z3ZW{^s1o6IK46t-MZ8{5CyntU6$=VbV<}a6)dW;0-=WDlcdz;Qdmc9VY z4Z+WfHqS0<&o+7<*zA|VrN1Q3;r9N-`@n40zX?ny60{k&sP>`F-qCA!q=tq)-(BvJ zT|9dY=g!kwET(=+K=#-Ig5S?zZb$+GvZCzaTV8T|Mz`r%ha-_g=y=#O@&#)}Wiq^n zTGLs`;stzyK)2bD1W?tf!!H@_^0=mv6mfVw8II5z)ljYJEM)Nl<31lPnnGdIN1@i& zc#y>lc)epk@Ihg+EVmTOpe#;cW8-aRadGk4X+T+=0O$nQPKnO;ACtB~gWn)1;$}uw RTh{;p002ovPDHLkV1j2-asB`R literal 0 HcmV?d00001 diff --git a/browser/themes/osx/places/bookmarksToolbar-menuPanel@2x.png b/browser/themes/osx/places/bookmarksToolbar-menuPanel@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c81710a0e712068ec2c5e09e6763dd68866cfd37 GIT binary patch literal 1728 zcmV;x20!_UP)ExnD6ji2Cm6!0=$XK@W!h|-^$nxeI9%LYnIOGnqN zSu?V7<;r2sVVN{x!4T#|me0NvIT_j#I*0TDa4;0wGJt$E#el`F07O>KKKFAz)8*ym z!n1{z)ya>)OmW42pNQA=S zFilQQa(=3zp`OKG0_GU5tE)SU^<%s)!)@huWcM(evgj8<*-j2`e6UjR#KeST)@HMf zZru2vzT)CyF8^s@j&Mmy$(aosHuOW>7}_Lcd)^+K!6u{*mmrfBkbV{LS&`y#@W1ySux4_wL=>g*n3EO`A5ISg~To zpvU964&isr!{wsS1XE22g+iZoc6RP>Z*M==+S=NO-#@Kizy6NX>E!(>(*<#cI`Ud(b4e*w*7H!ZS4^lAiF^BTm$eK4+eub`QX9N;2by( z4uURlK=%E=iSuAT*ar@S6JP*b2Y0cL8##3i;6VRI1;p*0Z@vBawpX_If@7c$TmyGN z9MB^Y1Gm6ca2gy1z3=z*1o=35pCB6*@Mx1EX@C%d!jZ^J@!7-&jv_A5wbGTm)qm*o7b$%99V&=k<`&srF*giPt7JEq zelAReBpmX3fC?bD+hr5N76g9D+X`BiMgH0{mt z3gCm4x5o~LI$lvx@f)CY*u1%hr@zy3n|W6Ony&GE!6?lWFZ{Pj0Xso65P-~ZTeqf- zW%q$d7Q^fD-syd?hB$mO4qMEMX z1SGk5`ARK>U%;?-0>ai61q=!R!|*+cA@eINJBM~PfFy3Wb~_WtBej_krbNbuLc85g zBO@av7cX5F1A{}=gG0k#V@7uxVxPi0dnyX}DfyZ59i}`3a|SWnJEQ5LQOGS&qYh0iYE9m+pWNQzXDXVK>1953T_P%+#l+17>Mr~uw({um$yIarWW z<$1gm{_yS4hTA&K?XqluoWv9)tj&xtCt`8=?!NF~ZDxcyffpAy3E&EM2 #personal-bookmarks > #bookmarks-toolbar-placeholder, +#personal-bookmarks[cui-areatype="menu-panel"] > #bookmarks-toolbar-placeholder { + list-style-image: url("chrome://browser/skin/places/bookmarksToolbar-menuPanel.png") !important; +} + /* ::::: bookmark menus ::::: */ menu.bookmark-item, diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index 81838dd4ac9a..fe2502e310da 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -115,6 +115,7 @@ browser.jar: skin/classic/browser/places/query.png (places/query.png) skin/classic/browser/places/bookmarksMenu.png (places/bookmarksMenu.png) skin/classic/browser/places/bookmarksToolbar.png (places/bookmarksToolbar.png) + skin/classic/browser/places/bookmarksToolbar-menuPanel.png (places/bookmarksToolbar-menuPanel.png) skin/classic/browser/places/calendar.png (places/calendar.png) skin/classic/browser/places/toolbarDropMarker.png (places/toolbarDropMarker.png) skin/classic/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css) @@ -431,6 +432,7 @@ browser.jar: skin/classic/aero/browser/places/query.png (places/query-aero.png) skin/classic/aero/browser/places/bookmarksMenu.png (places/bookmarksMenu-aero.png) skin/classic/aero/browser/places/bookmarksToolbar.png (places/bookmarksToolbar-aero.png) + skin/classic/aero/browser/places/bookmarksToolbar-menuPanel.png (places/bookmarksToolbar-menuPanel-aero.png) skin/classic/aero/browser/places/calendar.png (places/calendar-aero.png) skin/classic/aero/browser/places/toolbarDropMarker.png (places/toolbarDropMarker-aero.png) skin/classic/aero/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css) diff --git a/browser/themes/windows/places/bookmarksToolbar-menuPanel-aero.png b/browser/themes/windows/places/bookmarksToolbar-menuPanel-aero.png new file mode 100644 index 0000000000000000000000000000000000000000..4692a268455baca28e31d1fe381185a64a30be83 GIT binary patch literal 845 zcmV-T1G4;yP)%!uSW)(SKU!4gR&Tb8*Ulo!3l_@3p)yBP!=P=1yqO) z&s0owXd0AEfuQxadNGR?u=}GpXr^MMWFBIfi8VDn{yvn-Z>txxSOJ?~1vNWe5s~yH zIHknT=dV^=OUo|=hnU>L&noVxELOm$fSQ@A2r)hiv2<<;`)ZJbN@`?TOpI3CPg$&h zR|X|Lsfj!=0aE`M2+?7%dLmm3i_c8O-uZ<^yVWcI!ab^?THRTg#R}k1hzu4O!l`la zt6A{K0~?`4=1n>`wJ>}C!5!>5fE4@dX7A12#l5Fkv+4~eH~i`l^_HATS*4C4nKOuq z9E=ohEnY%wh#B&M<_Mc?No?E-3}q&8~NiEnP>;gj-o*h9S~XJQsBV0MP^ zY>$;Bh`(@NjKS3&+iGJ=XPs6!?j310*x&MEKlNzN!>m#QA{ys35n{t&;sr2qp3_%!~NiMs#Ok7As(Kh=6BV7mGuJhmYqQv;^=Zoa%Lj%g&)JR)81CT$4a_2&`^t z6KnStdoDI#JB%FqM`EAFDgMBxr8^6=SOH^S0I*RLpOOKO6kns-3zs`;8n1LFTDxuE z+IsApxK{DA{j}$n;vewd(4B=@tbl*1Qm_YP)_NYVCpOj`u^O zJ$%AW-hlUx^F_GSk_}h`ud6U%*U109m9Jd|ZeV`IwXl3@$#=l)A8+YAn7xV6O2&)- zT+Cl`Ei9i}l7WiZ6Sn)*7oFWbVGSM&qdUTFwvSR;>DuuN(#p56_J=X%FgK_cwPXXW zuCPg*K?mn+IIbug&gWdE^=ezM_cMjs-B~`??jbfr&THfzl0&YlCbc93Wuptio&;{K zUhj+-{je1q_H%MoHK`>LN`~Xz>{*!oiO5yWFB>WCdRTGf-ptjkZ{(_KQcE__v_%`| zr$W=-6`MQdPaDbXmAT@{Y;-eMIV8ug9<>x())5vQ`=QYpig-r<@F1~$-cKB{%gFi2 z+@M<2QX1fv1))%H3v_tf&%ncE_6~FA)lnNDu{RC`iI0-nnx6s0E_#j3s{<{GtYfi- zckBl~D?G8UCpq`ynM=ThlWX~^`GdJZwRDvMZXG`)erVuQX=UT>KjAgNNn}gE64~NU z%q`#?V|X#|n=lYmtDrPcv%D_-z*~)+X)IkBL3El&J}(=At_9Yrd zzG^|l4FrEg@PYCEs$zOw9h(KUBm+2KughhCT9SdS9R4N4*%VJ1)S#ARAePQY