From 64da60f36aef0e5ba1f11899c135565230a70edd Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 9 Apr 2017 20:17:56 +0200 Subject: [PATCH] fix checkboxes and radios to not use the -with-spacing variant any more as the checkbox one was apparently removed from global default theme (and this made XUL checkboxes disappear everywhere) --- EarlyBlue/global/checkbox.css | 42 ++++++------------ EarlyBlue/global/global.css | 6 +-- EarlyBlue/global/globalBindings.xml | 22 +--------- EarlyBlue/global/radio.css | 41 ++++++++---------- LCARStrek/global/checkbox.css | 67 +++++++++-------------------- LCARStrek/global/global.css | 6 +-- LCARStrek/global/globalBindings.xml | 22 +--------- LCARStrek/global/radio.css | 52 ++++++++++------------ 8 files changed, 81 insertions(+), 177 deletions(-) diff --git a/EarlyBlue/global/checkbox.css b/EarlyBlue/global/checkbox.css index b28cea22..1c7cb5ab 100644 --- a/EarlyBlue/global/checkbox.css +++ b/EarlyBlue/global/checkbox.css @@ -11,26 +11,19 @@ /* ::::: checkbox ::::: */ checkbox { - margin: 1px 2px; - border-left: 1px transparent; - border-right: 1px transparent; -} - -.checkbox-spacer-box { - -moz-box-align: center; - border-right: 4px solid transparent; -} - -.checkbox-label-center-box { -moz-box-align: center; + margin: 1px 2px; + padding-top: 0; + padding-bottom: 0; + padding-inline-start: 2px; + padding-inline-end: 0; } .checkbox-label-box { border: 1px solid transparent; - -moz-box-align: center; } -.checkbox-icon[src] { +.checkbox-icon { margin-inline-end: 2px; } @@ -40,19 +33,18 @@ checkbox { /* ..... focused state ..... */ -checkbox:-moz-focusring > .checkbox-label-center-box > .checkbox-label-box { +checkbox:-moz-focusring > .checkbox-label-box { border: 1px dotted #9999CC; } /* ..... disabled state ..... */ -checkbox[disabled="true"] > .checkbox-check, -checkbox[disabled="true"] > .checkbox-spacer-box > .checkbox-check { +checkbox[disabled="true"] > .checkbox-check { background-color: #CCD0DD; } -checkbox[disabled="true"] { - color: #999999 !important; +checkbox[disabled="true"] > .checkbox-label-box { + color: #999999; } /* ::::: checkmark image ::::: */ @@ -64,25 +56,19 @@ checkbox[disabled="true"] { min-width: 12px; min-height: 12px; background: transparent 50% 50% no-repeat; + margin-inline-end: 3px; } -checkbox > .checkbox-check { - margin-inline-end: 4px; -} - -checkbox:hover:active > .checkbox-check, -checkbox:hover:active > .checkbox-spacer-box > .checkbox-check { +checkbox:hover:active > .checkbox-check { background-color: #CCD0DD; } /* ..... checked state ..... */ -checkbox[checked="true"] > .checkbox-check, -checkbox[checked="true"] > .checkbox-spacer-box > .checkbox-check { +checkbox[checked="true"] > .checkbox-check { background-image: url("chrome://global/skin/checkbox/cbox-check.gif"); } -checkbox[checked="true"][disabled="true"] > .checkbox-check, -checkbox[checked="true"][disabled="true"] > .checkbox-spacer-box > .checkbox-check { +checkbox[checked="true"][disabled="true"] > .checkbox-check { background-image: url("chrome://global/skin/checkbox/cbox-check-disabled.gif") !important } diff --git a/EarlyBlue/global/global.css b/EarlyBlue/global/global.css index 7e71c174..d69d9e93 100644 --- a/EarlyBlue/global/global.css +++ b/EarlyBlue/global/global.css @@ -13,12 +13,8 @@ /* ::::: XBL bindings ::::: */ -checkbox { - -moz-binding: url("chrome://global/content/bindings/checkbox.xml#checkbox-with-spacing"); -} - radio { - -moz-binding: url("chrome://global/skin/globalBindings.xml#radio-with-spacing"); + -moz-binding: url("chrome://global/skin/globalBindings.xml#radio"); } menulist > menupopup { diff --git a/EarlyBlue/global/globalBindings.xml b/EarlyBlue/global/globalBindings.xml index daaa92f0..fc53dc19 100644 --- a/EarlyBlue/global/globalBindings.xml +++ b/EarlyBlue/global/globalBindings.xml @@ -20,26 +20,6 @@ - - - - - - - - - - - - - - - - - - - @@ -49,4 +29,4 @@ - \ No newline at end of file + diff --git a/EarlyBlue/global/radio.css b/EarlyBlue/global/radio.css index dfab765a..4c956b49 100644 --- a/EarlyBlue/global/radio.css +++ b/EarlyBlue/global/radio.css @@ -11,44 +11,40 @@ /* ::::: radio ::::: */ radio { - margin: 1px 2px; - border-left: 1px transparent; - border-right: 1px transparent; -} - -.radio-spacer-box { - -moz-box-align: center; - border-right: 4px solid transparent; - border-top: 1px; - border-bottom: 1px; -} - -.radio-label-center-box { -moz-box-align: center; + margin: 1px 2px; + padding-top: 0; + padding-bottom: 0; + padding-inline-start: 2px; + padding-inline-end: 0; } .radio-label-box { + margin-inline-start: 2px; border: 1px solid transparent; - -moz-box-align: center; + padding-top: 0px; + padding-bottom: 0; + padding-inline-start: 1px; + padding-inline-end: 0px; } -.radio-icon[src] { +.radio-icon { margin-inline-end: 2px; } .radio-label { - margin: 0px !important; + margin: 0 !important; } /* ..... focused state ..... */ -radio[focused="true"] > .radio-label-center-box > .radio-label-box { +radio[focused="true"] > .radio-label-box { border: 1px dotted #9999CC; } /* ..... disabled state ..... */ -radio[disabled="true"] > .radio-spacer-box > .radio-check-box1 { +radio[disabled="true"] > .radio-check-box1 { background-color: #CCD0DD; } @@ -59,6 +55,7 @@ radio[disabled="true"] { /* ::::: checkmark image ::::: */ .radio-check-box1 { + margin: 0 0; border: 2px outset #CCD0DD; border-radius: 50%; width: 12px; @@ -75,20 +72,20 @@ radio[disabled="true"] { list-style-image: none; } -radio:hover:active > .radio-spacer-box > .radio-check-box1 { +radio:hover:active > .radio-check-box1 { border: 2px inset #CCD0DD; } -radio[disabled="true"]:hover:active > .radio-spacer-box > .radio-check-box1 { +radio[disabled="true"]:hover:active > .radio-check-box1 { border: 2px outset #CCD0DD; } /* ..... selected state ..... */ -radio[selected="true"] > .radio-spacer-box > .radio-check-box1 > .radio-check-box2 { +radio[selected="true"] > .radio-check-box1 > .radio-check-box2 { list-style-image: url("chrome://global/skin/radio/radio-check.gif"); } -radio[selected="true"][disabled="true"] > .radio-spacer-box > .radio-check-box1 > .radio-check-box2 { +radio[selected="true"][disabled="true"] > .radio-check-box1 > .radio-check-box2 { list-style-image: url("chrome://global/skin/radio/radio-check-disabled.gif") !important } diff --git a/LCARStrek/global/checkbox.css b/LCARStrek/global/checkbox.css index c750a880..289fa5d4 100644 --- a/LCARStrek/global/checkbox.css +++ b/LCARStrek/global/checkbox.css @@ -11,27 +11,20 @@ /* ::::: checkbox ::::: */ checkbox { - margin: 1px 2px; - border-left: 1px transparent; - border-right: 1px transparent; -} - -.checkbox-spacer-box { - -moz-box-align: center; - border-right: 4px solid transparent; -} - -.checkbox-label-center-box { -moz-box-align: center; + margin: 1px 2px; + padding-top: 0; + padding-bottom: 0; + padding-inline-start: 2px; + padding-inline-end: 0; } .checkbox-label-box { border: 1px solid transparent; color: #FF9F00; - -moz-box-align: center; } -.checkbox-icon[src] { +.checkbox-icon { margin-inline-end: 2px; } @@ -41,19 +34,18 @@ checkbox { /* ..... focused state ..... */ -checkbox:-moz-focusring > .checkbox-label-center-box > .checkbox-label-box { +checkbox:-moz-focusring > .checkbox-label-box { border: 1px dotted #008484; } /* ..... disabled state ..... */ -checkbox[disabled="true"] > .checkbox-check, -checkbox[disabled="true"] > .checkbox-spacer-box > .checkbox-check { +checkbox[disabled="true"] > .checkbox-check { border: 1px solid #8050B0; background-color: #000000; } -checkbox[disabled="true"] > .checkbox-label-center-box > .checkbox-label-box { +checkbox[disabled="true"] > .checkbox-label-box { color: #8050B0; } @@ -66,43 +58,32 @@ checkbox[disabled="true"] > .checkbox-label-center-box > .checkbox-label-box { height: 1em; min-width: 12px; min-height: 12px; - background: transparent 50% 50% no-repeat; -} - -checkbox > .checkbox-check { - margin-inline-end: 4px; + background: #000000 no-repeat 50% 50%; + margin-inline-end: 3px; } checkbox:not([disabled="true"]):hover > .checkbox-check, -checkbox:not([disabled="true"]):hover:active > .checkbox-check, -checkbox:not([disabled="true"]):hover > .checkbox-spacer-box > .checkbox-check, -checkbox:not([disabled="true"]):hover:active > .checkbox-spacer-box > .checkbox-check { +checkbox:not([disabled="true"]):hover:active > .checkbox-check { border: 1px solid #FFCF00; } checkbox:not([disabled="true"]):hover > .checkbox-label-box, -checkbox:not([disabled="true"]):hover:active > .checkbox-label-box, -checkbox:not([disabled="true"]):hover > .checkbox-label-center-box > .checkbox-label-box, -checkbox:not([disabled="true"]):hover:active > .checkbox-label-center-box > .checkbox-label-box { +checkbox:not([disabled="true"]):hover:active > .checkbox-label-box { color: #FFCF00; } /* ..... checked state ..... */ -checkbox[checked="true"] > .checkbox-check, -checkbox[checked="true"] > .checkbox-spacer-box > .checkbox-check { +checkbox[checked="true"] > .checkbox-check { background-image: url("chrome://global/skin/checkbox/cbox-check.gif"); } checkbox[checked="true"]:hover > .checkbox-check, -checkbox[checked="true"]:hover:active > .checkbox-check, -checkbox[checked="true"]:hover > .checkbox-spacer-box > .checkbox-check, -checkbox[checked="true"]:hover:active > .checkbox-spacer-box > .checkbox-check { +checkbox[checked="true"]:hover:active > .checkbox-check { background-image: url("chrome://global/skin/checkbox/cbox-check-hover.gif"); } -checkbox[checked="true"][disabled="true"] .checkbox-check, -checkbox[checked="true"][disabled="true"] > .checkbox-spacer-box > .checkbox-check { +checkbox[checked="true"][disabled="true"] .checkbox-check { background-image: url("chrome://global/skin/checkbox/cbox-check-disabled.gif") !important; } @@ -123,26 +104,20 @@ caption > checkbox:hover:active { background-color: #FF9F00; } -caption > checkbox:not([disabled="true"]) > .checkbox-label-center-box > .checkbox-label-box, -caption > checkbox:not([disabled="true"]):hover > .checkbox-label-center-box > .checkbox-label-box, -caption > checkbox:not([disabled="true"]):hover:active > .checkbox-label-center-box > .checkbox-label-box { +caption > checkbox:not([disabled="true"]) > .checkbox-label-box, +caption > checkbox:not([disabled="true"]):hover > .checkbox-label-box, +caption > checkbox:not([disabled="true"]):hover:active > .checkbox-label-box { color: inherit; } caption > checkbox:not([disabled="true"]) > .checkbox-check, caption > checkbox:not([disabled="true"]):hover > .checkbox-check, -caption > checkbox:not([disabled="true"]):hover:active > .checkbox-check, -caption > checkbox:not([disabled="true"]) > .checkbox-spacer-box > .checkbox-check, -caption > checkbox:not([disabled="true"]):hover > .checkbox-spacer-box > .checkbox-check, -caption > checkbox:not([disabled="true"]):hover:active > .checkbox-spacer-box > .checkbox-check { +caption > checkbox:not([disabled="true"]):hover:active > .checkbox-check { border-color: #000000; } caption > checkbox[checked="true"] > .checkbox-check, caption > checkbox[checked="true"]:hover > .checkbox-check, -caption > checkbox[checked="true"]:hover:active > .checkbox-check, -caption > checkbox[checked="true"] > .checkbox-spacer-box > .checkbox-check, -caption > checkbox[checked="true"]:hover > .checkbox-spacer-box > .checkbox-check, -caption > checkbox[checked="true"]:hover:active > .checkbox-spacer-box > .checkbox-check { +caption > checkbox[checked="true"]:hover:active > .checkbox-check { background-image: url("chrome://global/skin/checkbox/cbox-check-inverted.gif"); } diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css index 6a661111..5d9ee7ea 100644 --- a/LCARStrek/global/global.css +++ b/LCARStrek/global/global.css @@ -13,12 +13,8 @@ /* ::::: XBL bindings ::::: */ -checkbox { - -moz-binding: url("chrome://global/content/bindings/checkbox.xml#checkbox-with-spacing"); -} - radio { - -moz-binding: url("chrome://global/skin/globalBindings.xml#radio-with-spacing"); + -moz-binding: url("chrome://global/skin/globalBindings.xml#radio"); } menulist > menupopup { diff --git a/LCARStrek/global/globalBindings.xml b/LCARStrek/global/globalBindings.xml index 15cfb5a8..ca5703b5 100755 --- a/LCARStrek/global/globalBindings.xml +++ b/LCARStrek/global/globalBindings.xml @@ -20,26 +20,6 @@ - - - - - - - - - - - - - - - - - - - @@ -218,4 +198,4 @@ - \ No newline at end of file + diff --git a/LCARStrek/global/radio.css b/LCARStrek/global/radio.css index 9bbd1cd5..e46d2223 100644 --- a/LCARStrek/global/radio.css +++ b/LCARStrek/global/radio.css @@ -11,44 +11,40 @@ /* ::::: radio ::::: */ radio { - margin: 1px 2px; - border-left: 1px transparent; - border-right: 1px transparent; -} - -.radio-spacer-box { - -moz-box-align: center; - border-right: 4px solid transparent; - border-top: 1px; - border-bottom: 1px; -} - -.radio-label-center-box { -moz-box-align: center; + margin: 1px 2px; + padding-top: 0; + padding-bottom: 0; + padding-inline-start: 2px; + padding-inline-end: 0; } .radio-label-box { + margin-inline-start: 2px; border: 1px solid transparent; - -moz-box-align: center; + padding-top: 0px; + padding-bottom: 0; + padding-inline-start: 1px; + padding-inline-end: 0px; } -.radio-icon[src] { +.radio-icon { margin-inline-end: 2px; } .radio-label { - margin: 0px !important; + margin: 0 !important; } /* ..... focused state ..... */ -radio[focused="true"] > .radio-label-center-box > .radio-label-box { +radio[focused="true"] > .radio-label-box { border: 1px dotted #008484; } /* ..... disabled state ..... */ -radio[disabled="true"] > .radio-spacer-box > .radio-check-box1 { +radio[disabled="true"] > .radio-check-box1 { background-color: #000000; border: 1px solid #8050B0; } @@ -60,14 +56,12 @@ radio[disabled="true"] { /* ::::: checkmark image ::::: */ .radio-check-box1 { -/* -moz-box-align: center; - -moz-box-pack: center; */ + margin: 0 0; border: 1px solid #FF9F00; border-radius: 50%; width: 10px; height: 10px; background-color: #000000; - /* background-color: transparent; */ } .radio-check-box2 { @@ -78,27 +72,27 @@ radio[disabled="true"] { list-style-image: none; } -radio:not([disabled="true"]):hover > .radio-spacer-box > .radio-check-box1, -radio:not([disabled="true"]):hover:active > .radio-spacer-box > .radio-check-box1 { +radio:not([disabled="true"]):hover > .radio-check-box1, +radio:not([disabled="true"]):hover:active > .radio-check-box1 { border: 1px solid #FFCF00; } -radio:not([disabled="true"]):hover > .radio-label-center-box > .radio-label-box, -radio:not([disabled="true"]):hover:active > .radio-label-center-box > .radio-label-box { +radio:not([disabled="true"]):hover > .radio-label-box, +radio:not([disabled="true"]):hover:active > .radio-label-box { color: #FFCF00; } /* ..... selected state ..... */ -radio[selected="true"] > .radio-spacer-box > .radio-check-box1 > .radio-check-box2 { +radio[selected="true"] > .radio-check-box1 > .radio-check-box2 { list-style-image: url("chrome://global/skin/radio/radio-check.gif"); } -radio[selected="true"]:hover > .radio-spacer-box > .radio-check-box1 > .radio-check-box2, -radio[selected="true"]:hover:active > .radio-spacer-box > .radio-check-box1 > .radio-check-box2{ +radio[selected="true"]:hover > .radio-check-box1 > .radio-check-box2, +radio[selected="true"]:hover:active > .radio-check-box1 > .radio-check-box2{ list-style-image: url("chrome://global/skin/radio/radio-check-hover.gif"); } -radio[selected="true"][disabled="true"] > .radio-spacer-box > .radio-check-box1 > .radio-check-box2 { +radio[selected="true"][disabled="true"] > .radio-check-box1 > .radio-check-box2 { list-style-image: url("chrome://global/skin/radio/radio-check-disabled.gif") !important } -- 2.43.0