From: Robert Kaiser Date: Thu, 16 Oct 2008 21:25:05 +0000 (+0200) Subject: improve 2.0a1-updated LCARStrek X-Git-Tag: LCARStrek-2.0a1~6 X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=dd676468138b64245f5026a8923f26307b8f3ebc improve 2.0a1-updated LCARStrek --- diff --git a/LCARStrek/communicator/button.css b/LCARStrek/communicator/button.css index bc33a754..68e1fc3b 100644 --- a/LCARStrek/communicator/button.css +++ b/LCARStrek/communicator/button.css @@ -58,13 +58,16 @@ .toolbarbutton-1 > .toolbarbutton-menubutton-button, .toolbarbutton-1[disabled="true"]:hover:active, .toolbarbutton-1[disabled="true"]:hover:active > .toolbarbutton-menubutton-button { - padding: 1px; + padding: 1px 2px; } .toolbarbutton-1:hover:active, .toolbarbutton-1[open="true"], .toolbarbutton-1:hover:active > .toolbarbutton-menubutton-button { - padding: 2px 0px 0px 2px; + padding-top: 2px; + padding-bottom: 0px; + -moz-padding-start: 3px; + -moz-padding-end: 1px; } .toolbarbutton-1[type="menu"] { @@ -84,33 +87,51 @@ toolbar[mode="icons"] .toolbarbutton-menubutton-button, } toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker { - padding: 4px 1px 8px 1px; + padding-top: 4px; + padding-bottom: 8px; + -moz-padding-start: 1px; + -moz-padding-end: 1px; } toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker, .toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-dropmarker { - padding: 0px 1px 13px 1px; + padding-top: 0px; + padding-bottom: 13px; + -moz-padding-start: 1px; + -moz-padding-end: 1px; } toolbar[mode="text"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker, toolbar[mode="text"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker { - padding: 5px 0px 7px 2px; + padding-top: 5px; + padding-bottom: 7px; + -moz-padding-start: 0px; + -moz-padding-end: 2px; } toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker, toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker, .toolbarbutton-1[toolbarmode="small"][type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker, .toolbarbutton-1[toolbarmode="small"][type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker { - padding: 1px 0px 12px 2px; + padding-top: 1px; + padding-bottom: 12px; + -moz-padding-start: 0px; + -moz-padding-end: 2px; } toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker[disabled="true"] { - padding: 4px 1px 8px 1px !important; + padding-top: 4px !important; + padding-bottom: 8px !important; + -moz-padding-start: 1px !important; + -moz-padding-end: 1px !important; } toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker[disabled="true"], .toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] { - padding: 0px 1px 13px 1px !important; + padding-top: 0px !important; + padding-bottom: 13px !important; + -moz-padding-start: 1px !important; + -moz-padding-end: 1px !important; } toolbar[mode="icons"] .toolbarbutton-text, diff --git a/LCARStrek/communicator/communicator.css b/LCARStrek/communicator/communicator.css index 2a895cda..e396d160 100644 --- a/LCARStrek/communicator/communicator.css +++ b/LCARStrek/communicator/communicator.css @@ -47,8 +47,24 @@ == Styles shared everywhere throughout the Communicator suite. ========================================================================== */ +toolbar { + -moz-binding: url("chrome://global/skin/globalBindings.xml#grippytoolbar"); +} + +menubar { + -moz-binding: url("chrome://global/skin/globalBindings.xml#grippymenubar"); +} + .toolbar-primary { - -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary"); + -moz-binding: url("chrome://global/skin/globalBindings.xml#grippytoolbar-primary"); +} + +toolbar[xpfe="false"] { + -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar"); +} + +menubar[xpfe="false"] { + -moz-binding: url("chrome://global/skin/globalBindings.xml#menubar"); } /* ::::: autocomplete ::::: */ diff --git a/LCARStrek/communicator/preferences.css b/LCARStrek/communicator/preferences.css index b80957f1..5b7c30d7 100644 --- a/LCARStrek/communicator/preferences.css +++ b/LCARStrek/communicator/preferences.css @@ -41,10 +41,15 @@ /* ::::: Main Window ::::: */ prefwindow { - padding-top: 8px; - padding-bottom: 10px; - -moz-padding-start: 8px; - -moz-padding-end: 10px; + padding: 3px; +} + +#categoryCol { + -moz-border-radius: 3px 3px 0px 0px; +} + +dialogheader { + -moz-margin-start: 3px; } /* File Field Widget */ diff --git a/LCARStrek/global/dialog.css b/LCARStrek/global/dialog.css index 98612ebc..98616f0a 100644 --- a/LCARStrek/global/dialog.css +++ b/LCARStrek/global/dialog.css @@ -46,28 +46,24 @@ /* ::::: dialog ::::: */ dialog { - padding-top: 8px; - padding-bottom: 10px; - -moz-padding-start: 8px; - -moz-padding-end: 10px; + padding: 3px; } /* ::::: dialog buttons ::::: */ .dialog-button { /* font: menu; */ - margin-top: 5px; + margin-top: 3px; } /* ::::: dialog header ::::: */ dialogheader { - -moz-border-radius: 3px; - margin: 0px 5px 5px 5px; - border: 1px solid #9C9CFF; - padding: 3px 4px; - background-color: #000000; - color: #9C9CFF; + -moz-border-radius: 8px; + margin: 0px; + padding: 1px 12px; + background-color: #FF9F00; + color: #000000; } .dialogheader-title { diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css index be8e862d..40ec0616 100644 --- a/LCARStrek/global/global.css +++ b/LCARStrek/global/global.css @@ -79,6 +79,10 @@ menubar { -moz-binding: url("chrome://global/skin/globalBindings.xml#menubar"); } +toolbaritem > menubar { + -moz-binding: url("chrome://global/skin/globalBindings.xml#menubar"); +} + /* progressmeter[mode="undetermined"] { -moz-binding: url("chrome://global/content/bindings/progressmeter.xml#progressmeter-undetermined"); diff --git a/LCARStrek/global/globalBindings.xml b/LCARStrek/global/globalBindings.xml index 4eb76356..b248396e 100755 --- a/LCARStrek/global/globalBindings.xml +++ b/LCARStrek/global/globalBindings.xml @@ -63,30 +63,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack"> - + + xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack"> - + diff --git a/LCARStrek/global/preferences.css b/LCARStrek/global/preferences.css index 4cb96c7e..9912c274 100644 --- a/LCARStrek/global/preferences.css +++ b/LCARStrek/global/preferences.css @@ -49,17 +49,17 @@ prefwindow { } prefpane { - padding-top: 8px; - padding-bottom: 10px; - -moz-padding-start: 8px; - -moz-padding-end: 10px; + padding-top: 3px; + padding-bottom: 0px; + -moz-padding-start: 3px; + -moz-padding-end: 0px; } prefwindow[type="child"] { - padding-top: 8px; - padding-bottom: 10px; - -moz-padding-start: 8px; - -moz-padding-end: 10px; + padding-top: 3px; + padding-bottom: 0px; + -moz-padding-start: 3px; + -moz-padding-end: 0px; } prefwindow[type="child"] > prefpane { @@ -67,9 +67,7 @@ prefwindow[type="child"] > prefpane { } .prefWindow-dlgbuttons { - padding-bottom: 10px; - -moz-padding-start: 8px; - -moz-padding-end: 10px; + padding-top: 3px; } prefwindow[type="child"] .prefWindow-dlgbuttons { @@ -86,6 +84,7 @@ radio[pane] { .paneSelector { border-bottom: 1px solid #9C9CFF; margin: 0px; + margin-bottom: 3px; -moz-padding-start: 10px; background-color: #000000; color: #FF9F00; diff --git a/LCARStrek/global/textbox.css b/LCARStrek/global/textbox.css index 1f41c8e7..3d4cfc5e 100644 --- a/LCARStrek/global/textbox.css +++ b/LCARStrek/global/textbox.css @@ -46,6 +46,7 @@ textbox { -moz-border-radius: 3px; + -moz-outline-radius: 3px; cursor: text; margin: 2px 3px; border: 1px solid #9C9CFF; @@ -95,7 +96,6 @@ textbox[disabled="true"] { textbox[focused="true"] { border: 1px solid #008484; outline: 1px solid #008484; - margin: 1px 3px; } textbox[focused="true"][readonly="true"] { diff --git a/LCARStrek/global/toolbar.css b/LCARStrek/global/toolbar.css index 556d3f21..ea9bbcdd 100644 --- a/LCARStrek/global/toolbar.css +++ b/LCARStrek/global/toolbar.css @@ -66,10 +66,11 @@ toolbar#toolbar-menubar > .toolbar-holder { background-color: #6000CF; } -/* ::::: toolbargrippy ::::: */ +/* ::::: toolbargrippy, startcap (LCARStrek specific) ::::: */ toolbargrippy, -toolbar > .toolbar-begcap { +toolbar > .toolbar-startcap, +menubar > .menubar-startcap { -moz-border-radius: 8px 0px 0px 8px; -moz-box-orient: vertical; -moz-box-align: center; diff --git a/LCARStrek/global/toolbarbutton.css b/LCARStrek/global/toolbarbutton.css index c0dd11b3..ea05e9f7 100644 --- a/LCARStrek/global/toolbarbutton.css +++ b/LCARStrek/global/toolbarbutton.css @@ -52,12 +52,13 @@ toolbarbutton { margin: 0px; margin-left: 2px; border: none; - padding: 1px; + padding: 1px 2px; background-color: #000000; color: #FFCF00; } .toolbarbutton-icon { + -moz-margin-start: 1px; -moz-margin-end: 2px; } @@ -94,8 +95,8 @@ toolbarbutton:hover:active, toolbarbutton[open="true"] { padding-top: 2px; padding-bottom: 0px; - -moz-padding-start: 2px; - -moz-padding-end: 0px; + -moz-padding-start: 3px; + -moz-padding-end: 1px; } toolbarbutton[disabled="true"], @@ -112,8 +113,8 @@ toolbarbutton[disabled="true"][open="true"] { toolbarbutton[checked="true"] { padding-top: 2px !important; padding-bottom: 0px !important; - -moz-padding-start: 2px !important; - -moz-padding-end: 0px !important; + -moz-padding-start: 3px !important; + -moz-padding-end: 1px !important; background-color: #008484; color: #FFCF00; } @@ -215,6 +216,17 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropm -moz-padding-end: 0px; } +toolbarbutton[type="menu-button"]:not([disabled="true"]):hover > .toolbarbutton-menubutton-dropmarker, +toolbarbutton[type="menu-button"]:not([disabled="true"]):hover:active > .toolbarbutton-menubutton-dropmarker, +toolbarbutton[type="menu-button"][open="true"]:not([disabled="true"]) > .toolbarbutton-menubutton-dropmarker, +toolbarbutton[type="menu"]:not([disabled="true"]):hover > .toolbarbutton-menu-dropmarker, +toolbarbutton[type="menu"]:not([disabled="true"]):hover:active > .toolbarbutton-menu-dropmarker, +toolbarbutton[type="menu"][open="true"]:not([disabled="true"]) > .toolbarbutton-menu-dropmarker { + list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif"); + -moz-image-region: auto; +} + + .toolbarbutton-menubutton-dropmarker[disabled="true"] { padding: 3px 1px 1px 1px !important; border: none !important; diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css index 50dc77db..21b196eb 100644 --- a/LCARStrek/mozapps/extensions/extensions.css +++ b/LCARStrek/mozapps/extensions/extensions.css @@ -348,6 +348,7 @@ vbox[typeName="status"][type="header-recommended"] { .viewSelector { border-bottom: 1px solid #9C9CFF; margin: 0px; + margin-bottom: 3px; -moz-padding-start: 10px; background-color: #000000; color: #FF9F00; diff --git a/LCARStrek/preview.png b/LCARStrek/preview.png index 464d23b5..a79f3639 100755 Binary files a/LCARStrek/preview.png and b/LCARStrek/preview.png differ