From e82e1bf4270f9b94650c3e46465532a9fc20694e Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Tue, 6 Jan 2015 16:34:34 +0100 Subject: [PATCH] sync both themes with toolkit windows theme changes in Mozilla 35 cycle --- EarlyBlue/global/aboutSupport.css | 1 - EarlyBlue/global/autocomplete.css | 26 ++++++++++ EarlyBlue/global/global.css | 7 +-- EarlyBlue/global/globalBindings.xml | 11 ---- .../global/icons/autocomplete-search.svg | 33 ++++++++++++ EarlyBlue/global/menu.css | 7 +-- EarlyBlue/global/menulist.css | 41 +-------------- EarlyBlue/global/popup.css | 15 ++++-- EarlyBlue/global/toolbarbutton.css | 42 +++++++++++++++ .../mozapps/plugins/pluginInstallerWizard.css | 8 --- LCARStrek/browser/browser.css | 52 ------------------- LCARStrek/global/aboutSupport.css | 1 - LCARStrek/global/autocomplete.css | 26 ++++++++++ LCARStrek/global/global.css | 7 +-- LCARStrek/global/globalBindings.xml | 13 +---- .../global/icons/autocomplete-search.svg | 33 ++++++++++++ LCARStrek/global/menu.css | 7 +-- LCARStrek/global/menulist.css | 37 +------------ LCARStrek/global/popup.css | 15 ++++-- LCARStrek/global/toolbarbutton.css | 42 +++++++++++++++ .../mozapps/plugins/pluginInstallerWizard.css | 8 --- 21 files changed, 233 insertions(+), 199 deletions(-) create mode 100644 EarlyBlue/global/icons/autocomplete-search.svg delete mode 100644 EarlyBlue/mozapps/plugins/pluginInstallerWizard.css create mode 100644 LCARStrek/global/icons/autocomplete-search.svg delete mode 100644 LCARStrek/mozapps/plugins/pluginInstallerWizard.css diff --git a/EarlyBlue/global/aboutSupport.css b/EarlyBlue/global/aboutSupport.css index 5c556dfa..8b71b9f1 100644 --- a/EarlyBlue/global/aboutSupport.css +++ b/EarlyBlue/global/aboutSupport.css @@ -105,7 +105,6 @@ td { #reset-box > button { display: block; - margin: auto; } .block { diff --git a/EarlyBlue/global/autocomplete.css b/EarlyBlue/global/autocomplete.css index 591da911..6bd01046 100644 --- a/EarlyBlue/global/autocomplete.css +++ b/EarlyBlue/global/autocomplete.css @@ -124,6 +124,32 @@ panel[type="autocomplete-richlistbox"], border-top: 1px solid #666699; } +.ac-title-box { +} + +.ac-url-box { + /* When setting a vertical margin here, half of that needs to be added + .ac-title-box's translateY for when .ac-url-box is hidden (see below). */ +/* margin: 1px 0 4px;*/ +} + +.autocomplete-richlistitem[actiontype="keyword"] .ac-url-box, +.autocomplete-richlistitem[actiontype="searchengine"] .ac-url-box, +.autocomplete-richlistitem[actiontype="visiturl"] .ac-url-box, +.autocomplete-richlistitem[type~="autofill"] .ac-url-box { + visibility: hidden; +} + +.autocomplete-richlistitem[actiontype="keyword"] .ac-title-box, +.autocomplete-richlistitem[actiontype="searchengine"] .ac-title-box, +.autocomplete-richlistitem[actiontype="visiturl"] .ac-title-box, +.autocomplete-richlistitem[type~="autofill"] .ac-title-box { + /* Center the title by moving it down by half of .ac-url-box's height, + including vertical margins (if any). */ +/* transform: translateY(calc(.5em + 2px));*/ + transform: translateY(calc(.5em)); +} + .ac-site-icon { width: 16px; height: 16px; diff --git a/EarlyBlue/global/global.css b/EarlyBlue/global/global.css index a8005864..6724853e 100644 --- a/EarlyBlue/global/global.css +++ b/EarlyBlue/global/global.css @@ -21,15 +21,10 @@ radio { -moz-binding: url("chrome://global/skin/globalBindings.xml#radio-with-spacing"); } -menulist > menupopup, -.menulist-menupopup { +menulist > menupopup { -moz-binding: url("chrome://global/content/bindings/popup.xml#popup-scrollbars"); } -.menulist-compact { - -moz-binding: url("chrome://global/skin/globalBindings.xml#menulist-compact"); -} - /* ::::: root elements ::::: */ window, diff --git a/EarlyBlue/global/globalBindings.xml b/EarlyBlue/global/globalBindings.xml index b8ae0957..daaa92f0 100644 --- a/EarlyBlue/global/globalBindings.xml +++ b/EarlyBlue/global/globalBindings.xml @@ -49,15 +49,4 @@ - - - - - - - - - - \ No newline at end of file diff --git a/EarlyBlue/global/icons/autocomplete-search.svg b/EarlyBlue/global/icons/autocomplete-search.svg new file mode 100644 index 00000000..90322fc5 --- /dev/null +++ b/EarlyBlue/global/icons/autocomplete-search.svg @@ -0,0 +1,33 @@ + + + + + + + + + + diff --git a/EarlyBlue/global/menu.css b/EarlyBlue/global/menu.css index 5e8c9957..ea038910 100644 --- a/EarlyBlue/global/menu.css +++ b/EarlyBlue/global/menu.css @@ -83,9 +83,7 @@ popup > menuitem { /* ::::: menu/menuitems in menulist popups ::::: */ -.menulist-menupopup > menuitem, menulist > menupopup > menuitem, -.menulist-menupopup > menu, menulist > menupopup > menu { padding: 1px 5px; max-width: none; @@ -182,9 +180,7 @@ menulist > menupopup > menu { color: inherit; } -.menulist-menupopup > menuitem > .menu-iconic-left, menulist > menupopup > menuitem > .menu-iconic-left, -.menulist-menupopup > menu > .menu-iconic-left, menulist > menupopup > menu > .menu-iconic-left { display: none; } @@ -224,8 +220,7 @@ menuseparator { margin: 2px 0px; } -menulist > menupopup > menuseparator, -.menulist-menupopup > menuseparator { +menulist > menupopup > menuseparator { border: 1px inset #CCD0DD; margin: 2px 0px; } diff --git a/EarlyBlue/global/menulist.css b/EarlyBlue/global/menulist.css index 4d88b006..33e472ad 100644 --- a/EarlyBlue/global/menulist.css +++ b/EarlyBlue/global/menulist.css @@ -36,12 +36,12 @@ menulist { -moz-margin-start: 1ex !important; } -menulist:focus:not(.menulist-compact) > .menulist-label-box { +menulist:focus > .menulist-label-box { background-color: #336699; color: #000000; } -menulist:-moz-focusring:not([open="true"]):not(.menulist-compact) > .menulist-label-box { +menulist:-moz-focusring:not([open="true"]) > .menulist-label-box { /* border: 1px dotted #808080; */ } @@ -88,40 +88,3 @@ html|*.menulist-editable-input { color: inherit; font: inherit; } - -/* ::::: compact menulists ::::: */ - -.menulist-compact { - -moz-box-align: center; - -moz-box-pack: center; - margin: 0px; - border: 1px outset #CCD0DD; - color: #000000; - list-style-image: url("chrome://global/skin/arrow/arrow-down.gif"); -} - -.menulist-compact > .menulist-label-box { - border: 1px solid transparent; -} - -.menulist-compact > .menulist-label-box > .menulist-label { - margin: 0 3px !important; - text-align: end; -} - -.menulist-compact > .menulist-label-box > .menulist-icon { - -moz-margin-start: 2px; -} - -.menulist-compact[open="true"] { - border: 1px inset #CCD0DD; - /* color: ThreeDHighlight; */ -} - -.menulist-compact[disabled="true"] { - list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif"); -} - -.menulist-compact:-moz-focusring:not([open="true"]) > .menulist-label-box { - border: 1px dotted #999999; -} \ No newline at end of file diff --git a/EarlyBlue/global/popup.css b/EarlyBlue/global/popup.css index 076cc04e..0e4b896b 100644 --- a/EarlyBlue/global/popup.css +++ b/EarlyBlue/global/popup.css @@ -8,6 +8,13 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +/* ::::: Variables ::::: */ +.panel-arrowcontent { + --panel-arrowcontent-background: #CCD0DD; + --panel-arrowcontent-color: #000000; + --panel-arrowcontent-border: 1px outset #CCD0DD; +} + /* ::::: menupopup ::::: */ menupopup, @@ -45,9 +52,10 @@ panel[type="arrow"][side="right"] { .panel-arrowcontent { padding: 6px; - background-color: #CCD0DD; + color: var(--panel-arrowcontent-color); + background: var(--panel-arrowcontent-background); background-clip: padding-box; - border: 1px outset #CCD0DD; + border: var(--panel-arrowcontent-border); margin: 0px; } @@ -105,8 +113,7 @@ tooltip[titletip="true"] { /* rules for popups associated with menulists */ -menulist > menupopup, -.menulist-menupopup { +menulist > menupopup { border: 1px solid #666699; min-width: 0px; padding: 0px; diff --git a/EarlyBlue/global/toolbarbutton.css b/EarlyBlue/global/toolbarbutton.css index 65f2eaa4..84c21f42 100644 --- a/EarlyBlue/global/toolbarbutton.css +++ b/EarlyBlue/global/toolbarbutton.css @@ -149,6 +149,48 @@ toolbarbutton[disabled="true"]:hover:active > toolbarbutton.toolbarbutton-menubu padding: 1px !important; } +/* ::::: toolbarbutton badged ::::: */ + +.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) { + -moz-margin-end: 0; +} + +.toolbarbutton-badge[badge=""] { + display: none; +} + +.toolbarbutton-badge { + background-color: #CCD0DD; +} + +.toolbarbutton-badge::after { + /* The |content| property is set in the content stylesheet. */ + font-size: 10px; + font-weight: bold; + padding: 1px 2px 2px; + color: #000000; + background-color: inherit; + border-radius: 2px; + box-shadow: 0 1px 0 #9999CC inset, + 0 -1px 0 #9999CC inset, + 0 1px 0 #9999CC; + position: absolute; + top: -4px; + right: -2px; + min-width: 10px; + line-height: 10px; + text-align: center; +} + +.toolbarbutton-badge:-moz-locale-dir(rtl)::after { + left: -2px; + right: auto; +} + +.toolbarbutton-badge-container { + position: relative; +} + /* .......... dropmarker .......... */ .toolbarbutton-menubutton-dropmarker { diff --git a/EarlyBlue/mozapps/plugins/pluginInstallerWizard.css b/EarlyBlue/mozapps/plugins/pluginInstallerWizard.css deleted file mode 100644 index 1cba7dc5..00000000 --- a/EarlyBlue/mozapps/plugins/pluginInstallerWizard.css +++ /dev/null @@ -1,8 +0,0 @@ -#licenseContainer, #pluginList { - -moz-appearance: listbox; - margin: 2px 4px; - border: 1px inset #CCD0DD; - background-color: #FFFFFF; - color: #000000; -} - diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 3ae9430d..095e51c8 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -4288,58 +4288,6 @@ html|*#gcli-output-frame { display: none; } -.toolbarbutton-badge-container { - margin: 0; - padding: 0; - position: relative; -} - -#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container { - padding: 2px 2px; -} - -.toolbarbutton-1 > .toolbarbutton-badge-container > .toolbar-icon { - position: absolute; - top: 2px; - right: 2px; -} - -.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) { - -moz-margin-end: 0; -} - -.toolbarbutton-badge[badge=""] { - display: none; -} -.toolbarbutton-badge[badge]:not([badge=""])::after { - /* The |content| property is set in the content stylesheet. */ - font-size: 9px; - font-weight: bold; - padding: 0 1px; - color: #FF9F00; - background-color: #000000; - border: 1px solid #9C9CFF; - border-radius: 2px; - position: absolute; - top: 0; - right: 0; -} - -#nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""])::after { - top: 1px; - right: 1px; -} - -.toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after { - left: 0; - right: auto; -} - -#nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after { - left: 1px; - right: auto; -} - #social-notification-icon-mentions { background-color: #000000; border-radius: 3px; diff --git a/LCARStrek/global/aboutSupport.css b/LCARStrek/global/aboutSupport.css index 7bfe0013..f1a003a4 100644 --- a/LCARStrek/global/aboutSupport.css +++ b/LCARStrek/global/aboutSupport.css @@ -161,7 +161,6 @@ td { #reset-box > button { display: block; - margin: auto; } .block { diff --git a/LCARStrek/global/autocomplete.css b/LCARStrek/global/autocomplete.css index ee86e331..7096b319 100644 --- a/LCARStrek/global/autocomplete.css +++ b/LCARStrek/global/autocomplete.css @@ -135,6 +135,32 @@ panel[type="autocomplete-richlistbox"], border-top: 1px solid #E7ADE7; } +.ac-title-box { +} + +.ac-url-box { + /* When setting a vertical margin here, half of that needs to be added + .ac-title-box's translateY for when .ac-url-box is hidden (see below). */ +/* margin: 1px 0 4px;*/ +} + +.autocomplete-richlistitem[actiontype="keyword"] .ac-url-box, +.autocomplete-richlistitem[actiontype="searchengine"] .ac-url-box, +.autocomplete-richlistitem[actiontype="visiturl"] .ac-url-box, +.autocomplete-richlistitem[type~="autofill"] .ac-url-box { + visibility: hidden; +} + +.autocomplete-richlistitem[actiontype="keyword"] .ac-title-box, +.autocomplete-richlistitem[actiontype="searchengine"] .ac-title-box, +.autocomplete-richlistitem[actiontype="visiturl"] .ac-title-box, +.autocomplete-richlistitem[type~="autofill"] .ac-title-box { + /* Center the title by moving it down by half of .ac-url-box's height, + including vertical margins (if any). */ +/* transform: translateY(calc(.5em + 2px));*/ + transform: translateY(calc(.5em)); +} + .ac-site-icon { width: 16px; height: 16px; diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css index 6cf895d0..071d561c 100644 --- a/LCARStrek/global/global.css +++ b/LCARStrek/global/global.css @@ -21,15 +21,10 @@ radio { -moz-binding: url("chrome://global/skin/globalBindings.xml#radio-with-spacing"); } -menulist > menupopup, -.menulist-menupopup { +menulist > menupopup { -moz-binding: url("chrome://global/content/bindings/popup.xml#popup-scrollbars"); } -.menulist-compact { - -moz-binding: url("chrome://global/skin/globalBindings.xml#menulist-compact"); -} - /* LCARStrek special bindings */ statusbar { diff --git a/LCARStrek/global/globalBindings.xml b/LCARStrek/global/globalBindings.xml index 03c29f24..15cfb5a8 100755 --- a/LCARStrek/global/globalBindings.xml +++ b/LCARStrek/global/globalBindings.xml @@ -49,18 +49,7 @@ - - - - - - - - - - - + diff --git a/LCARStrek/global/icons/autocomplete-search.svg b/LCARStrek/global/icons/autocomplete-search.svg new file mode 100644 index 00000000..fdd54a3b --- /dev/null +++ b/LCARStrek/global/icons/autocomplete-search.svg @@ -0,0 +1,33 @@ + + + + + + + + + + diff --git a/LCARStrek/global/menu.css b/LCARStrek/global/menu.css index 45f25b4b..dafa9ea2 100644 --- a/LCARStrek/global/menu.css +++ b/LCARStrek/global/menu.css @@ -83,9 +83,7 @@ popup > menuitem { /* ::::: menu/menuitems in menulist popups ::::: */ -.menulist-menupopup > menuitem, menulist > menupopup > menuitem, -.menulist-menupopup > menu, menulist > menupopup > menu { padding: 1px 5px; max-width: none; @@ -182,9 +180,7 @@ menulist > menupopup > menu { color: inherit; } -.menulist-menupopup > menuitem > .menu-iconic-left, menulist > menupopup > menuitem > .menu-iconic-left, -.menulist-menupopup > menu > .menu-iconic-left, menulist > menupopup > menu > .menu-iconic-left { display: none; } @@ -224,8 +220,7 @@ menuseparator { margin: 2px 0px; } -menulist > menupopup > menuseparator, -.menulist-menupopup > menuseparator { +menulist > menupopup > menuseparator { border: 1px solid #9C9CFF; margin: 2px 0px; } diff --git a/LCARStrek/global/menulist.css b/LCARStrek/global/menulist.css index c16582ae..470b46af 100644 --- a/LCARStrek/global/menulist.css +++ b/LCARStrek/global/menulist.css @@ -50,12 +50,12 @@ menulist[open="true"] { -moz-margin-start: 1ex !important; } -menulist:focus:not(.menulist-compact) > .menulist-label-box { +menulist:focus > .menulist-label-box { background-color: #008484; color: #FFCF00; } -menulist:-moz-focusring:not([open="true"]):not(.menulist-compact) > .menulist-label-box { +menulist:-moz-focusring:not([open="true"]) > .menulist-label-box { /* border: 1px dotted #FFCF00; */ } @@ -121,36 +121,3 @@ html|*.menulist-editable-input { color: inherit; font: inherit; } - -/* ::::: compact menulists ::::: */ - -.menulist-compact { - -moz-box-align: center; - -moz-box-pack: center; - margin: 0px; - color: #E7ADE7; - border: 1px solid #9C9CFF; - list-style-image: url("chrome://global/skin/arrow/arrow-down.gif"); -} - -.menulist-compact > .menulist-label-box > .menulist-label { - margin: 0 3px !important; - text-align: end; -} - -.menulist-compact > .menulist-label-box > .menulist-icon { - -moz-margin-start: 2px; -} - -.menulist-compact[open="true"] { - border: 1px solid #FFCF00; -} - -.menulist-compact:hover, -.menulist-compact[open="true"] { - list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif"); -} - -.menulist-compact[disabled="true"] { - list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif"); -} diff --git a/LCARStrek/global/popup.css b/LCARStrek/global/popup.css index 0320d30a..00661adf 100644 --- a/LCARStrek/global/popup.css +++ b/LCARStrek/global/popup.css @@ -8,6 +8,13 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +/* ::::: Variables ::::: */ +.panel-arrowcontent { + --panel-arrowcontent-background: #000000; + --panel-arrowcontent-color: #FF9F00; + --panel-arrowcontent-border: 1px solid #FF9F00; +} + /* ::::: menupopup ::::: */ menupopup, @@ -46,9 +53,10 @@ panel[type="arrow"][side="right"] { .panel-arrowcontent { border-radius: 6px; padding: 6px; - background-color: #000000; + color: var(--panel-arrowcontent-color); + background: var(--panel-arrowcontent-background); background-clip: padding-box; - border: 1px solid #FF9F00; + border: var(--panel-arrowcontent-border); margin: 0px; } @@ -107,8 +115,7 @@ tooltip[titletip="true"] { /* rules for popups associated with menulists */ -menulist > menupopup, -.menulist-menupopup { +menulist > menupopup { border: 1px solid #FF9F00; min-width: 0px; padding: 0px; diff --git a/LCARStrek/global/toolbarbutton.css b/LCARStrek/global/toolbarbutton.css index 2b0d4598..feaa2560 100644 --- a/LCARStrek/global/toolbarbutton.css +++ b/LCARStrek/global/toolbarbutton.css @@ -175,6 +175,48 @@ toolbarbutton[disabled="true"]:hover:active > toolbarbutton.toolbarbutton-menubu padding: 1px 2px !important; } +/* ::::: toolbarbutton badged ::::: */ + +.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) { + -moz-margin-end: 0; +} + +.toolbarbutton-badge[badge=""] { + display: none; +} + +.toolbarbutton-badge { + background-color: #000000; +} + +.toolbarbutton-badge::after { + /* The |content| property is set in the content stylesheet. */ + font-size: 10px; + font-weight: bold; + padding: 1px 2px 2px; + color: #FF9F00; + background-color: inherit; + border-radius: 2px; + box-shadow: 0 1px 0 #9C9CFF inset, + 0 -1px 0 #9C9CFF inset, + 0 1px 0 #9C9CFF; + position: absolute; + top: -4px; + right: -2px; + min-width: 10px; + line-height: 10px; + text-align: center; +} + +.toolbarbutton-badge:-moz-locale-dir(rtl)::after { + left: -2px; + right: auto; +} + +.toolbarbutton-badge-container { + position: relative; +} + /* .......... dropmarker .......... */ .toolbarbutton-menubutton-dropmarker { diff --git a/LCARStrek/mozapps/plugins/pluginInstallerWizard.css b/LCARStrek/mozapps/plugins/pluginInstallerWizard.css deleted file mode 100644 index 9ff05c01..00000000 --- a/LCARStrek/mozapps/plugins/pluginInstallerWizard.css +++ /dev/null @@ -1,8 +0,0 @@ -#licenseContainer, #pluginList { - margin: 2px 4px; - border-radius: 5px; - border: 1px solid #9C9CFF; - background-color: #000000; - color: #FF9F00; -} - -- 2.35.3