From d0e580f1de074380b155cbc73ef4ee2c04db6be9 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Fri, 15 Aug 2014 02:51:02 +0200 Subject: [PATCH] rename files that are overridden on Windows; add icons for loop button --- LCARStrek/browser/browser.css | 72 +++++++++++++++++- .../browser/customizableui/panelUIOverlay.css | 5 +- LCARStrek/browser/loop/menuPanel.png | Bin 0 -> 573 bytes LCARStrek/browser/loop/toolbarfx.png | Bin 0 -> 389 bytes ...uPanel-small.png => menuPanelFx-small.png} | Bin .../{menuPanel.png => menuPanelFx.png} | Bin ...zontalbar.png => syncFx-horizontalbar.png} | Bin ...r.png => syncFxProgress-horizontalbar.png} | Bin 8 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 LCARStrek/browser/loop/menuPanel.png create mode 100644 LCARStrek/browser/loop/toolbarfx.png rename LCARStrek/browser/{menuPanel-small.png => menuPanelFx-small.png} (100%) rename LCARStrek/browser/{menuPanel.png => menuPanelFx.png} (100%) rename LCARStrek/browser/{sync-horizontalbar.png => syncFx-horizontalbar.png} (100%) rename LCARStrek/browser/{syncProgress-horizontalbar.png => syncFxProgress-horizontalbar.png} (100%) diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index d934d438..f37015b0 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -797,6 +797,35 @@ menuitem.bookmark-item { -moz-image-region: rect(18px, 684px, 36px, 666px); } +#loop-call-button > .toolbarbutton-badge-container { + list-style-image: url("chrome://browser/skin/loop/toolbarfx.png"); + -moz-image-region: rect(0, 18px, 18px, 0); +} + +#loop-call-button:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 90px, 18px, 72px); +} + +#loop-call-button[disabled="true"] > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 36px, 18px, 18px); +} + +#loop-call-button[disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 126px, 18px, 108px); +} + +#loop-call-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 54px, 18px, 36px); +} + +#loop-call-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 72px, 18px, 54px); +} + +#loop-call-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 108px, 18px, 90px); +} + /* === END toolbarbuttons.inc.css === */ /* === BEGIN menupanel.inc.css === */ @@ -818,7 +847,7 @@ toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, # #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button) { - list-style-image: url("chrome://browser/skin/menuPanel.png"); + list-style-image: url("chrome://browser/skin/menuPanelFx.png"); /* avoid aero overrides with changed filename */ } #home-button[cui-areatype="menu-panel"], @@ -1090,13 +1119,48 @@ toolbaritem[sdkstylewidget="true"] > toolbarbutton { -moz-image-region: rect(0, 832px, 32px, 800px); } +#loop-call-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container, +toolbarpaletteitem[place="palette"] > #loop-call-button > .toolbarbutton-badge-container { + list-style-image: url("chrome://browser/skin/loop/menuPanel.png"); + -moz-image-region: rect(0, 32px, 32px, 0); +} + +/* Make sure that the state icons are not shown in the customization palette. */ +toolbarpaletteitem[place="palette"] > #loop-call-button > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 32px, 32px, 0) !important; +} + +#loop-call-button[cui-areatype="menu-panel"]:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 160px, 32px, 128px); +} + +#loop-call-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 64px, 32px, 32px); +} + +#loop-call-button[cui-areatype="menu-panel"][disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 224px, 32px, 192px); +} + +#loop-call-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 96px, 32px, 64px); +} + +#loop-call-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 128px, 32px, 96px); +} + +#loop-call-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 192px, 32px, 160px); +} + /* Wide panel control icons */ #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton, #zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton, toolbarpaletteitem[place="palette"] > #edit-controls > toolbarbutton, toolbarpaletteitem[place="palette"] > #zoom-controls > toolbarbutton { - list-style-image: url("chrome://browser/skin/menuPanel-small.png"); + list-style-image: url("chrome://browser/skin/menuPanelFx-small.png"); /* avoid aero overrides with changed filename */ } #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #cut-button, @@ -4366,12 +4430,14 @@ toolbarpaletteitem[notransition][place="panel"] { } toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon, +toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon, toolbarpaletteitem > toolbaritem.panel-wide-item, toolbarpaletteitem > toolbarbutton[type="menu-button"] { transition: transform .3s cubic-bezier(.6, 2, .75, 1.5) !important; } -toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon { +toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon, +toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon { transform: scale(1.3); } diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index 606b7c6b..199a6a74 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -366,6 +366,7 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-it .panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-container, .customization-palette .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon, .customization-palette .toolbarbutton-1 > .toolbarbutton-icon, +.customization-palette .toolbarbutton-1 > .toolbarbutton-badge-container, .panelUI-grid #bookmarks-toolbar-placeholder > .toolbarbutton-icon, .customization-palette #bookmarks-toolbar-placeholder > .toolbarbutton-icon, .panel-customization-placeholder-child > .toolbarbutton-icon { @@ -509,11 +510,11 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { } #PanelUI-fxa-status { - list-style-image: url("chrome://browser/skin/sync-horizontalbar.png"); + list-style-image: url("chrome://browser/skin/syncFx-horizontalbar.png"); } #PanelUI-fxa-status[status="active"] { - list-style-image: url("chrome://browser/skin/syncProgress-horizontalbar.png"); + list-style-image: url("chrome://browser/skin/syncFxProgress-horizontalbar.png"); } #PanelUI-customize { diff --git a/LCARStrek/browser/loop/menuPanel.png b/LCARStrek/browser/loop/menuPanel.png new file mode 100644 index 0000000000000000000000000000000000000000..3c89fcfd40d921e9a00e8c6183c52edaa9102b6a GIT binary patch literal 573 zcmV-D0>b@?P)q#j4b>W7RCFax>gCu(cgUMpmBMViJEEZ?!gBeWDSTBpgynw-Ikr|8@n89dK z*WQuER*+rRDT3^>ii*Y>dM@bll}Um(sA#My*L#}bde53#F1Ypt9s6Hq2(IBzViGn>u?tFlfgT1%ipeO@Nv4Y#Q6;udP?Xid7jW~_J12+&nr1OT~=B|(0{3=Yq3q=7g|-tI089jvk*Kn`btM`SSr1Gg{;GcwGYBLNg-FY)ws zWxvP4&!8gwbE%F1Q0R@Pi(`nz>9dm$@*Y;;arNaW-{bg%b3#M|GxL)}|5i_#kw44L zcFC!w9v<;x{I@^&eyQ1dP0z`t?Sv)&!86WRqVy+TJK(F>#9efZ^^8TFw%&}13vSeP z#G32Mirwtk^QrU1%aPzsLMmyyw-{hB<)@#+R;kF^QD^IoO|<_vtb3 znm_j(820NwFz2_k{7}dmFY}|~Q8{mGbg^&i1Xhd4c|B@O1TaS?83{1OOp7p`HK$ literal 0 HcmV?d00001 diff --git a/LCARStrek/browser/menuPanel-small.png b/LCARStrek/browser/menuPanelFx-small.png similarity index 100% rename from LCARStrek/browser/menuPanel-small.png rename to LCARStrek/browser/menuPanelFx-small.png diff --git a/LCARStrek/browser/menuPanel.png b/LCARStrek/browser/menuPanelFx.png similarity index 100% rename from LCARStrek/browser/menuPanel.png rename to LCARStrek/browser/menuPanelFx.png diff --git a/LCARStrek/browser/sync-horizontalbar.png b/LCARStrek/browser/syncFx-horizontalbar.png similarity index 100% rename from LCARStrek/browser/sync-horizontalbar.png rename to LCARStrek/browser/syncFx-horizontalbar.png diff --git a/LCARStrek/browser/syncProgress-horizontalbar.png b/LCARStrek/browser/syncFxProgress-horizontalbar.png similarity index 100% rename from LCARStrek/browser/syncProgress-horizontalbar.png rename to LCARStrek/browser/syncFxProgress-horizontalbar.png -- 2.43.0