From 08da5475249fabad34ecbf014c27feca58065abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A3o=20Gottwald?= Date: Wed, 7 Sep 2016 16:25:50 +0200 Subject: [PATCH] Bug 1300876 - Share Ctrl+Tab panel styling across platforms. r=gijs --HG-- rename : browser/themes/windows/browser.css => browser/themes/shared/ctrlTab.inc.css --- browser/themes/linux/browser.css | 54 +---------------------- browser/themes/osx/browser.css | 53 +--------------------- browser/themes/shared/ctrlTab.inc.css | 63 +++++++++++++++++++++++++++ browser/themes/windows/browser.css | 54 +---------------------- 4 files changed, 66 insertions(+), 158 deletions(-) create mode 100644 browser/themes/shared/ctrlTab.inc.css diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index 5727da266445..b9457c8d46b4 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -1711,58 +1711,6 @@ toolbarbutton.chevron > .toolbarbutton-icon { margin: 0; } -/* Ctrl-Tab */ - -#ctrlTab-panel { - -moz-appearance: none; - background: hsla(0,0%,33%,.85); - color: white; - border-style: none; - padding: 20px 10px 10px; - font-weight: bold; - text-shadow: 0 0 1px hsl(0,0%,12%), 0 0 2px hsl(0,0%,12%); -} - -.ctrlTab-favicon[src] { - background-color: white; - width: 20px; - height: 20px; - padding: 2px; -} - -.ctrlTab-preview-inner > .tabPreview-canvas { - box-shadow: 1px 1px 2px hsl(0,0%,12%); -} - -.ctrlTab-preview:not(#ctrlTab-showAll) > * > .ctrlTab-preview-inner > .tabPreview-canvas { - margin-bottom: 2px; -} - -.ctrlTab-preview-inner { - padding: 8px; - border: 2px solid transparent; - border-radius: .5em; -} - -.ctrlTab-preview:not(#ctrlTab-showAll) > * > .ctrlTab-preview-inner { - margin: -10px -10px 0; -} - -#ctrlTab-showAll:not(:focus) > * > .ctrlTab-preview-inner { - background-color: rgba(255,255,255,.2); -} - -.ctrlTab-preview:focus > * > .ctrlTab-preview-inner { - color: white; - background-color: rgba(0,0,0,.6); - text-shadow: none; - border-color: white; -} - -#ctrlTab-showAll { - margin-top: .5em; -} - /* Status panel */ .statuspanel-label { @@ -1790,9 +1738,9 @@ toolbarbutton.chevron > .toolbarbutton-icon { } %include ../shared/fullscreen/warning.inc.css +%include ../shared/ctrlTab.inc.css %include ../../../devtools/client/themes/responsivedesign.inc.css %include ../../../devtools/client/themes/commandline.inc.css - %include ../shared/plugin-doorhanger.inc.css notification.pluginVulnerable > .notification-inner > .messageCloseButton:not(:hover) { diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css index 4744f5e84ae2..d1b0c392ec9f 100644 --- a/browser/themes/osx/browser.css +++ b/browser/themes/osx/browser.css @@ -3123,58 +3123,6 @@ menulist.translate-infobar-element > .menulist-dropmarker { font-weight: bold; } -/* Ctrl-Tab */ - -#ctrlTab-panel { - -moz-appearance: none; - -moz-window-shadow: none; - background: hsla(0,0%,33%,.85); - color: white; - border-style: none; - padding: 20px 10px 10px; - text-shadow: 0 0 1px hsl(0,0%,12%), 0 0 2px hsl(0,0%,12%); -} - -.ctrlTab-favicon[src] { - background-color: white; - width: 20px; - height: 20px; - padding: 2px; -} - -.ctrlTab-preview-inner > .tabPreview-canvas { - box-shadow: 1px 1px 2px hsl(0,0%,12%); -} - -.ctrlTab-preview:not(#ctrlTab-showAll) > * > .ctrlTab-preview-inner > .tabPreview-canvas { - margin-bottom: 2px; -} - -.ctrlTab-preview-inner { - padding: 8px; - border: 2px solid transparent; - border-radius: .5em; -} - -.ctrlTab-preview:not(#ctrlTab-showAll) > * > .ctrlTab-preview-inner { - margin: -10px -10px 0; -} - -#ctrlTab-showAll:not(:focus) > * > .ctrlTab-preview-inner { - background-color: rgba(255,255,255,.2); -} - -.ctrlTab-preview:focus > * > .ctrlTab-preview-inner { - color: white; - background-color: rgba(0,0,0,.6); - text-shadow: none; - border-color: white; -} - -#ctrlTab-showAll { - margin-top: .5em; -} - /* Status panel */ .statuspanel-label { @@ -3202,6 +3150,7 @@ menulist.translate-infobar-element > .menulist-dropmarker { } %include ../shared/fullscreen/warning.inc.css +%include ../shared/ctrlTab.inc.css %include ../../../devtools/client/themes/responsivedesign.inc.css %include ../../../devtools/client/themes/commandline.inc.css %include ../shared/plugin-doorhanger.inc.css diff --git a/browser/themes/shared/ctrlTab.inc.css b/browser/themes/shared/ctrlTab.inc.css new file mode 100644 index 000000000000..1205d04995b8 --- /dev/null +++ b/browser/themes/shared/ctrlTab.inc.css @@ -0,0 +1,63 @@ +%if 0 +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +%endif + +/* Ctrl-Tab */ + +#ctrlTab-panel { + -moz-appearance: none; +%ifdef XP_MACOSX + -moz-window-shadow: none; +%endif + background: hsla(0,0%,33%,.85); + color: white; + border-style: none; + padding: 20px 10px 10px; +%ifndef XP_MACOSX + font-weight: bold; +%endif + text-shadow: 0 0 1px hsl(0,0%,12%), 0 0 2px hsl(0,0%,12%); +} + +.ctrlTab-favicon[src] { + background-color: white; + width: 20px; + height: 20px; + padding: 2px; +} + +.ctrlTab-preview-inner > .tabPreview-canvas { + box-shadow: 1px 1px 2px hsl(0,0%,12%); +} + +.ctrlTab-preview:not(#ctrlTab-showAll) > * > .ctrlTab-preview-inner > .tabPreview-canvas { + margin-bottom: 2px; +} + +.ctrlTab-preview-inner { + padding: 8px; + border: 2px solid transparent; + border-radius: .5em; +} + +.ctrlTab-preview:not(#ctrlTab-showAll) > * > .ctrlTab-preview-inner { + margin: -10px -10px 0; +} + +#ctrlTab-showAll:not(:focus) > * > .ctrlTab-preview-inner { + background-color: rgba(255,255,255,.2); +} + +.ctrlTab-preview:focus > * > .ctrlTab-preview-inner { + color: white; + background-color: rgba(0,0,0,.6); + text-shadow: none; + border-color: white; +} + +#ctrlTab-showAll { + margin-top: .5em; +} + diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index 1ef905efa7ec..57a403a52f40 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -2393,58 +2393,6 @@ notification[value="translation"] { -moz-image-region: auto; } -/* Ctrl-Tab */ - -#ctrlTab-panel { - -moz-appearance: none; - background: hsla(0,0%,33%,.85); - color: white; - border-style: none; - padding: 20px 10px 10px; - font-weight: bold; - text-shadow: 0 0 1px hsl(0,0%,12%), 0 0 2px hsl(0,0%,12%); -} - -.ctrlTab-favicon[src] { - background-color: white; - width: 20px; - height: 20px; - padding: 2px; -} - -.ctrlTab-preview-inner > .tabPreview-canvas { - box-shadow: 1px 1px 2px hsl(0,0%,12%); -} - -.ctrlTab-preview:not(#ctrlTab-showAll) > * > .ctrlTab-preview-inner > .tabPreview-canvas { - margin-bottom: 2px; -} - -.ctrlTab-preview-inner { - padding: 8px; - border: 2px solid transparent; - border-radius: .5em; -} - -.ctrlTab-preview:not(#ctrlTab-showAll) > * > .ctrlTab-preview-inner { - margin: -10px -10px 0; -} - -#ctrlTab-showAll:not(:focus) > * > .ctrlTab-preview-inner { - background-color: rgba(255,255,255,.2); -} - -.ctrlTab-preview:focus > * > .ctrlTab-preview-inner { - color: white; - background-color: rgba(0,0,0,.6); - text-shadow: none; - border-color: white; -} - -#ctrlTab-showAll { - margin-top: .5em; -} - /* Status panel */ .statuspanel-label { @@ -2484,9 +2432,9 @@ notification[value="translation"] { } %include ../shared/fullscreen/warning.inc.css +%include ../shared/ctrlTab.inc.css %include ../../../devtools/client/themes/responsivedesign.inc.css %include ../../../devtools/client/themes/commandline.inc.css - %include ../shared/plugin-doorhanger.inc.css notification.pluginVulnerable > .notification-inner > .messageCloseButton {