From cc4b0b0d84ada84e11e522567465e086f075f966 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Thu, 5 Dec 2013 03:15:29 +0100 Subject: [PATCH] make Australis work with more button states --- LCARStrek/browser/browser.css | 304 +++++++++++++++--- .../browser/customizableui/panelUIOverlay.css | 38 ++- LCARStrek/browser/menuPanel-small.png | Bin 569 -> 569 bytes LCARStrek/browser/menuPanel.png | Bin 5214 -> 4447 bytes 4 files changed, 282 insertions(+), 60 deletions(-) diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index a8b7c6d7..fbf85102 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -696,10 +696,14 @@ menuitem.bookmark-item { -moz-image-region: rect(0, 288px, 18px, 270px); } -#navigator-toolbox:not([tabsontop]) #feed-button[cui-areatype="toolbar"]:hover { +#navigator-toolbox:not([tabsontop]) #feed-button[cui-areatype="toolbar"]:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 288px, 36px, 270px); } +#navigator-toolbox:not([tabsontop]) #feed-button[cui-areatype="toolbar"][disabled="true"] { + -moz-image-region: rect(36px, 288px, 54px, 270px); +} + #navigator-toolbox:not([tabsontop]) #social-share-button[cui-areatype="toolbar"] { -moz-image-region: rect(0px, 306px, 18px, 288px); } @@ -722,11 +726,15 @@ menuitem.bookmark-item { -moz-image-region: rect(0, 324px, 18px, 306px); } -#navigator-toolbox:not([tabsontop]) #characterencoding-button[cui-areatype="toolbar"]:hover, +#navigator-toolbox:not([tabsontop]) #characterencoding-button[cui-areatype="toolbar"]:hover:not([disabled="true"]), #navigator-toolbox:not([tabsontop]) #characterencoding-button[cui-areatype="toolbar"][open="true"] { -moz-image-region: rect(18px, 324px, 36px, 306px); } +#navigator-toolbox:not([tabsontop]) #characterencoding-button[cui-areatype="toolbar"][disabled="true"] { + -moz-image-region: rect(36px, 324px, 54px, 306px); +} + #navigator-toolbox:not([tabsontop]) #new-window-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 342px, 18px, 324px); } @@ -805,42 +813,62 @@ menuitem.bookmark-item { -moz-image-region: rect(0, 504px, 18px, 486px); } -#navigator-toolbox:not([tabsontop]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #cut-button:hover { +#navigator-toolbox:not([tabsontop]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #cut-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 504px, 36px, 486px); } +#navigator-toolbox:not([tabsontop]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #cut-button[disabled="true"] { + -moz-image-region: rect(36px, 504px, 54px, 486px); +} + #navigator-toolbox:not([tabsontop]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button { -moz-image-region: rect(0, 522px, 18px, 504px); } -#navigator-toolbox:not([tabsontop]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button:hover { +#navigator-toolbox:not([tabsontop]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 522px, 36px, 504px); } +#navigator-toolbox:not([tabsontop]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button[disabled="true"] { + -moz-image-region: rect(36px, 522px, 54px, 504px); +} + #navigator-toolbox:not([tabsontop]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button { -moz-image-region: rect(0, 540px, 18px, 522px); } -#navigator-toolbox:not([tabsontop]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button:hover { +#navigator-toolbox:not([tabsontop]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 540px, 36px, 522px); } +#navigator-toolbox:not([tabsontop]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button[disabled="true"] { + -moz-image-region: rect(36px, 540px, 54px, 522px); +} + #navigator-toolbox:not([tabsontop]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button { -moz-image-region: rect(0, 558px, 18px, 540px); } -#navigator-toolbox:not([tabsontop]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button:hover { +#navigator-toolbox:not([tabsontop]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 558px, 36px, 540px); } +#navigator-toolbox:not([tabsontop]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button[disabled="true"] { + -moz-image-region: rect(36px, 558px, 54px, 540px); +} + #navigator-toolbox:not([tabsontop]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button { -moz-image-region: rect(0, 576px, 18px, 558px); } -#navigator-toolbox:not([tabsontop]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button:hover { +#navigator-toolbox:not([tabsontop]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 576px, 36px, 558px); } +#navigator-toolbox:not([tabsontop]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button[disabled="true"] { + -moz-image-region: rect(36px, 576px, 54px, 558px); +} + #navigator-toolbox:not([tabsontop]) #webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) { -moz-image-region: rect(0, 594px, 18px, 576px); } @@ -884,66 +912,136 @@ menuitem.bookmark-item { -moz-image-region: rect(0px, 128px, 32px, 96px); } +#home-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #home-button:hover { + -moz-image-region: rect(32px, 128px, 64px, 96px); +} + #bookmarks-menu-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #bookmarks-menu-button { -moz-image-region: rect(0px, 160px, 32px, 128px); } +#bookmarks-menu-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #bookmarks-menu-button:hover { + -moz-image-region: rect(32px, 160px, 64px, 128px); +} + #bookmarks-menu-button[starred][cui-areatype="menu-panel"] { -moz-image-region: rect(0px, 192px, 32px, 160px); } +#bookmarks-menu-button[starred][cui-areatype="menu-panel"]:hover { + -moz-image-region: rect(32px, 192px, 64px, 160px); +} + #history-panelmenu[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #history-panelmenu { -moz-image-region: rect(0px, 224px, 32px, 192px); } +#history-panelmenu[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #history-panelmenu:hover { + -moz-image-region: rect(32px, 224px, 64px, 192px); +} + #downloads-button[cui-areatype="menu-panel"], #downloads-indicator[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #downloads-button { -moz-image-region: rect(0px, 256px, 32px, 224px); } +#downloads-button[cui-areatype="menu-panel"]:hover, +#downloads-indicator[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #downloads-button:hover { + -moz-image-region: rect(32px, 256px, 64px, 224px); +} + #switch-to-metro-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #switch-to-metro-button { -moz-image-region: rect(0px, 800px, 32px, 768px); } +#switch-to-metro-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #switch-to-metro-button:hover { + -moz-image-region: rect(32px, 800px, 64px, 768px); +} + #add-ons-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #add-ons-button { -moz-image-region: rect(0px, 288px, 32px, 256px); } +#add-ons-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #add-ons-button:hover { + -moz-image-region: rect(32px, 288px, 64px, 256px); +} + #open-file-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #open-file-button { -moz-image-region: rect(0px, 320px, 32px, 288px); } +#open-file-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #open-file-button:hover { + -moz-image-region: rect(32px, 320px, 64px, 288px); +} + #save-page-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #save-page-button { -moz-image-region: rect(0px, 352px, 32px, 320px); } +#save-page-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #save-page-button:hover { + -moz-image-region: rect(32px, 352px, 64px, 320px); +} + #sync-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #sync-button { -moz-image-region: rect(0px, 384px, 32px, 352px); } +#sync-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #sync-button:hover { + -moz-image-region: rect(32px, 384px, 64px, 352px); +} + #feed-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #feed-button { -moz-image-region: rect(0px, 416px, 32px, 384px); } +#feed-button[cui-areatype="menu-panel"]:hover:not([disabled="true"]), +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #feed-button:hover:not([disabled="true"]) { + -moz-image-region: rect(32px, 416px, 64px, 384px); +} + +#feed-button[cui-areatype="menu-panel"][disabled="true"], +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #feed-button[disabled="true"] { + -moz-image-region: rect(64px, 416px, 96px, 384px); +} + #social-share-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #social-share-button { -moz-image-region: rect(0px, 448px, 32px, 416px); } +#social-share-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #social-share-button:hover { + -moz-image-region: rect(32px, 448px, 64px, 416px); +} + #email-link-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #email-link-button { -moz-image-region: rect(0, 448px, 32px, 416px); } +#email-link-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #email-link-button:hover { + -moz-image-region: rect(32, 448px, 64px, 416px); +} + /* This is temporary until we have an email-link icon (Bug 932235) */ #email-link-button[cui-areatype="menu-panel"] > image, :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #email-link-button > image { @@ -955,46 +1053,96 @@ menuitem.bookmark-item { -moz-image-region: rect(0px, 480px, 32px, 448px); } +#characterencoding-button[cui-areatype="menu-panel"]:hover:not([disabled="true"]), +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #characterencoding-button:hover:not([disabled="true"]) { + -moz-image-region: rect(32px, 480px, 64px, 448px); +} + +#characterencoding-button[cui-areatype="menu-panel"][disabled="true"], +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #characterencoding-button[disabled="true"] { + -moz-image-region: rect(64px, 480px, 96px, 448px); +} + #new-window-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #new-window-button { -moz-image-region: rect(0px, 512px, 32px, 480px); } +#new-window-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #new-window-button:hover { + -moz-image-region: rect(32px, 512px, 64px, 480px); +} + #new-tab-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #new-tab-button { -moz-image-region: rect(0px, 544px, 32px, 512px); } +#new-tab-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #new-tab-button:hover { + -moz-image-region: rect(32px, 544px, 64px, 512px); +} + #privatebrowsing-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #privatebrowsing-button { -moz-image-region: rect(0px, 576px, 32px, 544px); } +#privatebrowsing-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #privatebrowsing-button:hover { + -moz-image-region: rect(32px, 576px, 64px, 544px); +} + #find-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #find-button { -moz-image-region: rect(0px, 640px, 32px, 608px); } +#find-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #find-button:hover { + -moz-image-region: rect(32px, 640px, 64px, 608px); +} + #print-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #print-button { -moz-image-region: rect(0px, 672px, 32px, 640px); } +#print-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #print-button:hover { + -moz-image-region: rect(32px, 672px, 64px, 640px); +} + #fullscreen-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #fullscreen-button { -moz-image-region: rect(0px, 704px, 32px, 672px); } +#fullscreen-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #fullscreen-button:hover { + -moz-image-region: rect(32px, 704px, 64px, 672px); +} + #developer-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #developer-button { -moz-image-region: rect(0px, 736px, 32px, 704px); } +#developer-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #developer-button:hover { + -moz-image-region: rect(32px, 736px, 64px, 704px); +} + #preferences-button[cui-areatype="menu-panel"], :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #preferences-button { -moz-image-region: rect(0px, 768px, 32px, 736px); } +#preferences-button[cui-areatype="menu-panel"]:hover, +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #preferences-button:hover { + -moz-image-region: rect(32px, 768px, 64px, 736px); +} + /* Wide panel control icons */ #edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton, @@ -1009,26 +1157,76 @@ menuitem.bookmark-item { -moz-image-region: rect(0px, 32px, 16px, 16px); } +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #cut-button:hover:not([disabled="true"]), +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #cut-button:hover:not([disabled="true"]) { + -moz-image-region: rect(16px, 32px, 32px, 16px); +} + +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #cut-button[disabled="true"], +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #cut-button[disabled="true"] { + -moz-image-region: rect(32px, 32px, 48px, 16px); +} + #edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #copy-button, :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #copy-button { -moz-image-region: rect(0px, 48px, 16px, 32px); } +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #copy-button:hover:not([disabled="true"]), +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #copy-button:hover:not([disabled="true"]) { + -moz-image-region: rect(16px, 48px, 32px, 32px); +} + +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #copy-button[disabled="true"], +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #copy-button[disabled="true"] { + -moz-image-region: rect(32px, 48px, 48px, 32px); +} + #edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #paste-button, :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #paste-button { -moz-image-region: rect(0px, 64px, 16px, 48px); } +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #paste-button:hover:not([disabled="true"]), +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #paste-button:hover:not([disabled="true"]) { + -moz-image-region: rect(16px, 64px, 32px, 48px); +} + +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #paste-button[disabled="true"], +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #paste-button[disabled="true"] { + -moz-image-region: rect(32px, 64px, 48px, 48px); +} + #zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-out-button, :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button { -moz-image-region: rect(0px, 80px, 16px, 64px); } +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-out-button:hover:not([disabled="true"]), +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button:hover:not([disabled="true"]) { + -moz-image-region: rect(16px, 80px, 32px, 64px); +} + +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-out-button[disabled="true"], +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button[disabled="true"] { + -moz-image-region: rect(32px, 80px, 48px, 64px); +} + #zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-in-button, :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { -moz-image-region: rect(0px, 96px, 16px, 80px); } +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-in-button:hover:not([disabled="true"]), +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button:hover:not([disabled="true"]) { + -moz-image-region: rect(16px, 96px, 32px, 80px); +} + +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-in-button[disabled="true"], +:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button[disabled="true"] { + -moz-image-region: rect(32px, 96px, 48px, 80px); +} + /* === END menupanel.inc.css === */ .toolbarbutton-1 { @@ -1353,54 +1551,55 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon background-color: transparent; } -#stop-button { +/* A number of buttons use :-moz-any(#palette-box, #navigator-toolbox[tabsontop]) - this makes it only apply pre-Australis as tabsontop and the palette-box don't exist afterwards */ +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #stop-button { -moz-image-region: rect(0, 54px, 18px, 36px); } -#stop-button:not([disabled="true"]):hover { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #stop-button:not([disabled="true"]):hover { -moz-image-region: rect(18px, 54px, 36px, 36px); } -#stop-button[disabled="true"] { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #stop-button[disabled="true"] { -moz-image-region: rect(36px, 54px, 54px, 36px); } -#reload-button { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #reload-button { -moz-image-region: rect(0, 72px, 18px, 54px); } -#reload-button:not([disabled="true"]):hover { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #reload-button:not([disabled="true"]):hover { -moz-image-region: rect(18px, 72px, 36px, 54px); } -#reload-button[disabled="true"] { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #reload-button[disabled="true"] { -moz-image-region: rect(36px, 72px, 54px, 54px); } -#home-button.bookmark-item { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #home-button.bookmark-item { list-style-image: url("chrome://browser/skin/FxToolbar.png"); } -#home-button { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #home-button { -moz-image-region: rect(0, 90px, 18px, 72px); } -#home-button:not([disabled="true"]):hover { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #home-button:not([disabled="true"]):hover { -moz-image-region: rect(18px, 90px, 36px, 72px); } -#home-button[disabled="true"] { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #home-button[disabled="true"] { -moz-image-region: rect(36px, 90px, 54px, 72px); } -#downloads-button { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #downloads-button { -moz-image-region: rect(0, 108px, 18px, 90px); } -#downloads-button:not([disabled="true"]):hover { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #downloads-button:not([disabled="true"]):hover { -moz-image-region: rect(18px, 108px, 36px, 90px); } -#downloads-button[disabled="true"] { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #downloads-button[disabled="true"] { -moz-image-region: rect(36px, 108px, 54px, 90px); } @@ -1408,21 +1607,20 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon margin: 0; } -#history-button { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #history-button { -moz-image-region: rect(0, 126px, 18px, 108px); } -#history-button:not([disabled="true"]):hover { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #history-button:not([disabled="true"]):hover { -moz-image-region: rect(18px, 126px, 36px, 108px); } -#history-button[disabled="true"] { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #history-button[disabled="true"] { -moz-image-region: rect(36px, 126px, 54px, 108px); } -/* Remove section when Australis lands - this makes it only apply pre-Australis as tabsontop doesn't exist afterwards */ -#navigator-toolbox[tabsontop] #bookmarks-button, -#navigator-toolbox[tabsontop] #bookmarks-menu-button { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #bookmarks-button, +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #bookmarks-menu-button { list-style-image: url("chrome://browser/skin/FxToolbar.png") !important; /* for making the palette work */ -moz-image-region: rect(0, 144px, 18px, 126px); } @@ -1431,54 +1629,54 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon /* list-style-image: url("chrome://browser/skin/FxToolbar.png"); */ } -#bookmarks-menu-button.toolbarbutton-1 { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #bookmarks-menu-button.toolbarbutton-1 { -moz-box-orient: horizontal; } -#bookmarks-button:not([disabled="true"]):hover, -#bookmarks-menu-button[open="true"], -#bookmarks-menu-button:not([disabled="true"]):hover { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #bookmarks-button:not([disabled="true"]):hover, +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #bookmarks-menu-button[open="true"], +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #bookmarks-menu-button:not([disabled="true"]):hover { -moz-image-region: rect(18px, 144px, 36px, 126px); } -#bookmarks-button[disabled="true"], -#bookmarks-menu-button[disabled="true"] { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #bookmarks-button[disabled="true"], +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #bookmarks-menu-button[disabled="true"] { -moz-image-region: rect(36px, 144px, 54px, 126px); } -#print-button { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #print-button { -moz-image-region: rect(0, 162px, 18px, 144px); } -#print-button:not([disabled="true"]):hover { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #print-button:not([disabled="true"]):hover { -moz-image-region: rect(18px, 162px, 36px, 144px); } -#print-button[disabled="true"] { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #print-button[disabled="true"] { -moz-image-region: rect(36px, 162px, 54px, 144px); } -#new-tab-button { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #new-tab-button { -moz-image-region: rect(0, 180px, 18px, 162px); } -#new-tab-button:not([disabled="true"]):hover { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #new-tab-button:not([disabled="true"]):hover { -moz-image-region: rect(18px, 180px, 36px, 162px); } -#new-tab-button[disabled="true"] { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #new-tab-button[disabled="true"] { -moz-image-region: rect(36px, 180px, 54px, 162px); } -#new-window-button { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #new-window-button { -moz-image-region: rect(0, 198px, 18px, 180px); } -#new-window-button:not([disabled="true"]):hover { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #new-window-button:not([disabled="true"]):hover { -moz-image-region: rect(18px, 198px, 36px, 180px); } -#new-window-button[disabled="true"] { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #new-window-button[disabled="true"] { -moz-image-region: rect(36px, 198px, 54px, 180px); } @@ -1518,15 +1716,15 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon -moz-image-region: rect(36px, 252px, 54px, 234px); } -#fullscreen-button { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #fullscreen-button { -moz-image-region: rect(0, 270px, 18px, 252px); } -#fullscreen-button:not([disabled="true"]):hover { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #fullscreen-button:not([disabled="true"]):hover { -moz-image-region: rect(18px, 270px, 36px, 252px); } -#fullscreen-button[disabled="true"] { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #fullscreen-button[disabled="true"] { -moz-image-region: rect(36px, 270px, 54px, 252px); } @@ -1555,38 +1753,38 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon -moz-image-region: rect(36px, 306px, 54px, 288px); } -#sync-button:not([status]) { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #sync-button:not([status]) { list-style-image: url("chrome://browser/skin/FxToolbar.png") !important; /* for making the palette work */ -moz-image-region: rect(0, 324px, 18px, 306px); } -#sync-button[status="active"] { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #sync-button[status="active"] { list-style-image: url("chrome://browser/skin/sync-throbber.png"); -moz-image-region: rect(0, 18px, 18px, 0); } -#sync-button[disabled="true"] { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #sync-button[disabled="true"] { -moz-image-region: rect(36px, 324px, 54px, 306px); } -#feed-button { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #feed-button { -moz-image-region: rect(0, 342px, 18px, 324px); } -#feed-button[disabled="true"] { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #feed-button[disabled="true"] { -moz-image-region: rect(36px, 342px, 54px, 324px); } -#webrtc-status-button { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #webrtc-status-button { -moz-image-region: rect(0, 360px, 18px, 342px); } -#webrtc-status-button:not([disabled="true"]):hover, -#webrtc-status-button[open="true"] { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #webrtc-status-button:not([disabled="true"]):hover, +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #webrtc-status-button[open="true"] { -moz-image-region: rect(18px, 360px, 36px, 342px); } -#webrtc-status-button[disabled="true"] { +:-moz-any(#palette-box, #navigator-toolbox[tabsontop]) #webrtc-status-button[disabled="true"] { -moz-image-region: rect(36px, 360px, 54px, 342px); } diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index eb70a50b..afc8e441 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -4,6 +4,10 @@ /* === BEGIN panelUIOverlay.inc.css === */ +#customization-panelHolder { + border-radius: 4px; +} + .panel-subviews { background-color: #000000; -moz-margin-start: 38px; @@ -27,6 +31,7 @@ #PanelUI-mainView { display: flex; flex-direction: column; + border-radius: 4px; } #app-extension-point-end > #PanelUI-menu-button { @@ -133,7 +138,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton, } .panel-combined-button[disabled] > .toolbarbutton-icon { - opacity: .5; +/* opacity: .5; */ } toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"] { @@ -190,6 +195,8 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { padding: 0; margin: 0; min-height: 4em; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; } #PanelUI-help, @@ -204,19 +211,36 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { border-bottom-style: none; border-radius: 0; transition: background-color; - -moz-box-orient: vertical; - flex: 1 1 33.33%; + -moz-box-orient: horizontal; } -:-moz-any(#PanelUI-help, #PanelUI-customize, #PanelUI-quit) > .toolbarbutton-icon { - margin: 0 0 3px; + +#PanelUI-help, +#PanelUI-quit { + min-width: 46px; +} + +#PanelUI-customize > .toolbarbutton-text { + text-align: start; +} + +#PanelUI-help > .toolbarbutton-text, +#PanelUI-quit > .toolbarbutton-text { + display: none; +} + +#PanelUI-help > .toolbarbutton-icon, +#PanelUI-quit > .toolbarbutton-icon { + -moz-margin-end: 0; } #PanelUI-customize { + flex: 1; + -moz-padding-start: 15px; + -moz-border-start-style: none; list-style-image: url("chrome://browser/skin/menuPanel-customize.png"); } #PanelUI-help { - -moz-border-start-style: none; list-style-image: url("chrome://browser/skin/menuPanel-help.png"); } @@ -405,7 +429,7 @@ toolbarpaletteitem[place="palette"] > #search-container { #edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton[disabled] > .toolbarbutton-icon, #zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton[disabled] > .toolbarbutton-icon { - opacity: .25; +/* opacity: .25; */ } #zoom-controls[cui-areatype="toolbar"] > #zoom-reset-button > .toolbarbutton-text { diff --git a/LCARStrek/browser/menuPanel-small.png b/LCARStrek/browser/menuPanel-small.png index 3f5f9c4a94c2f23522e1e50aa9319344e62dd38d..42f6c0af54f0a26bc0c7d18ca4cb545512a99044 100644 GIT binary patch delta 19 acmdnVvXf;(B?l{`u2~(2tn$Xj9gF}uK?SA& delta 19 bcmdnVvXf;(B?l8Tm%-(~&z5X#+`$L{NHqu$ diff --git a/LCARStrek/browser/menuPanel.png b/LCARStrek/browser/menuPanel.png index 5fcf52cd2f00abb4b6c47c3e4443ab2d8bdae497..ba185acb3ffeb5b7abe33254d91bcf27435cc1c0 100644 GIT binary patch literal 4447 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 literal 5214 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