[Pkg-mozext-commits] [tabmixplus] 58/107: Use media queries instead of attribute to apply different css rule, fix background color for tabs below content in Windows
David Prévot
taffit at moszumanska.debian.org
Tue Dec 29 19:02:50 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository tabmixplus.
commit 35d97c85a6538f32ce187b0319a3fb4a237f8502
Author: onemen <tabmix.onemen at gmail.com>
Date: Tue Nov 10 20:08:35 2015 +0200
Use media queries instead of attribute to apply different css rule, fix background color for tabs below content in Windows
---
chrome.manifest | 3 +-
chrome/content/tab/scrollbox.xml | 2 --
chrome/content/tabmix.js | 3 --
chrome/skin/app_version/39.0/win/browser.css | 34 ++++++++++------------
.../39.0/win/{browser.css => tabStyles.css} | 7 ++---
chrome/skin/app_version/41.0/win/browser.css | 30 +++++++++++++++++++
chrome/skin/app_version/all/win/browser.css | 23 ++-------------
chrome/skin/app_version/before39.0/win/browser.css | 18 ++++++++++++
8 files changed, 70 insertions(+), 50 deletions(-)
diff --git a/chrome.manifest b/chrome.manifest
index b783094..04a1bbe 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -82,7 +82,8 @@ skin tabmixplus classic/1.0 chrome/skin/
skin tabmix-version tabmixplus chrome/skin/app_version/before39.0/ appversion<39.0a1
skin tabmix-version tabmixplus chrome/skin/app_version/39.0/ appversion>=39.0a1
-skin tabmix-os classic/1.0 chrome://tabmix-version/skin/win/ os=WINNT
+skin tabmix-os classic/1.0 chrome://tabmix-version/skin/win/ os=WINNT appversion<41.0a1
+skin tabmix-os classic/1.0 chrome/skin/app_version/41.0/win/ os=WINNT appversion>=41.0a1
skin tabmix-os classic/1.0 chrome://tabmix-version/skin/mac/ os=Darwin
skin tabmix-os classic/1.0 chrome://tabmix-version/skin/linux/ os=Linux
diff --git a/chrome/content/tab/scrollbox.xml b/chrome/content/tab/scrollbox.xml
index 6d2134c..319f538 100644
--- a/chrome/content/tab/scrollbox.xml
+++ b/chrome/content/tab/scrollbox.xml
@@ -623,8 +623,6 @@
bottomToolbox = document.createElement("toolbox");
bottomToolbox.setAttribute("id", "tabmix-bottom-toolbox");
bottomToolbox.collapsed = !gBrowser.tabContainer.visible;
- if (navigator.oscpu.startsWith("Windows NT 6.1"))
- bottomToolbox.setAttribute("tabmix_aero", true);
// if we decide to move this box into browser-bottombox
// remember to fix background css rules for all platform
let referenceNode = document.getElementById("content-deck");
diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index bdfa126..507fd95 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -472,9 +472,6 @@ var TMP_eventListener = {
}
var tabsToolbar = document.getElementById("TabsToolbar");
- if (navigator.oscpu.startsWith("Windows NT 6.1")) {
- Tabmix.setItem(tabsToolbar, "tabmix_aero", true);
- }
if (TabmixSvc.australis) {
let australis = TabmixSvc.isAustralisBgStyle(tabBar.orient);
diff --git a/chrome/skin/app_version/39.0/win/browser.css b/chrome/skin/app_version/39.0/win/browser.css
index e7f9c4b..3f0dd49 100644
--- a/chrome/skin/app_version/39.0/win/browser.css
+++ b/chrome/skin/app_version/39.0/win/browser.css
@@ -7,27 +7,23 @@
@import url("chrome://tabmixplus/skin/app_version/all/win/browser.css");
@import url("chrome://tabmixplus/skin/app_version/all/win/progress.css");
+ at import url("chrome://tabmixplus/skin/app_version/39.0/win/tabStyles.css");
@import url("chrome://tabmixplus/skin/app_version/39.0/tabStyles.css");
-#main-window[tabsintitlebar][sizemode=normal] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar
- #tabbrowser-tabs[tabmix_unloadedStyle~="aus"] > .tabbrowser-tab:not([visuallyselected="true"])[tabmix_tabState="unloaded"] > .tab-stack > .tab-background > .tab-background-middle,
-#main-window[tabsintitlebar][sizemode=normal] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar
- #tabbrowser-tabs[tabmix_unreadStyle~="aus"] > .tabbrowser-tab:not([visuallyselected="true"])[tabmix_tabState="unread"] > .tab-stack > .tab-background > .tab-background-middle,
-#main-window[tabsintitlebar][sizemode=normal] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar
- #tabbrowser-tabs[tabmix_otherStyle~="aus"] > .tabbrowser-tab:not([visuallyselected="true"]):not([tabmix_tabState]) > .tab-stack > .tab-background > .tab-background-middle {
- clip-path: none !important;
-}
+ at media all and (-moz-os-version: windows-win7) {
+ /* new tab button after last tab on firefox 4.0 aero */
+ #tabbrowser-tabs[multibar=true] .tabbrowser-arrowscrollbox > toolbarbutton {
+ vertical-align: bottom;
+ }
+
+ /* for TabsToolbar on bottom with windows 7 */
+ #tabmix-bottom-toolbox {
+ -moz-appearance: none;
+ border-top: none;
+ background-color: transparent;
+ }
-/* Override Windows 10 rulse */
- at media not all and (-moz-os-version: windows-xp) {
- @media not all and (-moz-os-version: windows-vista) {
- @media not all and (-moz-os-version: windows-win7) {
- @media not all and (-moz-os-version: windows-win8) {
- #tabbrowser-tabs[tabmix_currentStyle~="bg"] > .tabbrowser-tab[visuallyselected="true"] > .tab-stack > .tab-background > .tab-background-middle {
- background-size: auto 100%, auto 100%, auto 100%;
- background-clip: content-box;
- }
- }
- }
+ #TabsToolbar[tabbaronbottom]:not(:-moz-lwtheme) {
+ -moz-appearance: none;
}
}
diff --git a/chrome/skin/app_version/39.0/win/browser.css b/chrome/skin/app_version/39.0/win/tabStyles.css
similarity index 85%
copy from chrome/skin/app_version/39.0/win/browser.css
copy to chrome/skin/app_version/39.0/win/tabStyles.css
index e7f9c4b..244a553 100644
--- a/chrome/skin/app_version/39.0/win/browser.css
+++ b/chrome/skin/app_version/39.0/win/tabStyles.css
@@ -1,14 +1,13 @@
/**
Firefox version 39+
+ Bug 1066531 replaced selected attribute with visuallyselected
+
+ :::: use visuallyselected instead of selected ::::
Windows platform
**/
- at import url("chrome://tabmixplus/skin/app_version/all/win/browser.css");
- at import url("chrome://tabmixplus/skin/app_version/all/win/progress.css");
- at import url("chrome://tabmixplus/skin/app_version/39.0/tabStyles.css");
-
#main-window[tabsintitlebar][sizemode=normal] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar
#tabbrowser-tabs[tabmix_unloadedStyle~="aus"] > .tabbrowser-tab:not([visuallyselected="true"])[tabmix_tabState="unloaded"] > .tab-stack > .tab-background > .tab-background-middle,
#main-window[tabsintitlebar][sizemode=normal] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar
diff --git a/chrome/skin/app_version/41.0/win/browser.css b/chrome/skin/app_version/41.0/win/browser.css
new file mode 100644
index 0000000..aae2df7
--- /dev/null
+++ b/chrome/skin/app_version/41.0/win/browser.css
@@ -0,0 +1,30 @@
+/**
+Firefox version 41+
+
+Windows platform
+
+**/
+
+ at import url("chrome://tabmixplus/skin/app_version/all/win/browser.css");
+ at import url("chrome://tabmixplus/skin/app_version/all/win/progress.css");
+ at import url("chrome://tabmixplus/skin/app_version/39.0/win/tabStyles.css");
+ at import url("chrome://tabmixplus/skin/app_version/39.0/tabStyles.css");
+
+/* for windows 7 and up */
+ at media not all and (-moz-os-version: windows-xp) {
+ @media not all and (-moz-os-version: windows-vista) {
+ #tabbrowser-tabs[multibar=true] .tabbrowser-arrowscrollbox > toolbarbutton {
+ vertical-align: bottom;
+ }
+
+ #tabmix-bottom-toolbox {
+ -moz-appearance: none;
+ border-top: none;
+ background-color: transparent;
+ }
+
+ #TabsToolbar[tabbaronbottom]:not(:-moz-lwtheme) {
+ -moz-appearance: none;
+ }
+ }
+}
diff --git a/chrome/skin/app_version/all/win/browser.css b/chrome/skin/app_version/all/win/browser.css
index 74cfa33..d6a3a96 100644
--- a/chrome/skin/app_version/all/win/browser.css
+++ b/chrome/skin/app_version/all/win/browser.css
@@ -21,27 +21,8 @@
background-image: none !important;
}
-/* new tab button after last tab on firefox 4.0 aero */
-#TabsToolbar[tabmix_aero] .tabbrowser-tabs[multibar=true] .tabbrowser-arrowscrollbox > toolbarbutton {
- vertical-align: bottom;
-}
-
-/* enable this rule after bug 738491 australis-tabs-win lands, and move it to diffrent file
-#tabbrowser-tabs[flowing="multibar"]:not([multibar]) > .tabbrowser-arrowscrollbox > toolbarbutton {
- vertical-align: bottom;
-}
-*/
-
-/* for TabsToolbar on bottom with windows 7 */
-#tabmix-bottom-toolbox[tabmix_aero] {
- -moz-appearance: none;
- border-top: none;
- background-color: transparent;
-}
-
-#TabsToolbar[tabbaronbottom][tabmix_aero]:not(:-moz-lwtheme) {
- -moz-appearance: none;
- border-style: none;
+#TabsToolbar[tabbaronbottom]:not(:-moz-lwtheme) {
+ border-top: 1px solid rgba(10, 31, 51, 0.35);
}
/* scrollbutton arrow - fix borders */
diff --git a/chrome/skin/app_version/before39.0/win/browser.css b/chrome/skin/app_version/before39.0/win/browser.css
index dfb90f6..ed4e90e 100644
--- a/chrome/skin/app_version/before39.0/win/browser.css
+++ b/chrome/skin/app_version/before39.0/win/browser.css
@@ -9,6 +9,24 @@
@import url("chrome://tabmixplus/skin/app_version/all/win/progress.css");
@import url("chrome://tabmixplus/skin/app_version/before39.0/tabStyles.css");
+ at media all and (-moz-os-version: windows-win7) {
+ /* new tab button after last tab on firefox 4.0 aero */
+ #tabbrowser-tabs[multibar=true] .tabbrowser-arrowscrollbox > toolbarbutton {
+ vertical-align: bottom;
+ }
+
+ /* for TabsToolbar on bottom with windows 7 */
+ #tabmix-bottom-toolbox {
+ -moz-appearance: none;
+ border-top: none;
+ background-color: transparent;
+ }
+
+ #TabsToolbar[tabbaronbottom]:not(:-moz-lwtheme) {
+ -moz-appearance: none;
+ }
+}
+
#main-window[tabsintitlebar][sizemode=normal] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar
#tabbrowser-tabs[tabmix_unloadedStyle~="aus"] > .tabbrowser-tab:not([selected="true"])[tabmix_tabState="unloaded"] > .tab-stack > .tab-background > .tab-background-middle,
#main-window[tabsintitlebar][sizemode=normal] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git
More information about the Pkg-mozext-commits
mailing list