From 7a7b11b3a8e1e334310160e6b2b5ef208a2e66c9 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sat, 15 Nov 2008 02:32:44 +0100 Subject: [PATCH] LCARStrek support of new toolbar iconsize/mode controls, no small icons yet --- LCARStrek/communicator/brand.css | 4 +- LCARStrek/communicator/button.css | 23 +++++++--- LCARStrek/navigator/navigator.css | 76 +++++++++++++++++-------------- 3 files changed, 62 insertions(+), 41 deletions(-) diff --git a/LCARStrek/communicator/brand.css b/LCARStrek/communicator/brand.css index d25ad828..6aa324f8 100644 --- a/LCARStrek/communicator/brand.css +++ b/LCARStrek/communicator/brand.css @@ -56,7 +56,7 @@ window[chromehidden~="toolbar"] #navigator-throbber, toolbar[mode="text"] #navigator-throbber, toolbar[mode="icons"] #navigator-throbber, -#navigator-throbber[toolbarmode="small"] { +#toolbar[iconsize="small"] #navigator-throbber { margin: 0 3px 0 1px; padding: 2px; list-style-image: url("chrome://communicator/skin/brand/throbber16-single.gif"); @@ -65,6 +65,6 @@ toolbar[mode="icons"] #navigator-throbber, window[chromehidden~="toolbar"] #navigator-throbber[busy="true"], toolbar[mode="text"] #navigator-throbber[busy="true"], toolbar[mode="icons"] #navigator-throbber[busy="true"], -#navigator-throbber[toolbarmode="small"][busy="true"] { +#toolbar[iconsize="small"] #navigator-throbber[busy="true"] { list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.gif"); } diff --git a/LCARStrek/communicator/button.css b/LCARStrek/communicator/button.css index 68e1fc3b..9475b79b 100644 --- a/LCARStrek/communicator/button.css +++ b/LCARStrek/communicator/button.css @@ -78,10 +78,10 @@ toolbar[mode="text"] .toolbarbutton-1, toolbar[mode="icons"] .toolbarbutton-1, -.toolbarbutton-1[toolbarmode="small"], +toolbar[iconsize="small"] .toolbarbutton-1, toolbar[mode="text"] .toolbarbutton-menubutton-button, toolbar[mode="icons"] .toolbarbutton-menubutton-button, -.toolbarbutton-menubutton-button[toolbarmode="small"] { +toolbar[iconsize="small"] .toolbarbutton-menubutton-button { min-width: 0px; min-height: 0px; } @@ -94,7 +94,7 @@ toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker { } toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker, -.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-dropmarker { +toolbar[iconsize="small"] .toolbarbutton-menubutton-dropmarker { padding-top: 0px; padding-bottom: 13px; -moz-padding-start: 1px; @@ -111,8 +111,8 @@ toolbar[mode="text"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolba 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 { +toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker, +toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker { padding-top: 1px; padding-bottom: 12px; -moz-padding-start: 0px; @@ -127,7 +127,7 @@ toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker[disabled="true"] { } toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker[disabled="true"], -.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] { +toolbar[iconsize="small"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] { padding-top: 0px !important; padding-bottom: 13px !important; -moz-padding-start: 1px !important; @@ -143,6 +143,17 @@ toolbar[mode="text"] .toolbarbutton-text { padding: 4px 0; } +toolbar[mode="text"] .toolbarbutton-1, +toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-menubutton-button { + -moz-box-orient: horizontal; +} + +toolbar[labelalign="end"] .toolbarbutton-1, +toolbar[labelalign="end"] .toolbarbutton-1 > .toolbarbutton-menubutton-button, +toolbar[labelalign="end"] .toolbarbutton-1 > hbox > vbox { + -moz-box-orient: horizontal; +} + /* ::::: standard toolbar buttons ::::: */ .button-toolbar { diff --git a/LCARStrek/navigator/navigator.css b/LCARStrek/navigator/navigator.css index 667a26e0..ce2c1552 100644 --- a/LCARStrek/navigator/navigator.css +++ b/LCARStrek/navigator/navigator.css @@ -128,40 +128,10 @@ list-style-image: url("chrome://global/skin/icons/close-button-hover.gif"); } -/* Hides text below the above buttons */ -/* -.toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-text, -.toolbarbutton-1 > .toolbarbutton-text { - display: none; -} -*/ - -#fullscreen-exit-button { - list-style-image: none; -} - -#fullscreen-exit-button > .toolbarbutton-text { -/* display: normal; */ -} - /* ::::: small primary toolbar buttons ::::: */ -.toolbarbutton-text[toolbarmode="small"] { - display: none; -} - -.toolbarbutton-icon[toolbarmode="small"] { - display: inline; -} - -#nav-bar[mode="text"] > #nav-bar-inner, -#nav-bar[mode="icons"] > #nav-bar-inner, -#nav-bar[toolbarmode="small"] > #nav-bar-inner { - margin: 2px 0px 2px 6px; -} - -toolbar[toolbarmode="small"] > toolbargrippy { -/* display: none; */ +#nav-bar[inFullscreen="true"] .toolbar-grippy { + /* display: none; */ } /* ::::: fullscreen window controls ::::: */ @@ -176,6 +146,10 @@ toolbar[toolbarmode="small"] > toolbargrippy { padding: 2px 0px 2px 2px; } +toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon { + display: -moz-box; +} + #minimize-button { list-style-image: url("chrome://navigator/skin/icons/win-minimize.gif"); } @@ -309,6 +283,13 @@ toolbar[toolbarmode="small"] > toolbargrippy { font-weight: bold; } +/* +toolbar[mode="text"] #search-button > .button-box > .button-icon, +toolbar[mode="icons"] #search-button > .button-box > .button-text { + display: none; +} +*/ + /* ::::: throbber ::::: */ #throbber-box { @@ -360,10 +341,24 @@ toolbar[toolbarmode="small"] > toolbargrippy { list-style-image: url("chrome://navigator/skin/icons/chevron-hover.gif") !important; } -#bookmarks-chevron > .toolbarbutton-menu-dropmarker { +toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { display: none; } +toolbarbutton.chevron > .toolbarbutton-text { + display: none; /* hide chevron label which has a width even if blank */ +} + +toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon { + display: -moz-box; /* display chevron icon in text mode */ +} + +/* Prevent [mode="icons"|"text"] from hiding the label and icon */ +#bookmarks-ptf .bookmark-item > .toolbarbutton-text, +#bookmarks-ptf .bookmark-item > .toolbarbutton-icon { + display: -moz-box !important; +} + /* ::::: feeds ::::: */ #feedsMenu { @@ -387,3 +382,18 @@ toolbar[toolbarmode="small"] > toolbargrippy { #feedsButton:hover:active { -moz-image-region: rect(48px 32px 64px 16px); } + +/* ::::: home button on the personal toolbar ::::: */ + +#PersonalToolbar[iconsize="small"] > #home-button > .toolbarbutton-icon { + /* width: 16px; + height: 16px; */ +} + +#PersonalToolbar > #home-button { + cursor: pointer; +} + +#PersonalToolbar > #home-button[disabled="true"] { + cursor: default !important; +} -- 2.35.3