From: Robert Kaiser Date: Wed, 29 Oct 2014 21:11:59 +0000 (+0100) Subject: make Forget and Apps buttons work with LCARStrek X-Git-Tag: LCARStrek-2.30^0 X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=2218055551506091a4376f925c3ce1e51ebafe37;p=themes.git make Forget and Apps buttons work with LCARStrek --- diff --git a/LCARStrek/browser/ToolbarFx.png b/LCARStrek/browser/ToolbarFx.png index b3d0c9e2..5e0b2882 100644 Binary files a/LCARStrek/browser/ToolbarFx.png and b/LCARStrek/browser/ToolbarFx.png differ diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index ca9ce7f1..9f90de36 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -489,7 +489,7 @@ menuitem.bookmark-item { #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-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), + #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button), #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url("chrome://browser/skin/ToolbarFx.png"); @@ -660,10 +660,15 @@ menuitem.bookmark-item { -moz-image-region: rect(0px, 306px, 18px, 288px); } -#social-share-button[cui-areatype="toolbar"]:hover { +#social-share-button[cui-areatype="toolbar"]:hover:not([disabled="true"]), +#social-share-button[cui-areatype="toolbar"][open="true"] { -moz-image-region: rect(18px, 306px, 36px, 288px); } +#social-share-button[cui-areatype="toolbar"][disabled="true"] { + -moz-image-region: rect(36px, 306px, 54px, 288px); +} + #characterencoding-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 324px, 18px, 306px); } @@ -848,10 +853,14 @@ menuitem.bookmark-item { -moz-image-region: rect(0, 666px, 18px, 648px); } -#email-button[cui-areatype="toolbar"]:hover { +#email-button[cui-areatype="toolbar"]:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 666px, 36px, 648px); } +#email-button[cui-areatype="toolbar"][disabled="true"] { + -moz-image-region: rect(36px, 666px, 54px, 648px); +} + #sidebar-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 684px, 18px, 666px); } @@ -860,6 +869,27 @@ menuitem.bookmark-item { -moz-image-region: rect(18px, 684px, 36px, 666px); } +#panic-button[cui-areatype="toolbar"] { + -moz-image-region: rect(0, 702px, 18px, 684px); +} + +#panic-button[cui-areatype="toolbar"]:hover, +#panic-button[cui-areatype="toolbar"][open] { + -moz-image-region: rect(18px, 702px, 36px, 684px); +} + +#panic-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { + transform: scaleX(-1); +} + +#web-apps-button[cui-areatype="toolbar"] { + -moz-image-region: rect(0, 720px, 18px, 702px); +} + +#web-apps-button[cui-areatype="toolbar"]:hover { + -moz-image-region: rect(18px, 720px, 36px, 702px); +} + #loop-call-button > .toolbarbutton-badge-container { list-style-image: url("chrome://browser/skin/loop/toolbarfx.png"); -moz-image-region: rect(0, 18px, 18px, 0); @@ -902,14 +932,14 @@ toolbaritem[sdkstylewidget="true"] > toolbarbutton, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-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)[cui-areatype="menu-panel"], + #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button)[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-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) { + #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button) { list-style-image: url("chrome://browser/skin/menuPanelFx.png"); /* avoid aero overrides with changed filename */ } @@ -1026,11 +1056,16 @@ toolbarpaletteitem[place="palette"] > #social-share-button { -moz-image-region: rect(0px, 448px, 32px, 416px); } -#social-share-button[cui-areatype="menu-panel"]:hover, -toolbarpaletteitem[place="palette"] > #social-share-button:hover { +#social-share-button[cui-areatype="menu-panel"]:hover:not([disabled="true"]), +toolbarpaletteitem[place="palette"] > #social-share-button:hover:not([disabled="true"]) { -moz-image-region: rect(32px, 448px, 64px, 416px); } +#social-share-button[cui-areatype="menu-panel"][disabled="true"], +toolbarpaletteitem[place="palette"] > #social-share-button[disabled="true"] { + -moz-image-region: rect(64px, 448px, 96px, 416px); +} + #characterencoding-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #characterencoding-button { -moz-image-region: rect(0px, 480px, 32px, 448px); @@ -1159,23 +1194,46 @@ toolbarpaletteitem[place="palette"] > #email-link-button { -moz-image-region: rect(0, 800px, 32px, 768px); } -#email-link-button[cui-areatype="menu-panel"]:hover, -toolbarpaletteitem[place="palette"] > #email-link-button:hover { +#email-link-button[cui-areatype="menu-panel"]:hover:not([disabled="true"]), +toolbarpaletteitem[place="palette"] > #email-link-button:hover:not([disabled="true"]) { -moz-image-region: rect(32px, 800px, 64px, 768px); } +#email-link-button[cui-areatype="menu-panel"][disabled="true"], +toolbarpaletteitem[place="palette"] > #email-link-button[disabled="true"] { + -moz-image-region: rect(64px, 800px, 96px, 768px); +} + #sidebar-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #sidebar-button { -moz-image-region: rect(0, 864px, 32px, 832px); } #sidebar-button[cui-areatype="menu-panel"]:hover, -toolbarpaletteitem[place="palette"] > #sidebar-button:hover { +toolbarpaletteitem[place="palette"] > #sidebar-button:hover, +#sidebar-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { -moz-image-region: rect(32px, 864px, 64px, 832px); } -#sidebar-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { - -moz-image-region: rect(32px, 864px, 64px, 832px); +#panic-button[cui-areatype="menu-panel"], +toolbarpaletteitem[place="palette"] > #panic-button { + -moz-image-region: rect(0, 896px, 32px, 864px); +} + +#panic-button[cui-areatype="menu-panel"]:hover, +toolbarpaletteitem[place="palette"] > #panic-button:hover, +#panic-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(32px, 896px, 64px, 864px); +} + +#web-apps-button[cui-areatype="menu-panel"], +toolbarpaletteitem[place="palette"] > #web-apps-button { + -moz-image-region: rect(0, 928px, 32px, 896px); +} + +#web-apps-button[cui-areatype="menu-panel"]:hover, +toolbarpaletteitem[place="palette"] > #web-apps-button:hover { + -moz-image-region: rect(32px, 928px, 64px, 896px); } toolbaritem[sdkstylewidget="true"] > toolbarbutton { diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index 6d6f09b4..26ee2bc1 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -1056,6 +1056,160 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left { visibility: hidden; } +.panel-mainview[panelid=customizationui-widget-panel], +#customizationui-widget-multiview > .panel-viewcontainer, +#customizationui-widget-multiview > .panel-viewcontainer > .panel-viewstack, +#PanelUI-panicView > .panel-subview-body, +#PanelUI-panicView { + overflow: visible; + color: #FF9F00; +} + +#PanelUI-panicView.cui-widget-panelview { + min-width: 280px; +} + +#PanelUI-panic-timeframe { + padding: 15px; + border-bottom: 1px solid #A09090; +} + +#panic-button-success-icon, +#PanelUI-panic-timeframe-icon, +#PanelUI-panic-timeframe-icon-small { + background-color: transparent; + -moz-margin-end: 10px; +} + +#panic-button-success-icon, +#PanelUI-panic-timeframe-icon { + list-style-image: url(chrome://browser/skin/panic-panel/header.png); + max-height: 48px; + width: 48px; +} + +#PanelUI-panic-timeframe-icon-small { + list-style-image: url(chrome://browser/skin/panic-panel/header-small.png); + max-height: 32px; + width: 32px; +} + +/* current attribute is only set when in use as a subview instead of a main view */ +#PanelUI-panicView[current] #PanelUI-panic-timeframe-icon { + display: none; +} + +#PanelUI-panicView.cui-widget-panelview #PanelUI-panic-timeframe-icon-small { + display: none; +} + +#panic-button-success-header, +#PanelUI-panic-header { + -moz-box-align: center; + margin-bottom: 5px; +} + +#PanelUI-panicView.cui-widget-panelview #PanelUI-panic-header { + margin-bottom: 0; +} + +#PanelUI-panic-timeframe-icon-small:-moz-locale-dir(rtl), +#PanelUI-panic-timeframe-icon:-moz-locale-dir(rtl) { + transform: scaleX(-1); +} + +/* +.subviewradio { +} + +.subviewradio@buttonStateHover@ { +} + +.subviewradio[selected], +.subviewradio[selected]:hover, +.subviewradio@buttonStateActive@ { +} + +.subviewradio > .radio-check { +} + +.subviewradio > .radio-check[selected] { +} +*/ + +#PanelUI-panic-explanations { + padding: 10px 10px 0; +} + +#PanelUI-panic-actionlist-main-label { + color: #A09090; + font-size: 0.9em; +} + +.PanelUI-panic-actionlist { + -moz-padding-start: 20px; + padding-top: 2px; + padding-bottom: 2px; + background-size: 16px 16px; + background-repeat: no-repeat; + background-color: transparent; + background-position: center left; +} + +.PanelUI-panic-actionlist:-moz-locale-dir(rtl) { + background-position: center right; +} + +#PanelUI-panic-actionlist-cookies { + background-image: -moz-image-rect(url(chrome://browser/skin/panic-panel/icons.png), 0, 16, 16, 0); +} + +#PanelUI-panic-actionlist-history { + background-image: -moz-image-rect(url(chrome://browser/skin/panic-panel/icons.png), 0, 32, 16, 16); +} + +#PanelUI-panic-actionlist-windows { + background-image: -moz-image-rect(url(chrome://browser/skin/panic-panel/icons.png), 0, 48, 16, 32); +} + +#PanelUI-panic-actionlist-newwindow { + background-image: -moz-image-rect(url(chrome://browser/skin/panic-panel/icons.png), 0, 64, 16, 48); +} + +#PanelUI-panic-warning { + color: #FF0000; + text-align: center; + width: 100%; + margin-top: 20px; +} + +#PanelUI-panic-view-button { + background-color: #FF0000; + color: #000000; +} + +#PanelUI-panic-view-button:hover { + background-color: #FFCF00; +} + +#PanelUI-panic-view-button:hover:active { + background-color: #FF9F00; +} + +#PanelUI-panic-view-button > .toolbarbutton-text { + text-align: center; + text-shadow: none; +} + +#panic-button-success-closebutton { +} + +#panic-button-success-closebutton:hover { +} + +#panic-button-success-closebutton:hover:active { +} + /* === END panelUIOverlay.inc.css === */ #PanelUI-contents #zoom-out-btn { diff --git a/LCARStrek/browser/menuPanelFx.png b/LCARStrek/browser/menuPanelFx.png index c70d657b..2936fabf 100644 Binary files a/LCARStrek/browser/menuPanelFx.png and b/LCARStrek/browser/menuPanelFx.png differ diff --git a/LCARStrek/browser/panic-panel/header-small.png b/LCARStrek/browser/panic-panel/header-small.png new file mode 100644 index 00000000..6782dc87 Binary files /dev/null and b/LCARStrek/browser/panic-panel/header-small.png differ diff --git a/LCARStrek/browser/panic-panel/header-small@2x.png b/LCARStrek/browser/panic-panel/header-small@2x.png new file mode 100644 index 00000000..afc687b4 Binary files /dev/null and b/LCARStrek/browser/panic-panel/header-small@2x.png differ diff --git a/LCARStrek/browser/panic-panel/header.png b/LCARStrek/browser/panic-panel/header.png new file mode 100644 index 00000000..cabf530c Binary files /dev/null and b/LCARStrek/browser/panic-panel/header.png differ diff --git a/LCARStrek/browser/panic-panel/header@2x.png b/LCARStrek/browser/panic-panel/header@2x.png new file mode 100644 index 00000000..a82187b5 Binary files /dev/null and b/LCARStrek/browser/panic-panel/header@2x.png differ diff --git a/LCARStrek/browser/panic-panel/icons.png b/LCARStrek/browser/panic-panel/icons.png new file mode 100644 index 00000000..45900004 Binary files /dev/null and b/LCARStrek/browser/panic-panel/icons.png differ diff --git a/LCARStrek/browser/panic-panel/icons@2x.png b/LCARStrek/browser/panic-panel/icons@2x.png new file mode 100644 index 00000000..502a25b4 Binary files /dev/null and b/LCARStrek/browser/panic-panel/icons@2x.png differ