[Pkg-mozext-commits] [all-in-one-sidebar] 23/49: Major: Fix #5 #15 #32 #35: toolbar configuration and theme compatibility with fx29 (australis)
David Prévot
taffit at moszumanska.debian.org
Fri Sep 19 16:46:37 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository all-in-one-sidebar.
commit c77866ec8f7216a1ac09c8fb3272ec742a5e92fb
Author: Ingo Wennemaring <github at addonlab.com>
Date: Tue Apr 22 15:18:40 2014 +0200
Major: Fix #5 #15 #32 #35: toolbar configuration and theme compatibility with fx29 (australis)
---
content/_helper.js | 17 +
content/aios.dtd | 6 +-
content/aios.js | 95 ++++++
content/aios.xul | 58 +++-
install.rdf | 4 +-
locale/de/aios.dtd | 2 +
locale/en-GB/aios.dtd | 2 +
locale/en-US/aios.dtd | 2 +
skin/css/aios.css | 2 +-
skin/css/aios_buttons_darwin.css | 2 +-
skin/css/aios_buttons_generic.css | 2 +-
skin/css/aios_buttons_winnt.css | 2 +-
skin/icons/toolbar_darwin.png | Bin 2804 -> 2238 bytes
skin/icons/toolbar_darwin_inverted.png | Bin 0 -> 1593 bytes
skin/icons/toolbar_generic.png | Bin 12835 -> 12724 bytes
skin/icons/toolbar_inverted_windows.png | Bin 2330 -> 0 bytes
skin/icons/toolbar_windows.png | Bin 3242 -> 5322 bytes
skin/icons/toolbar_windows_inverted.png | Bin 0 -> 2753 bytes
skin/scss/aios_buttons_darwin.scss | 197 +++++-------
skin/scss/aios_buttons_generic.scss | 270 ++++++++++++----
skin/scss/aios_buttons_winnt.scss | 534 ++++++++++++++++----------------
21 files changed, 723 insertions(+), 472 deletions(-)
diff --git a/content/_helper.js b/content/_helper.js
index f0d203b..1579359 100644
--- a/content/_helper.js
+++ b/content/_helper.js
@@ -18,6 +18,13 @@ var AiOS_HELPER = {
},
+ initOnDOMLoaded: function() {
+
+ AiOS_HELPER.aiosToolbar = document.getElementById('aios-toolbar');
+ AiOS_HELPER.sbhToolbar = document.getElementById('aios-sbhtoolbar');
+
+ },
+
rememberAppInfo: function(aObj) {
aObj.setAttribute('aios-appVendor', this.appInfo.vendor);
@@ -26,12 +33,22 @@ var AiOS_HELPER = {
aObj.setAttribute('aios-appOSVersion', this.osVersion);
aObj.setAttribute('aios-appDefTheme', this.defTheme);
+ },
+
+ unload: function() {
+ window.removeEventListener("DOMContentLoaded", AiOS_HELPER.initOnDOMLoaded);
+ //window.removeEventListener("load", AiOS_HELPER.initOnLoad);
+ window.removeEventListener("unload", AiOS_HELPER.unload);
}
};
AiOS_HELPER.init();
+window.addEventListener("DOMContentLoaded", AiOS_HELPER.initOnDOMLoaded, false);
+//window.addEventListener("load", AiOS_HELPER.initOnLoad, false);
+window.addEventListener("unload", AiOS_HELPER.unload, false);
+
// globale Variablen und Funktionen zur Ueberwachung auf Progress-Veraenderungen
diff --git a/content/aios.dtd b/content/aios.dtd
index 5a7bafe..a5f3141 100644
--- a/content/aios.dtd
+++ b/content/aios.dtd
@@ -7,9 +7,9 @@
<!ENTITY about6.link "http://firefox.exxile.net/aios/changelog.php">
<!ENTITY about7.link "http://firefox.exxile.net/aios/todo.php">
-<!ENTITY contrib1.name "alta88">
-<!ENTITY contrib1.ext "TotalToolbar">
-<!ENTITY contrib1.link "http://totaltoolbar.mozdev.org/">
+<!ENTITY contrib1.name "Gomita">
+<!ENTITY contrib1.ext "Vertical Toolbar">
+<!ENTITY contrib1.link "http://www.xuldev.org/verticaltoolbar/">
<!ENTITY contrib2.name "CPU">
<!ENTITY contrib2.ext "Tab Mix Plus">
diff --git a/content/aios.js b/content/aios.js
new file mode 100644
index 0000000..4db01a3
--- /dev/null
+++ b/content/aios.js
@@ -0,0 +1,95 @@
+var AiOS = {
+
+ mainWindow: document.getElementById('main-window'),
+
+
+ initOnDOMLoaded: function() {
+
+ AiOS_HELPER.rememberAppInfo( AiOS.mainWindow );
+
+ },
+
+
+ // initOnLoad: function() {
+
+ // },
+
+
+ beforeCustomization: function() {
+
+ var toolbars = new Array(AiOS_HELPER.aiosToolbar, AiOS_HELPER.sbhToolbar);
+
+ PlacesToolbarHelper.customizeStart();
+
+ for(var i in toolbars) {
+
+ toolbars[i].setAttribute('_toolbox', toolbars[i].parentNode.id);
+
+ toolbars[i].setAttribute('_context', toolbars[i].getAttribute('context'));
+ toolbars[i].setAttribute('context', 'toolbar-context-menu');
+ toolbars[i].setAttribute('_orient', toolbars[i].getAttribute('orient'));
+ toolbars[i].setAttribute('orient', 'horizontal');
+ toolbars[i].setAttribute('_mode', toolbars[i].getAttribute('mode'));
+ toolbars[i].setAttribute('mode', 'icons');
+
+ toolbars[i].setAttribute('align', 'center');
+
+ var label = document.createElement('label');
+ label.setAttribute('value', toolbars[i].getAttribute('toolbarlabel'));
+ toolbars[i].insertBefore(label, toolbars[i].firstChild);
+
+ gNavToolbox.appendChild(toolbars[i]);
+
+ }
+
+ PlacesToolbarHelper.customizeDone();
+
+ },
+
+
+ afterCustomization: function() {
+
+ var toolbars = new Array(AiOS_HELPER.aiosToolbar, AiOS_HELPER.sbhToolbar);
+
+ PlacesToolbarHelper.customizeStart();
+
+ for(var i in toolbars) {
+
+ toolbars[i].removeChild(toolbars[i].querySelector('label'));
+
+ toolbars[i].setAttribute('context', toolbars[i].getAttribute('_context'));
+ toolbars[i].removeAttribute('_context');
+ toolbars[i].setAttribute('orient', toolbars[i].getAttribute('_orient'));
+ toolbars[i].removeAttribute('_orient');
+ toolbars[i].setAttribute('mode', toolbars[i].getAttribute('_mode'));
+ toolbars[i].removeAttribute('_mode');
+
+ toolbars[i].removeAttribute('align');
+
+ document.getElementById(toolbars[i].getAttribute('_toolbox')).appendChild(toolbars[i]);
+ toolbars[i].removeAttribute('_toolbox');
+
+ }
+
+ PlacesToolbarHelper.customizeDone();
+
+ },
+
+
+ unload: function() {
+ window.removeEventListener("DOMContentLoaded", AiOS.initOnDOMLoaded);
+ //window.removeEventListener("load", AiOS.initOnLoad);
+ window.removeEventListener("unload", AiOS.unload);
+
+ gNavToolbox.removeEventListener("beforecustomization", AiOS.beforeCustomization);
+ gNavToolbox.removeEventListener("aftercustomization", AiOS.afterCustomization);
+ }
+
+};
+
+window.addEventListener("DOMContentLoaded", AiOS.initOnDOMLoaded, false);
+//window.addEventListener("load", AiOS.initOnLoad, false);
+window.addEventListener("unload", AiOS.unload, false);
+
+gNavToolbox.addEventListener("beforecustomization", AiOS.beforeCustomization, false);
+gNavToolbox.addEventListener("aftercustomization", AiOS.afterCustomization, false);
\ No newline at end of file
diff --git a/content/aios.xul b/content/aios.xul
index 290b249..fa911a4 100644
--- a/content/aios.xul
+++ b/content/aios.xul
@@ -19,6 +19,8 @@
<script type="application/x-javascript" src="chrome://aios/content/_helper.js" />
<script type="application/x-javascript" src="chrome://aios/content/_lib.js" />
<script type="application/x-javascript" src="chrome://aios/content/multipanel.js" />
+
+ <script type="application/x-javascript" src="chrome://aios/content/aios.js" />
<script type="application/x-javascript" src="chrome://aios/content/aios_old.js" />
<script type="application/x-javascript" src="chrome://aios/content/aios_fx.js" />
<script type="application/x-javascript" src="chrome://aios/content/aios_tbx.js" />
@@ -83,11 +85,11 @@
oncommand="aios_toggleElement(this); event.stopPropagation();"
label="&menu.togglebar.label;" />
- <broadcaster id="aios-viewGrippy" type="checkbox" checked="false" persist="checked" aiosChilds="aios-sidebarGrippy"
+ <broadcaster id="aios-viewGrippy" type="checkbox" persist="checked" aiosChilds="aios-sidebarGrippy"
oncommand="aios_toggleElement(this); document.getElementById('sidebar-splitter').setAttribute('grippy', this.getAttribute('checked')); event.stopPropagation();"
label="&menu.grippy.label;" />
- <broadcaster id="aios-enableAutohide" type="checkbox" checked="false" persist="checked"
+ <broadcaster id="aios-enableAutohide" type="checkbox" persist="checked"
oncommand="aios_toggleElement(this); aios_toggleAutohide(this); event.stopPropagation();" />
</broadcasterset>
@@ -151,23 +153,26 @@
<!-- AIOS-Toolbar-Buttons -->
<toolbarpalette id="BrowserToolbarPalette">
- <toolbarbutton id="sidebarclose-button" class="tabs-closebutton"
+ <toolbarbutton id="sidebarclose-button" class="tabs-closebutton close-icon"
oncommand="aios_toggleSidebar(this);" ondblclick="event.stopPropagation();"
tooltiptext="&sidebarCloseButton.tooltip;" label="&sidebarCloseButton.tooltip;" />
- <toolbarbutton id="bookmarks-button" tooltip="bookmarks-tooltip" tooltiptext="&bookmarksButton.tooltip;"
+ <toolbarbutton id="bookmarks-button" class="toolbarbutton-1 chromeclass-toolbar-additional aios-tbutton"
+ label="&bookmarksButton.label;" tooltip="bookmarks-tooltip" tooltiptext="&bookmarksButton.tooltip;"
command="View:Bookmarks">
<observes element="viewBookmarksSidebar" attribute="checked" />
<observes element="viewBookmarksSidebar" attribute="onclick" />
</toolbarbutton>
- <toolbarbutton id="history-button" tooltip="history-tooltip" tooltiptext="&historyButton.tooltip;"
+ <toolbarbutton id="history-button" class="toolbarbutton-1 chromeclass-toolbar-additional aios-tbutton"
+ label="&historyButton.label;" tooltip="history-tooltip" tooltiptext="&historyButton.tooltip;"
command="View:History">
<observes element="viewHistorySidebar" attribute="checked" />
<observes element="viewHistorySidebar" attribute="onclick" />
</toolbarbutton>
- <toolbarbutton id="downloads-button" tooltip="downloads-tooltip" tooltiptext="&downloads.tooltip;"
+ <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional aios-tbutton"
+ label="&downloads.label;" tooltip="downloads-tooltip" tooltiptext="&downloads.tooltip;"
command="Tools:Downloads">
<observes element="viewDownloadsSidebar" attribute="checked" />
<observes element="viewDownloadsSidebar" attribute="onclick" />
@@ -466,7 +471,10 @@
<!-- TOOLBOX LINKS NEBEN DER SIDEBAR -->
- <toolbox id="aios-toolbox-left" insertbefore="sidebar-box" defaultmode="icons" class="chromeclass-toolbar" vertical="true" palette="BrowserToolbarPalette">
+ <toolbox id="aios-toolbox-left" class="chromeclass-toolbar"
+ insertbefore="sidebar-box"
+ defaultmode="icons"
+ vertical="true">
<!-- mode und iconsize noetig, um Optionen im Konfigrationsdialog syncron zu halten -->
<observes element="aios-toolbar" attribute="mode" />
@@ -478,10 +486,22 @@
=> die Toolbox darf nicht 'collapsed' sein, weil sonst die Sidebar nicht skalierbar ist
-->
- <toolbar id="aios-toolbar" toolbarname="&toolbar.name;" context="aios-toolbar-contextmenu" customizable="true" class="chromeclass-toolbar"
- posMode="1" mode="icons" iconsize="large" flexbuttons="false" persist="posMode mode iconsize flexbuttons hidden"
+ <toolbar id="aios-toolbar" class="chromeclass-toolbar"
+ toolbarname="&toolbar.name;"
+ context="aios-toolbar-contextmenu"
+ fullscreentoolbar="true"
+ toolboxid="navigator-toolbox"
+ customizable="true"
+ mode="icons"
+ iconsize="large"
+ persist="posMode mode iconsize flexbuttons hidden"
defaultset="bookmarks-button,history-button,separator,downloads-button,addons-button,separator,multipanel-button,pageinfo-button"
- toolboxid="navigator-toolbox" fullscreentoolbar="true" >
+ orient="vertical"
+ flex="1"
+
+ toolbarlabel="&toolbar.label;:"
+ posMode="1"
+ flexbuttons="false">
</toolbar>
<toolbarset />
@@ -536,9 +556,18 @@
<observes element="aios-sbhtoolbar" attribute="defaultmode" />
<observes element="aios-sbhtoolbar" attribute="iconsize" />
- <toolbar id="aios-sbhtoolbar" toolbarname="&sbhtoolbar.name;" context="aios-sbhtoolbar-contextmenu" customizable="true" class="chromeclass-toolbar"
- mode="icons" iconsize="small" flexbuttons="false" persist="mode iconsize"
- defaultset="autohide-button,paneltab-button,sidebarclose-button" toolboxid="navigator-toolbox" >
+ <toolbar id="aios-sbhtoolbar" class="chromeclass-toolbar"
+ toolbarname="&sbhtoolbar.name;"
+ context="aios-sbhtoolbar-contextmenu"
+ toolboxid="navigator-toolbox"
+ customizable="true"
+ mode="icons"
+ iconsize="small"
+ persist="mode iconsize"
+ defaultset="autohide-button,paneltab-button,sidebarclose-button"
+
+ toolbarlabel="&sbhtoolbar.label;:"
+ flexbuttons="false" >
<!-- verhindert, dass die Toolbar in einen anderen Modus ausser Icons versetzt wird -->
<observes element="aios-sbhtoolbar" attribute="mode" onbroadcast="document.getElementById('aios-sbhtoolbar').setAttribute('mode', 'icons');" />
@@ -573,7 +602,4 @@
</hbox>
-
- <toolbox id="navigator-toolbox" palette="BrowserToolbarPalette" />
-
</overlay>
\ No newline at end of file
diff --git a/install.rdf b/install.rdf
index 12c5fff..1851a25 100644
--- a/install.rdf
+++ b/install.rdf
@@ -20,8 +20,8 @@
<!-- Firefox -->
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
- <em:minVersion>14.0</em:minVersion>
- <em:maxVersion>23.*</em:maxVersion>
+ <em:minVersion>29.0</em:minVersion>
+ <em:maxVersion>29.*</em:maxVersion>
</Description>
</em:targetApplication>
diff --git a/locale/de/aios.dtd b/locale/de/aios.dtd
index 55f8756..4214f27 100644
--- a/locale/de/aios.dtd
+++ b/locale/de/aios.dtd
@@ -3,7 +3,9 @@
<!ENTITY menu.togglebar.label "Sidebar-Umschalter">
<!ENTITY menu.grippy.label "Sidebar-Griff">
<!ENTITY toolbar.name "All-in-One-Sidebar-Symbolleiste">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
<!ENTITY sbhtoolbar.name "Sidebartitel-Symbolleiste">
+<!ENTITY sbhtoolbar.label "Sidebartitel">
<!ENTITY button.toggle.label "AiOS">
<!ENTITY button.toggle.tooltip "Elemente der All-in-One Sidebar anzeigen/verbergen">
<!ENTITY button.switch.tooltip1 "Sidebar und Symbolleiste öffnen/schließen">
diff --git a/locale/en-GB/aios.dtd b/locale/en-GB/aios.dtd
index 0aa8ee0..f4e911b 100644
--- a/locale/en-GB/aios.dtd
+++ b/locale/en-GB/aios.dtd
@@ -3,7 +3,9 @@
<!ENTITY menu.togglebar.label "Sidebar Switch">
<!ENTITY menu.grippy.label "Sidebar Grippy">
<!ENTITY toolbar.name "All-in-One Sidebar Toolbar">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
<!ENTITY sbhtoolbar.name "Sidebarheader Toolbar">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
<!ENTITY button.toggle.label "AiOS">
<!ENTITY button.toggle.tooltip "Toggle elements controlled by All-in-One Sidebar">
<!ENTITY button.switch.tooltip1 "Toggle Sidebar and Toolbar">
diff --git a/locale/en-US/aios.dtd b/locale/en-US/aios.dtd
index 0aa8ee0..f4e911b 100644
--- a/locale/en-US/aios.dtd
+++ b/locale/en-US/aios.dtd
@@ -3,7 +3,9 @@
<!ENTITY menu.togglebar.label "Sidebar Switch">
<!ENTITY menu.grippy.label "Sidebar Grippy">
<!ENTITY toolbar.name "All-in-One Sidebar Toolbar">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
<!ENTITY sbhtoolbar.name "Sidebarheader Toolbar">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
<!ENTITY button.toggle.label "AiOS">
<!ENTITY button.toggle.tooltip "Toggle elements controlled by All-in-One Sidebar">
<!ENTITY button.switch.tooltip1 "Toggle Sidebar and Toolbar">
diff --git a/skin/css/aios.css b/skin/css/aios.css
index 95c4875..a7b0f07 100644
--- a/skin/css/aios.css
+++ b/skin/css/aios.css
@@ -1 +1 @@
- at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");window[aiosOrient="left"] toolbox#aios-toggle-toolbox,window[aiosOrient="left"] toolbox#aios-toggle-toolbox>toolbar#aios-toggle-toolbar{margin:0 !important;border-left:none !important;}window[aiosOrient="right"] toolbox#aios-toggle-toolbox,window[aiosOrient="right"] toolbox#aios-toggle-toolbox>toolbar#aios-toggle-toolbar{margin:0 !important;border-right:none !important;}#aios-toggle-toolbox,#aios-toggle-toolb [...]
\ No newline at end of file
+ at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");window[aiosOrient="left"] toolbox#aios-toggle-toolbox,window[aiosOrient="left"] toolbox#aios-toggle-toolbox>toolbar#aios-toggle-toolbar{margin:0 !important;border-left:none !important;}window[aiosOrient="right"] toolbox#aios-toggle-toolbox,window[aiosOrient="right"] toolbox#aios-toggle-toolbox>toolbar#aios-toggle-toolbar{margin:0 !important;border-right:none !important;}#aios-toggle-toolbox,#aios-toggle-toolb [...]
\ No newline at end of file
diff --git a/skin/css/aios_buttons_darwin.css b/skin/css/aios_buttons_darwin.css
index d5e55fc..f02313a 100644
--- a/skin/css/aios_buttons_darwin.css
+++ b/skin/css/aios_buttons_darwin.css
@@ -1 +1 @@
-#downloads-button,#downloads-button:hover,toolbarbutton.toolbarbutton-1.aios-tbutton,toolbarbutton.toolbarbutton-1.aios-tbutton:hover,toolbar[iconsize="small"] toolbarbutton.toolbarbutton-1.aios-tbutton,toolbar[iconsize="small"] toolbarbutton.toolbarbutton-1.aios-tbutton:hover{list-style-image:url(../icons/toolbar_darwin.png);}#downloads-button,#downloads-button:hover,toolbar[iconsize="small"] #downloads-button,toolbar[iconsize="small"] #downloads-button:hover{-moz-image-region:rect(0, 1 [...]
\ No newline at end of file
+toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button){list-style-image:url(../icons/toolbar_darwin.png);}toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button):-moz-lwtheme-brighttext{list-style-image:url(../icons/toolbar_darwin_inverted.png);}#bookmarks-button{-moz-image-region:rect(0, 16px, 16px, 0);}#history-button{-moz-image-region:rect(0, 32px, 16px, 16px);}#addons-button{-moz-image-region:rect(0, 64px, 16px, 48px);}#multipanel-button{-moz-image-region:rect(0, [...]
\ No newline at end of file
diff --git a/skin/css/aios_buttons_generic.css b/skin/css/aios_buttons_generic.css
index ff21e10..ae4b474 100644
--- a/skin/css/aios_buttons_generic.css
+++ b/skin/css/aios_buttons_generic.css
@@ -1 +1 @@
-window:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]){}window:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) #aios-toolbar[orient="vertical"] toolbarseparator{-moz-appearance:none !important;margin:3px 6px 2px 6px;border-bottom:1px solid-moz-ButtonHoverFace;}window:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) #aios-toolbar[orient="vertical"][iconsize="small"] toolbarseparator{margin-left:5px;margin-right:5px;}window:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) [...]
\ No newline at end of file
+window:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]){}window:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button){list-style-image:url(../icons/toolbar_darwin.png);}window:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button):-moz-lwtheme-brighttext{list-style-image:url(../icons/toolbar_darwin_inverted.png);}window:not([aios-appOS="WINNT"]):not([aios-a [...]
\ No newline at end of file
diff --git a/skin/css/aios_buttons_winnt.css b/skin/css/aios_buttons_winnt.css
index 8712ef0..7187136 100644
--- a/skin/css/aios_buttons_winnt.css
+++ b/skin/css/aios_buttons_winnt.css
@@ -1 +1 @@
-#aios-toolbar[orient="vertical"] toolbarbutton{margin:2px 1px;padding-top:2px;padding-bottom:2px;}#aios-toolbar[orient="vertical"] toolbarbutton toolbarbutton{margin:0;}#aios-toolbar[orient="vertical"][iconsize="small"] .toolbarbutton-icon{margin:1px;}#aios-toolbar[orient="vertical"] toolbarseparator,#aios-toolbar[orient="vertical"] toolbarpaletteitem[id^="wrapper-separator"]{margin:4px 2px 2px 2px;}window[aios-appDefTheme="true"]{}window[aios-appDefTheme="true"] toolbar[mode="icons"]{}w [...]
\ No newline at end of file
+toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button){list-style-image:url(../icons/toolbar_windows.png);}toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button):-moz-lwtheme-brighttext{list-style-image:url(../icons/toolbar_windows_inverted.png);}#bookmarks-button{-moz-image-region:rect(1px, 17px, 17px, 1px);}#history-button{-moz-image-region:rect(1px, 35px, 17px, 19px);}#addons-button{-moz-image-region:rect(1px, 71px, 17px, 55px);}#multipanel-button{-moz-image-regi [...]
\ No newline at end of file
diff --git a/skin/icons/toolbar_darwin.png b/skin/icons/toolbar_darwin.png
index 5dd539b..f276596 100644
Binary files a/skin/icons/toolbar_darwin.png and b/skin/icons/toolbar_darwin.png differ
diff --git a/skin/icons/toolbar_darwin_inverted.png b/skin/icons/toolbar_darwin_inverted.png
new file mode 100644
index 0000000..762d939
Binary files /dev/null and b/skin/icons/toolbar_darwin_inverted.png differ
diff --git a/skin/icons/toolbar_generic.png b/skin/icons/toolbar_generic.png
index ca1f01a..45a4868 100644
Binary files a/skin/icons/toolbar_generic.png and b/skin/icons/toolbar_generic.png differ
diff --git a/skin/icons/toolbar_inverted_windows.png b/skin/icons/toolbar_inverted_windows.png
deleted file mode 100644
index a6a817b..0000000
Binary files a/skin/icons/toolbar_inverted_windows.png and /dev/null differ
diff --git a/skin/icons/toolbar_windows.png b/skin/icons/toolbar_windows.png
index 0d8fdaf..4a34707 100644
Binary files a/skin/icons/toolbar_windows.png and b/skin/icons/toolbar_windows.png differ
diff --git a/skin/icons/toolbar_windows_inverted.png b/skin/icons/toolbar_windows_inverted.png
new file mode 100644
index 0000000..44b4610
Binary files /dev/null and b/skin/icons/toolbar_windows_inverted.png differ
diff --git a/skin/scss/aios_buttons_darwin.scss b/skin/scss/aios_buttons_darwin.scss
index 9356f41..e06b45b 100644
--- a/skin/scss/aios_buttons_darwin.scss
+++ b/skin/scss/aios_buttons_darwin.scss
@@ -1,113 +1,76 @@
-
-/* @group Button-Icons */
-#downloads-button,
-#downloads-button:hover,
-toolbarbutton.toolbarbutton-1.aios-tbutton,
-toolbarbutton.toolbarbutton-1.aios-tbutton:hover,
-toolbar[iconsize="small"] toolbarbutton.toolbarbutton-1.aios-tbutton,
-toolbar[iconsize="small"] toolbarbutton.toolbarbutton-1.aios-tbutton:hover {
+/*
+ button icons
+*/
+toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button) {
list-style-image: url(../icons/toolbar_darwin.png);
+
+ // &[checked="true"] {
+ // #aios-toolbar & {
+ // list-style-image: url(../icons/toolbar_darwin_inverted.png);
+ // }
+ // }
+ &:-moz-lwtheme-brighttext {
+ list-style-image: url(../icons/toolbar_darwin_inverted.png);
+ }
}
-#downloads-button,
-#downloads-button:hover,
-toolbar[iconsize="small"] #downloads-button,
-toolbar[iconsize="small"] #downloads-button:hover {
+#bookmarks-button {
-moz-image-region: rect(0, 16px, 16px, 0);
-
- &[checked="true"] {
- -moz-image-region: rect(16px, 16px, 32px, 0);
- }
}
-#addons-button,
-toolbar[iconsize="small"] #addons-button {
+#history-button {
-moz-image-region: rect(0, 32px, 16px, 16px);
-
- &[checked="true"] {
- -moz-image-region: rect(16px, 32px, 32px, 16px);
- }
}
-#multipanel-button,
-toolbar[iconsize="small"] #multipanel-button {
- -moz-image-region: rect(0, 48px, 16px, 32px);
+// #downloads-button[cui-areatype="toolbar"],
+// #downloads-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
+// -moz-image-region: rect(0, 48px, 16px, 32px);
+// }
- &[checked="true"] {
- -moz-image-region: rect(16px, 48px, 32px, 32px);
- }
-}
-
-#pageinfo-button,
-toolbar[iconsize="small"] #pageinfo-button {
+#addons-button {
-moz-image-region: rect(0, 64px, 16px, 48px);
+}
- &[checked="true"] {
- -moz-image-region: rect(16px, 64px, 32px, 48px);
- }
+#multipanel-button {
+ -moz-image-region: rect(0, 80px, 16px, 64px);
}
-#console-button,
-toolbar[iconsize="small"] #console-button {
+#pageinfo-button {
-moz-image-region: rect(0, 96px, 16px, 80px);
-
- &[checked="true"] {
- -moz-image-region: rect(16px, 96px, 32px, 80px);
- }
}
-#paneltab-button,
-toolbar[iconsize="small"] #paneltab-button {
+#console-button {
-moz-image-region: rect(0, 112px, 16px, 96px);
}
-#sidebars-button,
-toolbar[iconsize="small"] #sidebars-button {
+#paneltab-button {
-moz-image-region: rect(0, 128px, 16px, 112px);
-
- dropmarker {
- display: none;
- }
}
-#sidebars-togglebutton,
-toolbar[iconsize="small"] #sidebars-togglebutton {
+#sidebars-button {
-moz-image-region: rect(0, 144px, 16px, 128px);
- &[checked="true"] {
- -moz-image-region: rect(16px, 144px, 32px, 128px);
- }
-}
-
-toolbar[mode="full"]:not([orient="vertical"]) #sidebars-togglebutton {
- -moz-box-orient: horizontal;
-
- .toolbarbutton-menubutton-button {
- -moz-box-orient: horizontal;
+ dropmarker {
+ display: none;
}
}
-#autohide-button,
-toolbar[iconsize="small"] #autohide-button {
+#sidebars-togglebutton {
-moz-image-region: rect(0, 160px, 16px, 144px);
-
- &[checked="true"] {
- -moz-image-region: rect(16px, 160px, 32px, 144px);
- }
}
-#toolbar-button,
-toolbar[iconsize="small"] #toolbar-button {
+#autohide-button {
-moz-image-region: rect(0, 176px, 16px, 160px);
+}
- &[checked="true"] {
- -moz-image-region: rect(16px, 176px, 32px, 160px);
- }
+#toolbar-button {
+ -moz-image-region: rect(0, 192px, 16px, 176px);
}
-/* @end */
-/* @group Menue-Icons */
+/*
+ menu icons
+*/
menuitem[key="aiosKey_panelTab1"],
menuitem[key="aiosKey_panelTab2"],
menuitem#aios-sidebar-mitem-show,
@@ -135,22 +98,28 @@ menuitem#aios-sidebar-mitem-show {
menuitem[key="aiosKey_prefs"] {
-moz-image-region: rect(32px, 16px, 48px, 0);
}
-/* @end */
+/*
+ button margins on vertical toolbar
+*/
+#aios-toolbar[orient="vertical"] toolbarbutton {
+ margin: 2px 1px;
+}
-window[aios-appDefTheme="true"] {
- #downloads-button,
- #downloads-button:hover,
- toolbarbutton.toolbarbutton-1.aios-tbutton,
- toolbarbutton.toolbarbutton-1.aios-tbutton:hover,
- toolbar[iconsize="small"] toolbarbutton.toolbarbutton-1.aios-tbutton,
- toolbar[iconsize="small"] toolbarbutton.toolbarbutton-1.aios-tbutton:hover {
+/*
+ default theme on mac osx
+*/
+window[aios-appDefTheme="true"] {
+ /*
+ icon opacity
+ */
+ toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button):not(:-moz-lwtheme-brighttext) {
image.toolbarbutton-icon,
&:hover image.toolbarbutton-icon:-moz-window-inactive {
- opacity: 0.75;
+ opacity: 0.7;
}
image.toolbarbutton-icon:-moz-window-inactive {
@@ -170,49 +139,31 @@ window[aios-appDefTheme="true"] {
}
}
- #aios-toolbar[orient="vertical"] toolbarbutton {
- margin: 2px 1px;
- }
-
- #aios-sbhtoolbar[iconsize="small"] toolbarbutton {
- margin: 0 2px;
- padding: 0;
- min-width: 0;
- max-height: none;
-
- image {
- margin: 0;
- }
- }
-
- toolbar[mode="full"] #downloads-button {
- label {
- margin-top: 5px;
- }
- }
-
- #sidebars-togglebutton,
- toolbar[iconsize="small"] #sidebars-togglebutton {
- border: none;
-
- .toolbarbutton-menubutton-button {
-
- label {
- margin-left: 2px;
- margin-right: 3px;
- }
-
- }
- }
-
- toolbar[mode="icons"]:not([orient="vertical"]) #sidebars-togglebutton[checked="true"] {
- -moz-appearance: toolbarbutton;
+ /*
+ active state of menu-buttons, e.g. the sidebar togglebutton
+ */
+ toolbarbutton[type="menu-button"][checked="true"] {
.toolbarbutton-menubutton-button,
.toolbarbutton-menubutton-dropmarker {
- -moz-appearance: none;
- min-width: 0;
+ background: hsla(0,0%,0%,.02) linear-gradient(hsla(0,0%,0%,.12), hsla(0,0%,0%,0)) border-box;
+ border-color: hsla(0,0%,0%,.3);
+ box-shadow: 0 1px 0 hsla(0,0%,100%,.5),
+ 0 1px 0 hsla(0,0%,0%,.05) inset,
+ 0 1px 1px hsla(0,0%,0%,.2) inset;
+ transition-duration: 10ms;
}
+ }
+ /*
+ type=checkbox buttons with no border, background and background-image if they are not checked
+ */
+ toolbarbutton.toolbarbutton-1.aios-tbutton {
+ &[checked="false"]:not(:hover) {
+ border-color: transparent;
+ box-shadow: none;
+ background-color: transparent;
+ background-image: none;
+ }
}
-}
+}
\ No newline at end of file
diff --git a/skin/scss/aios_buttons_generic.scss b/skin/scss/aios_buttons_generic.scss
index 186fd78..b21f1b0 100644
--- a/skin/scss/aios_buttons_generic.scss
+++ b/skin/scss/aios_buttons_generic.scss
@@ -1,123 +1,265 @@
-
window:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) {
- #aios-toolbar[orient="vertical"] toolbarseparator {
- -moz-appearance: none !important;
- margin: 3px 6px 2px 6px;
- border-bottom: 1px solid -moz-ButtonHoverFace;
- }
+ /*
+ button icons
+ */
+ toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button) {
+ list-style-image: url(../icons/toolbar_darwin.png);
- #aios-toolbar[orient="vertical"][iconsize="small"] toolbarseparator {
- margin-left: 5px;
- margin-right: 5px;
+ // &[checked="true"] {
+ // #aios-toolbar & {
+ // list-style-image: url(../icons/toolbar_darwin_inverted.png);
+ // }
+ // }
+ &:-moz-lwtheme-brighttext {
+ list-style-image: url(../icons/toolbar_darwin_inverted.png);
+ }
}
+ #bookmarks-button {
+ -moz-image-region: rect(0, 16px, 16px, 0);
+ }
- /* @group Button-Icons */
- toolbarbutton.toolbarbutton-1.aios-tbutton,
- toolbarbutton.toolbarbutton-1.aios-tbutton:hover,
- toolbar[iconsize="small"] toolbarbutton.toolbarbutton-1.aios-tbutton,
- toolbar[iconsize="small"] toolbarbutton.toolbarbutton-1.aios-tbutton:hover {
- list-style-image: url(../icons/toolbar_generic.png);
+ #history-button {
+ -moz-image-region: rect(0, 32px, 16px, 16px);
}
+ // #downloads-button[cui-areatype="toolbar"],
+ // #downloads-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
+ // -moz-image-region: rect(0, 48px, 16px, 32px);
+ // }
+
#addons-button {
- -moz-image-region: rect(0, 24px, 24px, 0);
- }
- toolbar[iconsize="small"] #addons-button {
- -moz-image-region: rect(24px, 16px, 40px, 0);
+ -moz-image-region: rect(0, 64px, 16px, 48px);
}
#multipanel-button {
- -moz-image-region: rect(0, 48px, 24px, 24px);
- }
- toolbar[iconsize="small"] #multipanel-button {
- -moz-image-region: rect(24px, 32px, 40px, 16px);
+ -moz-image-region: rect(0, 80px, 16px, 64px);
}
#pageinfo-button {
- -moz-image-region: rect(0, 72px, 24px, 48px);
- }
- toolbar[iconsize="small"] #pageinfo-button {
- -moz-image-region: rect(24px, 48px, 40px, 32px);
+ -moz-image-region: rect(0, 96px, 16px, 80px);
}
#console-button {
- -moz-image-region: rect(0, 120px, 24px, 96px);
- }
- toolbar[iconsize="small"] #console-button {
- -moz-image-region: rect(24px, 80px, 40px, 64px);
+ -moz-image-region: rect(0, 112px, 16px, 96px);
}
#paneltab-button {
- -moz-image-region: rect(0, 144px, 24px, 120px);
- }
- toolbar[iconsize="small"] #paneltab-button {
- -moz-image-region: rect(24px, 96px, 40px, 80px);
+ -moz-image-region: rect(0, 128px, 16px, 112px);
}
#sidebars-button {
- -moz-image-region: rect(0, 168px, 24px, 144px);
- }
- toolbar[iconsize="small"] #sidebars-button {
- -moz-image-region: rect(24px, 112px, 40px, 96px);
+ -moz-image-region: rect(0, 144px, 16px, 128px);
+
+ dropmarker {
+ display: none;
+ }
}
- /*toolbar:not([mode="text"]) #sidebars-button dropmarker {
- display: none;
- }*/
#sidebars-togglebutton {
- padding: 0 !important;
- -moz-image-region: rect(0, 192px, 24px, 168px);
- }
- toolbar[iconsize="small"] #sidebars-togglebutton {
- -moz-image-region: rect(24px, 128px, 40px, 112px);
+ -moz-image-region: rect(0, 160px, 16px, 144px);
}
#autohide-button {
- -moz-image-region: rect(0, 216px, 24px, 192px);
- }
- toolbar[iconsize="small"] #autohide-button {
- -moz-image-region: rect(24px, 144px, 40px, 128px);
+ -moz-image-region: rect(0, 176px, 16px, 160px);
}
#toolbar-button {
- -moz-image-region: rect(0, 240px, 24px, 216px);
- }
- toolbar[iconsize="small"] #toolbar-button {
- -moz-image-region: rect(24px, 160px, 40px, 144px);
+ -moz-image-region: rect(0, 192px, 16px, 176px);
}
- /* @end */
- /* @group Menue-Icons */
+ /*
+ menu icons
+ */
menuitem[key="aiosKey_panelTab1"],
menuitem[key="aiosKey_panelTab2"],
menuitem#aios-sidebar-mitem-show,
menuitem#aios-sidebar-mitem-hide,
menuitem[key="aiosKey_prefs"] {
- list-style-image: url(../icons/panels_menus.png) !important;
+ list-style-image: url(../icons/panels_menus.png);
}
menuitem[key="aiosKey_panelTab1"] {
- -moz-image-region: rect(80px, 16px, 96px, 0) !important;
+ -moz-image-region: rect(48px, 16px, 64px, 0);
}
menuitem[key="aiosKey_panelTab2"] {
- -moz-image-region: rect(80px, 32px, 96px, 16px) !important;
+ -moz-image-region: rect(48px, 32px, 64px, 16px);
}
menuitem#aios-sidebar-mitem-hide {
- -moz-image-region: rect(80px, 48px, 96px, 32px) !important;
+ -moz-image-region: rect(48px, 48px, 64px, 32px);
}
menuitem#aios-sidebar-mitem-show {
- -moz-image-region: rect(80px, 64px, 96px, 48px) !important;
+ -moz-image-region: rect(48px, 64px, 64px, 48px);
}
menuitem[key="aiosKey_prefs"] {
- -moz-image-region: rect(64px, 16px, 80px, 0) !important;
+ -moz-image-region: rect(32px, 16px, 48px, 0);
+ }
+
+
+ /*
+ button margins on vertical toolbar
+ */
+ #aios-toolbar[orient="vertical"] toolbarbutton {
+ margin: 2px 1px;
}
- /* @end */
+
+ /*
+ default theme on linux
+ */
+ &[aios-appDefTheme="true"] {
+
+ /*
+ icon opacity
+ */
+ toolbarbutton.toolbarbutton-1.aios-tbutton:not(#bookmarks-button):not(#history-button):not(#downloads-button):not(:-moz-lwtheme-brighttext) {
+ image.toolbarbutton-icon {
+ opacity: 0.8;
+ }
+ }
+
+
+ /*
+ type=checkbox buttons with no border, background and background-image if they are not checked
+ */
+ toolbarbutton[type="checkbox"]:not([checked="true"]):not(:hover) {
+ .toolbarbutton-icon,
+ .dropmarker-icon {
+ background-image: none !important;
+ background-color: transparent !important;
+ box-shadow: none !important;
+ border-color: transparent !important;
+ }
+ }
+
+ #aios-toolbar[orient="vertical"] toolbarseparator {
+ -moz-appearance: none !important;
+ margin: 3px 6px 2px 6px;
+ border-bottom: 1px solid -moz-ButtonHoverFace;
+ }
+
+ #aios-toolbar[orient="vertical"][iconsize="small"] toolbarseparator {
+ margin-left: 5px;
+ margin-right: 5px;
+ }
+ }
+
+
+
+// /*
+// button icons
+// */
+// toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button) {
+// list-style-image: url(../icons/toolbar_generic.png);
+
+// // &:-moz-lwtheme-brighttext {
+// // list-style-image: url(../icons/toolbar_windows_inverted.png);
+// // }
+// }
+
+// #addons-button {
+// -moz-image-region: rect(0, 24px, 24px, 0);
+// }
+// toolbar[iconsize="small"] #addons-button {
+// -moz-image-region: rect(24px, 16px, 40px, 0);
+// }
+
+// #multipanel-button {
+// -moz-image-region: rect(0, 48px, 24px, 24px);
+// }
+// toolbar[iconsize="small"] #multipanel-button {
+// -moz-image-region: rect(24px, 32px, 40px, 16px);
+// }
+
+// #pageinfo-button {
+// -moz-image-region: rect(0, 72px, 24px, 48px);
+// }
+// toolbar[iconsize="small"] #pageinfo-button {
+// -moz-image-region: rect(24px, 48px, 40px, 32px);
+// }
+
+// #console-button {
+// -moz-image-region: rect(0, 120px, 24px, 96px);
+// }
+// toolbar[iconsize="small"] #console-button {
+// -moz-image-region: rect(24px, 80px, 40px, 64px);
+// }
+
+// #paneltab-button {
+// -moz-image-region: rect(0, 144px, 24px, 120px);
+// }
+// toolbar[iconsize="small"] #paneltab-button {
+// -moz-image-region: rect(24px, 96px, 40px, 80px);
+// }
+
+// #sidebars-button {
+// -moz-image-region: rect(0, 168px, 24px, 144px);
+
+// // dropmarker {
+// // display: none;
+// // }
+// }
+// toolbar[iconsize="small"] #sidebars-button {
+// -moz-image-region: rect(24px, 112px, 40px, 96px);
+// }
+
+// #sidebars-togglebutton {
+// padding: 0 !important;
+// -moz-image-region: rect(0, 192px, 24px, 168px);
+// }
+// toolbar[iconsize="small"] #sidebars-togglebutton {
+// -moz-image-region: rect(24px, 128px, 40px, 112px);
+// }
+
+// #autohide-button {
+// -moz-image-region: rect(0, 216px, 24px, 192px);
+// }
+// toolbar[iconsize="small"] #autohide-button {
+// -moz-image-region: rect(24px, 144px, 40px, 128px);
+// }
+
+// #toolbar-button {
+// -moz-image-region: rect(0, 240px, 24px, 216px);
+// }
+// toolbar[iconsize="small"] #toolbar-button {
+// -moz-image-region: rect(24px, 160px, 40px, 144px);
+// }
+
+
+// /*
+// menu icons
+// */
+// menuitem[key="aiosKey_panelTab1"],
+// menuitem[key="aiosKey_panelTab2"],
+// menuitem#aios-sidebar-mitem-show,
+// menuitem#aios-sidebar-mitem-hide,
+// menuitem[key="aiosKey_prefs"] {
+// list-style-image: url(../icons/panels_menus.png) !important;
+// }
+
+// menuitem[key="aiosKey_panelTab1"] {
+// -moz-image-region: rect(80px, 16px, 96px, 0) !important;
+// }
+
+// menuitem[key="aiosKey_panelTab2"] {
+// -moz-image-region: rect(80px, 32px, 96px, 16px) !important;
+// }
+
+// menuitem#aios-sidebar-mitem-hide {
+// -moz-image-region: rect(80px, 48px, 96px, 32px) !important;
+// }
+
+// menuitem#aios-sidebar-mitem-show {
+// -moz-image-region: rect(80px, 64px, 96px, 48px) !important;
+// }
+
+// menuitem[key="aiosKey_prefs"] {
+// -moz-image-region: rect(64px, 16px, 80px, 0) !important;
+// }
}
\ No newline at end of file
diff --git a/skin/scss/aios_buttons_winnt.scss b/skin/scss/aios_buttons_winnt.scss
index d4390b2..2e38917 100644
--- a/skin/scss/aios_buttons_winnt.scss
+++ b/skin/scss/aios_buttons_winnt.scss
@@ -1,13 +1,116 @@
+/*
+ button icons
+*/
+toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button) {
+ list-style-image: url(../icons/toolbar_windows.png);
+
+ &:-moz-lwtheme-brighttext {
+ list-style-image: url(../icons/toolbar_windows_inverted.png);
+ }
+}
+
+#bookmarks-button {
+ -moz-image-region: rect(1px, 17px, 17px, 1px);
+}
+
+#history-button {
+ -moz-image-region: rect(1px, 35px, 17px, 19px);
+}
+
+// #downloads-button[cui-areatype="toolbar"],
+// #downloads-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
+// -moz-image-region: rect(1px, 53px, 17px, 37px);
+// }
+
+#addons-button {
+ -moz-image-region: rect(1px, 71px, 17px, 55px);
+}
+
+#multipanel-button {
+ -moz-image-region: rect(1px, 89px, 17px, 73px);
+}
+
+#pageinfo-button {
+ -moz-image-region: rect(1px, 107px, 17px, 91px);
+}
+
+#console-button {
+ -moz-image-region: rect(1px, 125px, 17px, 109px);
+}
+
+#paneltab-button {
+ -moz-image-region: rect(1px, 143px, 17px, 127px);
+}
+
+#sidebars-button {
+ -moz-image-region: rect(1px, 161px, 17px, 145px);
+
+ dropmarker {
+ display: none;
+ }
+
+ #nav-bar &.toolbarbutton-1[type=menu] > .toolbarbutton-icon,
+ #nav-bar &.toolbarbutton-1[type=menu] > .toolbarbutton-text {
+ -moz-padding-end: 7px !important;
+ }
+}
+
+#sidebars-togglebutton {
+ -moz-image-region: rect(1px, 179px, 17px, 163px);
+}
+
+#autohide-button {
+ -moz-image-region: rect(1px, 197px, 17px, 181px);
+}
+
+#toolbar-button {
+ -moz-image-region: rect(1px, 215px, 17px, 199px);
+}
+
+
+/*
+ menu icons
+*/
+menuitem[key="aiosKey_panelTab1"],
+menuitem[key="aiosKey_panelTab2"],
+menuitem#aios-sidebar-mitem-show,
+menuitem#aios-sidebar-mitem-hide,
+menuitem[key="aiosKey_prefs"] {
+ list-style-image: url(../icons/panels_menus.png);
+}
+
+menuitem[key="aiosKey_panelTab1"] {
+ -moz-image-region: rect(16px, 16px, 32px, 0);
+}
+
+menuitem[key="aiosKey_panelTab2"] {
+ -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+
+menuitem#aios-sidebar-mitem-hide {
+ -moz-image-region: rect(16px, 48px, 32px, 32px);
+}
+
+menuitem#aios-sidebar-mitem-show {
+ -moz-image-region: rect(16px, 64px, 32px, 48px);
+}
+
+menuitem[key="aiosKey_prefs"] {
+ -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+/*
+ button margins on vertical toolabr
+*/
#aios-toolbar[orient="vertical"] {
toolbarbutton {
-
margin: 2px 1px;
padding-top: 2px;
padding-bottom: 2px;
- /* Toolbarbutton mit Dropmarker */
+ /* toolbarbutton with dropmarker */
toolbarbutton {
margin: 0;
}
@@ -22,18 +125,20 @@
toolbarpaletteitem[id^="wrapper-separator"] {
margin: 4px 2px 2px 2px;
}
-
}
-/* @group Firefox-Standard-Theme */
+/*
+ default theme on windows
+*/
window[aios-appDefTheme="true"] {
- /* Aktivierter Toolbarbutton (type = menu-button) [iconsize="large"] */
- toolbar[mode="icons"] {
+ /*
+ active state of menu-buttons, e.g. the sidebar togglebutton
+ */
+ //toolbar[mode="icons"] {
toolbarbutton[type="menu-button"][checked="true"] {
-
.toolbarbutton-icon,
.dropmarker-icon {
background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1)) !important;
@@ -49,7 +154,6 @@ window[aios-appDefTheme="true"] {
}
&:hover {
-
.toolbarbutton-icon,
.dropmarker-icon {
border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4) !important;
@@ -61,9 +165,11 @@ window[aios-appDefTheme="true"] {
}
}
- /* [type="checkbox"] => u.a. AiOS-Toolbarbutton */
- toolbarbutton[type="checkbox"]:not([checked="true"]) {
+ /*
+ type=checkbox buttons with no border, background and background-image if they are not checked
+ */
+ toolbarbutton[type="checkbox"]:not([checked="true"]):not(:hover) {
.toolbarbutton-icon,
.dropmarker-icon {
background-image: none !important;
@@ -72,275 +178,183 @@ window[aios-appDefTheme="true"] {
border-color: transparent !important;
}
}
+ //}
+
+ // #aios-toolbar[iconsize="large"][mode="icons"],
+ // #aios-sbhtoolbar[iconsize="large"][mode="icons"] {
+
+ // .toolbarbutton-1 {
+ // margin: 2px 2px 2px 3px;
+
+ // /* Button-Optik mit BG und Border */
+ // &,
+ // > .toolbarbutton-menubutton-button,
+ // > .toolbarbutton-menubutton-dropmarker {
+ // -moz-appearance: none;
+ // padding: 1px 5px;
+ // border-radius: 2px;
+ // }
+
+ // /* Hover-Zustand - inaktiver Button */
+ // &:hover:not(:active):not([disabled="true"]):not([checked="true"]):not([open="true"]) {
+
+ // &:not([type="menu-button"]),
+ // > .toolbarbutton-menubutton-button,
+ // > .toolbarbutton-menubutton-dropmarker {
+ // background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
+ // border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.2) hsla(210,54%,20%,.25);
+ // box-shadow: 0 1px hsla(0,0%,100%,.3) inset,
+ // 0 1px hsla(210,54%,20%,.03),
+ // 0 0 2px hsla(210,54%,20%,.1);
+ // }
+
+ // }
+
+ // /* Hover-Zustand aktiver Button */
+ // &:active:hover, /* mousedown */
+ // &[open="true"]:hover, /* geoeffnetes Menue */
+ // &[checked="true"]:hover /* aktiviert */ {
+
+ // &:not([type="menu-button"]),
+ // .toolbarbutton-menubutton-button,
+ // .toolbarbutton-menubutton-dropmarker {
+ // border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
+ // background-color: hsla(210,48%,96%,.75);
+ // box-shadow: 0 0 1px hsla(210,54%,20%,.03),
+ // 0 0 2px hsla(210,54%,20%,.1);
+ // -moz-transition: background-color .4s;
+ // }
+
+ // }
+
+ // /* aktiver Button */
+ // &:active, /* mousedown */
+ // &[open="true"], /* geoeffnetes Menue */
+ // &[checked="true"] /* aktiviert */ {
+
+ // &:not([type="menu-button"]),
+ // .toolbarbutton-menubutton-button,
+ // .toolbarbutton-menubutton-dropmarker {
+ // background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
+ // background-color: hsla(210,54%,20%,.15);
+ // border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
+ // box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
+ // 0 0 1px hsla(210,54%,20%,.2) inset,
+ // /* allows winstripe-keyhole-forward-mask to be used for non-hover as well as hover: */
+ // 0 1px 0 hsla(210,54%,20%,0),
+ // 0 0 2px hsla(210,54%,20%,0);
+ // text-shadow: none;
+ // -moz-transition: none;
+ // }
+
+ // }
+
+
+ // /* Icons */
+ // > .toolbarbutton-icon,
+ // > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+ // margin: 2px;
+ // width: 16px;
+ // height: 16px;
+ // }
+ // }
+ // }
+
+ // #aios-toolbar[iconsize="large"][mode="icons"],
+ // #aios-sbhtoolbar[iconsize="large"][mode="icons"] {
+
+ // /* Menuebutton */
+ // &[type="menu-button"] {
+ // padding: 0;
+ // background: none;
+ // border: none;
+ // box-shadow: none;
+ // }
+
+ // /* Menuebutton auf vertikaler Toolbar - Dropmarker unter dem Button */
+ // &[orient="vertical"] {
+
+ // .toolbarbutton-1[type="menu-button"] {
+
+ // > .toolbarbutton-menubutton-button {
+ // border-bottom: none;
+ // border-bottom-left-radius: 0;
+ // border-bottom-right-radius: 0;
+ // }
+
+ // > .toolbarbutton-menubutton-dropmarker {
+ // border-top-left-radius: 0;
+ // border-top-right-radius: 0;
+ // }
+ // }
+
+ // }
+
+ // /* Menuebutton auf horizontaler Toolbar - Dropmarker rechts neben dem Button */
+ // &[orient="horizontal"] {
- }
- /* @end */
-
-
- #aios-toolbar[iconsize="large"][mode="icons"],
- #aios-sbhtoolbar[iconsize="large"][mode="icons"] {
-
- .toolbarbutton-1 {
- margin: 2px 2px 2px 3px;
-
- /* Button-Optik mit BG und Border */
- &,
- > .toolbarbutton-menubutton-button,
- > .toolbarbutton-menubutton-dropmarker {
- -moz-appearance: none;
- padding: 1px 5px;
- border-radius: 2px;
- }
-
- /* Hover-Zustand - inaktiver Button */
- &:hover:not(:active):not([disabled="true"]):not([checked="true"]):not([open="true"]) {
-
- &:not([type="menu-button"]),
- > .toolbarbutton-menubutton-button,
- > .toolbarbutton-menubutton-dropmarker {
- background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
- border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.2) hsla(210,54%,20%,.25);
- box-shadow: 0 1px hsla(0,0%,100%,.3) inset,
- 0 1px hsla(210,54%,20%,.03),
- 0 0 2px hsla(210,54%,20%,.1);
- }
-
- }
-
- /* Hover-Zustand aktiver Button */
- &:active:hover, /* mousedown */
- &[open="true"]:hover, /* geoeffnetes Menue */
- &[checked="true"]:hover /* aktiviert */ {
-
- &:not([type="menu-button"]),
- .toolbarbutton-menubutton-button,
- .toolbarbutton-menubutton-dropmarker {
- border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
- background-color: hsla(210,48%,96%,.75);
- box-shadow: 0 0 1px hsla(210,54%,20%,.03),
- 0 0 2px hsla(210,54%,20%,.1);
- -moz-transition: background-color .4s;
- }
-
- }
-
- /* aktiver Button */
- &:active, /* mousedown */
- &[open="true"], /* geoeffnetes Menue */
- &[checked="true"] /* aktiviert */ {
-
- &:not([type="menu-button"]),
- .toolbarbutton-menubutton-button,
- .toolbarbutton-menubutton-dropmarker {
- background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
- background-color: hsla(210,54%,20%,.15);
- border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
- box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
- 0 0 1px hsla(210,54%,20%,.2) inset,
- /* allows winstripe-keyhole-forward-mask to be used for non-hover as well as hover: */
- 0 1px 0 hsla(210,54%,20%,0),
- 0 0 2px hsla(210,54%,20%,0);
- text-shadow: none;
- -moz-transition: none;
- }
-
- }
-
-
- /* Icons */
- > .toolbarbutton-icon,
- > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
- margin: 2px;
- width: 16px;
- height: 16px;
- }
- }
- }
-
-
- #aios-toolbar[iconsize="large"][mode="icons"],
- #aios-sbhtoolbar[iconsize="large"][mode="icons"] {
-
- /* Menuebutton */
- &[type="menu-button"] {
- padding: 0;
- background: none;
- border: none;
- box-shadow: none;
- }
-
- /* Menuebutton auf vertikaler Toolbar - Dropmarker unter dem Button */
- &[orient="vertical"] {
-
- .toolbarbutton-1[type="menu-button"] {
-
- > .toolbarbutton-menubutton-button {
- border-bottom: none;
- border-bottom-left-radius: 0;
- border-bottom-right-radius: 0;
- }
-
- > .toolbarbutton-menubutton-dropmarker {
- border-top-left-radius: 0;
- border-top-right-radius: 0;
- }
- }
-
- }
-
- /* Menuebutton auf horizontaler Toolbar - Dropmarker rechts neben dem Button */
- &[orient="horizontal"] {
-
- .toolbarbutton-1[type="menu-button"] {
-
- > .toolbarbutton-menubutton-button {
-
- :-moz-locale-dir(ltr) {
- border-right: none;
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
- }
-
- :-moz-locale-dir(rtl) {
- border-left: none;
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
- }
-
- }
-
- > .toolbarbutton-menubutton-dropmarker {
-
- :-moz-locale-dir(ltr) {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
- }
-
- :-moz-locale-dir(rtl) {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
- }
-
- }
-
- }
-
- }
-
- }
-
- #aios-toolbar[mode="full"] {
-
- .toolbarbutton-1,
- .toolbarbutton-menubutton-button {
- padding: 5px;
- }
-
- }
-
- #aios-toolbar[iconsize="small"] {
-
- .toolbarbutton-1 {
- margin: 0 1px;
- padding: 0 2px;
- }
-
- &[orient="horizontal"] {
-
- .toolbarbutton-1 {
- padding: 0 3px;
- }
-
- }
-
- }
-
-}
+ // .toolbarbutton-1[type="menu-button"] {
-/* @end */
+ // > .toolbarbutton-menubutton-button {
+ // :-moz-locale-dir(ltr) {
+ // border-right: none;
+ // border-top-right-radius: 0;
+ // border-bottom-right-radius: 0;
+ // }
-/* @group Button-Icons */
-toolbarbutton.aios-tbutton:not([type="menu-button"]),
-toolbarbutton.aios-tbutton[type="menu-button"] {
- list-style-image: url(../icons/toolbar_windows.png);
-}
+ // :-moz-locale-dir(rtl) {
+ // border-left: none;
+ // border-top-left-radius: 0;
+ // border-bottom-left-radius: 0;
+ // }
-toolbar[tabsontop=false] toolbarbutton.aios-tbutton:not([type="menu-button"]),
-toolbar[tabsontop=false] toolbarbutton.aios-tbutton[type="menu-button"],
-toolbarbutton.aios-tbutton:not([type="menu-button"]):-moz-lwtheme-brighttext,
-toolbarbutton.aios-tbutton[type="menu-button"]:-moz-lwtheme-brighttext {
- list-style-image: url(../icons/toolbar_inverted_windows.png);
-}
+ // }
-#addons-button {
- -moz-image-region: rect(1px, 17px, 17px, 1px);
-}
+ // > .toolbarbutton-menubutton-dropmarker {
-#multipanel-button {
- -moz-image-region: rect(1px, 35px, 17px, 19px);
-}
+ // :-moz-locale-dir(ltr) {
+ // border-top-left-radius: 0;
+ // border-bottom-left-radius: 0;
+ // }
-#pageinfo-button {
- -moz-image-region: rect(1px, 53px, 17px, 37px);
-}
+ // :-moz-locale-dir(rtl) {
+ // border-top-right-radius: 0;
+ // border-bottom-right-radius: 0;
+ // }
-#console-button {
- -moz-image-region: rect(1px, 71px, 17px, 55px);
-}
+ // }
-#paneltab-button {
- -moz-image-region: rect(1px, 89px, 17px, 73px);
-}
+ // }
-#sidebars-button {
- -moz-image-region: rect(1px, 107px, 17px, 91px);
+ // }
- /*dropmarker {
- display: none;
- }*/
-}
+ // }
-#sidebars-togglebutton {
- -moz-image-region: rect(1px, 125px, 17px, 109px);
-}
+ // #aios-toolbar[mode="full"] {
-#autohide-button {
- -moz-image-region: rect(1px, 143px, 17px, 127px);
-}
+ // .toolbarbutton-1,
+ // .toolbarbutton-menubutton-button {
+ // padding: 5px;
+ // }
-#toolbar-button {
- -moz-image-region: rect(1px, 161px, 17px, 145px);
-}
-/* @end */
+ // }
+ // #aios-toolbar[iconsize="small"] {
-/* @group Menue-Icons */
-menuitem[key="aiosKey_panelTab1"],
-menuitem[key="aiosKey_panelTab2"],
-menuitem#aios-sidebar-mitem-show,
-menuitem#aios-sidebar-mitem-hide,
-menuitem[key="aiosKey_prefs"] {
- list-style-image: url(../icons/panels_menus.png);
-}
+ // .toolbarbutton-1 {
+ // margin: 0 1px;
+ // padding: 0 2px;
+ // }
-menuitem[key="aiosKey_panelTab1"] {
- -moz-image-region: rect(16px, 16px, 32px, 0);
-}
+ // &[orient="horizontal"] {
-menuitem[key="aiosKey_panelTab2"] {
- -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
+ // .toolbarbutton-1 {
+ // padding: 0 3px;
+ // }
-menuitem#aios-sidebar-mitem-hide {
- -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
+ // }
-menuitem#aios-sidebar-mitem-show {
- -moz-image-region: rect(16px, 64px, 32px, 48px);
-}
+ // }
-menuitem[key="aiosKey_prefs"] {
- -moz-image-region: rect(0, 16px, 16px, 0);
-}
-/* @end */
+}
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/all-in-one-sidebar.git
More information about the Pkg-mozext-commits
mailing list