From f907512d9b1da2324bb7c1af8ae1a7a2dda93d58 Mon Sep 17 00:00:00 2001 From: Jared Wein Date: Tue, 4 Feb 2014 14:56:35 -0500 Subject: [PATCH] Bug 964251 - [Australis] Better styling for Exit Customize button. r=Gijs --HG-- extra : rebase_source : 212dd70ef98f90d0e8009253ee832256a3266122 --- browser/themes/linux/jar.mn | 1 + .../osx/customizableui/panelUIOverlay.css | 4 ++++ browser/themes/osx/jar.mn | 2 ++ .../menuPanel-customizeFinish.png | Bin 0 -> 236 bytes .../menuPanel-customizeFinish@2x.png | Bin 0 -> 399 bytes .../customizableui/panelUIOverlay.inc.css | 17 ++++++++++------- browser/themes/windows/jar.mn | 2 ++ 7 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 browser/themes/shared/customizableui/menuPanel-customizeFinish.png create mode 100644 browser/themes/shared/customizableui/menuPanel-customizeFinish@2x.png diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index 96b7a5c8909..da4b4c21911 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -73,6 +73,7 @@ browser.jar: skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png (customizableui/customizeMode-separatorHorizontal.png) skin/classic/browser/customizableui/customizeMode-separatorVertical.png (customizableui/customizeMode-separatorVertical.png) skin/classic/browser/customizableui/customizeFavicon.ico (../shared/customizableui/customizeFavicon.ico) + skin/classic/browser/customizableui/menuPanel-customizeFinish.png (../shared/customizableui/menuPanel-customizeFinish.png) * skin/classic/browser/customizableui/panelUIOverlay.css (customizableui/panelUIOverlay.css) skin/classic/browser/customizableui/subView-arrow-back-inverted.png (../shared/customizableui/subView-arrow-back-inverted.png) skin/classic/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css) diff --git a/browser/themes/osx/customizableui/panelUIOverlay.css b/browser/themes/osx/customizableui/panelUIOverlay.css index 3b93f5cff88..a1f2915d872 100644 --- a/browser/themes/osx/customizableui/panelUIOverlay.css +++ b/browser/themes/osx/customizableui/panelUIOverlay.css @@ -15,6 +15,10 @@ list-style-image: url(chrome://browser/skin/menuPanel-customize@2x.png); } + #main-window[customize-entered] #PanelUI-customize { + list-style-image: url(chrome://browser/skin/customizableui/menuPanel-customizeFinish@2x.png); + } + #PanelUI-help { list-style-image: url(chrome://browser/skin/menuPanel-help@2x.png); } diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index 411af517906..209d78c4102 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -120,6 +120,8 @@ browser.jar: skin/classic/browser/customizableui/customizeMode-gridTexture.png (customizableui/customizeMode-gridTexture.png) skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png (customizableui/customizeMode-separatorHorizontal.png) skin/classic/browser/customizableui/customizeMode-separatorVertical.png (customizableui/customizeMode-separatorVertical.png) + skin/classic/browser/customizableui/menuPanel-customizeFinish.png (../shared/customizableui/menuPanel-customizeFinish.png) + skin/classic/browser/customizableui/menuPanel-customizeFinish@2x.png (../shared/customizableui/menuPanel-customizeFinish@2x.png) skin/classic/browser/customizableui/subView-arrow-back-inverted.png (../shared/customizableui/subView-arrow-back-inverted.png) skin/classic/browser/customizableui/subView-arrow-back-inverted@2x.png (../shared/customizableui/subView-arrow-back-inverted@2x.png) * skin/classic/browser/customizableui/panelUIOverlay.css (customizableui/panelUIOverlay.css) diff --git a/browser/themes/shared/customizableui/menuPanel-customizeFinish.png b/browser/themes/shared/customizableui/menuPanel-customizeFinish.png new file mode 100644 index 0000000000000000000000000000000000000000..0251ed7470879fc6f3a2214a51fb28e41ea49689 GIT binary patch literal 236 zcmV}dKJovL|c+5}z zh956HODh;3Y@62G;q8z9`fD#cv-zi_dTCM910T-32#G#DaG`M|qcM2i~iH!X0kK1|yhWuwer2Y+LXa*!s`@OaESUIz4hGHUOo4 zK#v?IP~C?a7iPsU;FB$x>OPwDQ;u8qOH$j17E?Fv+Vj9eS!o|yJl6qE%ZmE;0pHvQ zTy#ZN)VB|~=R26QCM)XO2fX(Ju;hrWq;DUvYta;(beF8U57}?4UIA8o2H}}8S#>{_ z-L{U)p8Dw#V9^=Ks{8P_H`c*xCtR}!4q4Trpw9yingjgs5%AanEeiTP;H*vO0Kg?z zwJGRBcFYG)%me1FX;sh%vXNUhod-(}YgN#P{T%hqOUv$PSJ02`Z{)gmMSYlYfqKJ$ tZGG%Obsyk{9sla91*q;v-SB~0e*k;ip=aH)VITki002ovPDHLkV1gx4vg7~& literal 0 HcmV?d00001 diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css index 5c11f54fc68..63f4ba6ac88 100644 --- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css +++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css @@ -322,6 +322,10 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { list-style-image: url(chrome://browser/skin/menuPanel-customize.png); } +#customization-panelHolder #PanelUI-customize { + list-style-image: url(chrome://browser/skin/customizableui/menuPanel-customizeFinish.png); +} + #PanelUI-help { list-style-image: url(chrome://browser/skin/menuPanel-help.png); } @@ -378,16 +382,15 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { background-color: #ad3434; } -#main-window[customize-entered] #PanelUI-customize { +#customization-panelHolder #PanelUI-customize { color: white; - background-image: linear-gradient(rgb(41,123,204), rgb(40,133,203)); - box-shadow: inset 0 1px 1px rgba(0,0,0,0.5), 0 2px rgba(255,255,255,0.2); - text-shadow: 0 1px 0 rgba(0,0,0,0.4); + background-color: rgb(116,191,67); + text-shadow: none; } -#main-window[customize-entered] #PanelUI-customize:hover, -#main-window[customize-entered] #PanelUI-customize:hover:active { - background-image: linear-gradient(rgb(38,115,191), rgb(38,125,191)); +#customization-panelHolder #PanelUI-customize:hover, +#customization-panelHolder #PanelUI-customize:hover:active { + background-color: rgb(105,173,61); } #customization-palette .toolbarbutton-multiline-text, diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index 5e7c4d4f196..2da7cf889ee 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -92,6 +92,7 @@ browser.jar: skin/classic/browser/customizableui/customizeMode-gridTexture.png (customizableui/customizeMode-gridTexture.png) skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png (customizableui/customizeMode-separatorHorizontal.png) skin/classic/browser/customizableui/customizeMode-separatorVertical.png (customizableui/customizeMode-separatorVertical.png) + skin/classic/browser/customizableui/menuPanel-customizeFinish.png (../shared/customizableui/menuPanel-customizeFinish.png) * skin/classic/browser/customizableui/panelUIOverlay.css (customizableui/panelUIOverlay.css) skin/classic/browser/customizableui/subView-arrow-back-inverted.png (../shared/customizableui/subView-arrow-back-inverted.png) * skin/classic/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css) @@ -404,6 +405,7 @@ browser.jar: skin/classic/aero/browser/customizableui/customizeMode-gridTexture.png (customizableui/customizeMode-gridTexture.png) skin/classic/aero/browser/customizableui/customizeMode-separatorHorizontal.png (customizableui/customizeMode-separatorHorizontal.png) skin/classic/aero/browser/customizableui/customizeMode-separatorVertical.png (customizableui/customizeMode-separatorVertical.png) + skin/classic/aero/browser/customizableui/menuPanel-customizeFinish.png (../shared/customizableui/menuPanel-customizeFinish.png) * skin/classic/aero/browser/customizableui/panelUIOverlay.css (customizableui/panelUIOverlay.css) skin/classic/aero/browser/customizableui/subView-arrow-back-inverted.png (../shared/customizableui/subView-arrow-back-inverted.png) * skin/classic/aero/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay-aero.css)