[Pkg-mozext-commits] [tabmixplus] 94/123: Adjust css rules for tabs-closebutton on the tab strip by adding toolbarbutton-1 call to the button to make its padding and margin match other buttons
David Prévot
taffit at moszumanska.debian.org
Wed Sep 17 21:16:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository tabmixplus.
commit d048648570a04dec0ee32c3c7e11cb3fd8d373c6
Author: onemen <tabmix.onemen at gmail.com>
Date: Wed Sep 10 15:43:44 2014 +0300
Adjust css rules for tabs-closebutton on the tab strip by adding toolbarbutton-1 call to the button to make its padding and margin match other buttons
---
chrome/content/overlay/browsr.css | 2 +-
chrome/content/tab/tab.js | 3 +--
chrome/content/tab/tabbrowser_4.xml | 7 ++++++
chrome/skin/app_version/4.0/general.css | 9 +++++---
chrome/skin/app_version/4.0/linux/browser.css | 10 +++------
chrome/skin/app_version/4.0/mac/browser.css | 8 +++----
chrome/skin/app_version/4.0/win/browser.css | 31 +++++----------------------
7 files changed, 27 insertions(+), 43 deletions(-)
diff --git a/chrome/content/overlay/browsr.css b/chrome/content/overlay/browsr.css
index 2a23ea4..90e7257 100644
--- a/chrome/content/overlay/browsr.css
+++ b/chrome/content/overlay/browsr.css
@@ -109,7 +109,7 @@ label.text-link, label[onclick] {
-moz-binding: url("chrome://tabmixplus/content/tab/tabbrowser_4.xml#tabmix-tabbrowser-tab") !important;
}
-#TabsToolbar > #tabs-closebutton {
+#TabsToolbar > .tabs-closebutton {
-moz-binding: url("chrome://tabmixplus/content/tab/tabbrowser_4.xml#tabbrowser-close-tab-button")!important;
}
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index 83cc630..3b15943 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -1117,8 +1117,7 @@ var gTMPprefObserver = {
let _buttonsHeight = Tabmix.isVersion(310) ? Tabmix._buttonsHeight - 1 : Tabmix._buttonsHeight;
newRule = '#TabsToolbar[multibar] > .toolbarbutton-1,' +
- '#tabmixScrollBox[flowing=multibar] > toolbarbutton,' +
- '#TabsToolbar[multibar] > #tabs-closebutton {' +
+ '#tabmixScrollBox[flowing=multibar] > toolbarbutton {' +
' height: #px;}'.replace("#", _buttonsHeight);
this.insertRule(newRule);
delete Tabmix._buttonsHeight;
diff --git a/chrome/content/tab/tabbrowser_4.xml b/chrome/content/tab/tabbrowser_4.xml
index 8f9a641..21b5268 100644
--- a/chrome/content/tab/tabbrowser_4.xml
+++ b/chrome/content/tab/tabbrowser_4.xml
@@ -16,6 +16,13 @@
<binding id="tabbrowser-close-tab-button"
extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
+ <implementation>
+ <constructor>
+ <![CDATA[
+ this.classList.add("toolbarbutton-1");
+ ]]>
+ </constructor>
+ </implementation>
<handlers>
<handler event="click" button="1" action="TMP_ClosedTabs.undoCloseTab();"/>
</handlers>
diff --git a/chrome/skin/app_version/4.0/general.css b/chrome/skin/app_version/4.0/general.css
index 409f384..6036444 100644
--- a/chrome/skin/app_version/4.0/general.css
+++ b/chrome/skin/app_version/4.0/general.css
@@ -5,13 +5,17 @@
**/
+/* override some rules for toolbarbutton-1 and tabs-closebutton*/
+#TabsToolbar > .tabs-closebutton > .toolbarbutton-icon {
+ -moz-padding-end: 0px !important;
+ -moz-padding-start: 0px !important;
+}
+
/* for tabs close button on Firefox 31+ */
.tabs-closebutton.tabmix {
-moz-appearance: none;
height: 16px;
width: 16px;
- padding-top: 0px !important;
- padding-bottom: 0px !important;
}
.tabmix-showhover {
@@ -44,7 +48,6 @@
}
/* :::: make sure all buttons align to the top row :::: */
-#TabsToolbar[multibar] > #tabs-closebutton,
#TabsToolbar[multibar] > .tabmixplus-toolbar-inner-box,
#TabsToolbar[multibar] {
-moz-box-align: start;
diff --git a/chrome/skin/app_version/4.0/linux/browser.css b/chrome/skin/app_version/4.0/linux/browser.css
index b76c73a..7a415b3 100644
--- a/chrome/skin/app_version/4.0/linux/browser.css
+++ b/chrome/skin/app_version/4.0/linux/browser.css
@@ -19,20 +19,16 @@
margin-bottom: -4px !important;
}
-.tabbrowser-tabs[tabmix_australis][multibar] ~ #tabs-closebutton > .toolbarbutton-icon{
- margin-top: 2px;
-}
-
/*** Tabstrip close button Firefox 31+ ***/
-.tabs-closebutton.tabmix:not([selected]):not(:hover) {
+.tabs-closebutton.tabmix:not(:hover) {
background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 64, 16, 48);
}
-.tabs-closebutton.tabmix:not([selected]):not(:hover):-moz-lwtheme-brighttext {
+.tabs-closebutton.tabmix:not(:hover):-moz-lwtheme-brighttext {
background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 80, 16, 64);
}
-.tabs-closebutton.tabmix:not([selected]):not(:hover):-moz-lwtheme-darktext {
+.tabs-closebutton.tabmix:not(:hover):-moz-lwtheme-darktext {
background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 96, 16, 80);
}
diff --git a/chrome/skin/app_version/4.0/mac/browser.css b/chrome/skin/app_version/4.0/mac/browser.css
index a36ab2c..578ba79 100644
--- a/chrome/skin/app_version/4.0/mac/browser.css
+++ b/chrome/skin/app_version/4.0/mac/browser.css
@@ -15,12 +15,12 @@
}
*/
-/* Tabstrip close button Firefox 31+ */
-.tabs-closebutton.tabmix {
- -moz-padding-end: 4px;
- border: none;
+/* override some rules for toolbarbutton-1 and tabs-closebutton*/
+#TabsToolbar .tabs-closebutton:not([type="menu-button"]):not([disabled=true]):not([open]):hover {
+ background-image: none !important;
}
+/* Tabstrip close button Firefox 31+ */
@media (min-resolution: 2dppx) {
.tabs-closebutton.tabmix > .toolbarbutton-icon {
width: 16px;
diff --git a/chrome/skin/app_version/4.0/win/browser.css b/chrome/skin/app_version/4.0/win/browser.css
index e3d88a6..5830433 100644
--- a/chrome/skin/app_version/4.0/win/browser.css
+++ b/chrome/skin/app_version/4.0/win/browser.css
@@ -15,24 +15,16 @@
background-image: none !important;
}
+/* override some rules for toolbarbutton-1 and tabs-closebutton*/
+#TabsToolbar > .tabs-closebutton {
+ background-image: none !important;
+}
+
/* For .tabs-closebutton .showhover */
.tabbrowser-tabs > .tabbrowser-tab .tabs-closebutton {
margin: -3px 0px -3px 0px;
}
-/* Tabstrip close button Firefox 31 */
-.tabs-closebutton.tabmix {
- padding: 4px 2px;
- margin: 0px;
- border: none;
-}
-
-.tabs-closebutton.tabmix > .toolbarbutton-icon {
- -moz-margin-end: 0px !important;
- -moz-padding-end: 2px !important;
- -moz-padding-start: 2px !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;
@@ -44,19 +36,6 @@
}
*/
-/* default value padding-bottom: 4px; make row height 24 insted of 23 */
-#TabsToolbar > #tabs-closebutton {
- padding-bottom: 3px;
-}
-
-#TabsToolbar[multibar] > #tabs-closebutton {
- padding-top: 5px;
-}
-
-.tabbrowser-tabs[tabmix_australis][multibar] ~ #tabs-closebutton {
- padding-top: 8px !important;
-}
-
/* for TabsToolbar on bottom with windows 7 */
#tabmix-bottom-toolbox[tabmix_aero] {
-moz-appearance: none;
--
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