From 024ec65527b790008bbffb70f38ebf462729bef3 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 16 May 2010 20:58:02 +0200 Subject: [PATCH] sync both themes with toolkit wipstripe changes up to just before the new addons manager landing (about May 10) --- EarlyBlue/global/browser.css | 2 +- EarlyBlue/global/button.css | 5 +- EarlyBlue/global/checkbox.css | 2 +- EarlyBlue/global/global.css | 2 +- EarlyBlue/global/listbox.css | 4 +- EarlyBlue/global/menulist.css | 11 ++-- EarlyBlue/global/richlistbox.css | 4 +- EarlyBlue/global/splitter.css | 52 ++++++++++++++---- .../{grip-horiz-after.gif => grip-bottom.gif} | Bin .../{grip-vert-before.gif => grip-left.gif} | Bin .../{grip-vert-after.gif => grip-right.gif} | Bin .../{grip-horiz-before.gif => grip-top.gif} | Bin EarlyBlue/global/tabbox.css | 2 +- EarlyBlue/global/toolbarbutton.css | 2 +- EarlyBlue/global/tree.css | 2 +- LCARStrek/global/browser.css | 2 +- LCARStrek/global/button.css | 5 +- LCARStrek/global/checkbox.css | 2 +- LCARStrek/global/global.css | 2 +- LCARStrek/global/listbox.css | 4 +- LCARStrek/global/media/videocontrols.css | 4 +- LCARStrek/global/menulist.css | 7 ++- LCARStrek/global/richlistbox.css | 4 +- LCARStrek/global/splitter.css | 52 ++++++++++++++---- .../{grip-horiz-after.gif => grip-bottom.gif} | Bin .../{grip-vert-before.gif => grip-left.gif} | Bin .../{grip-vert-after.gif => grip-right.gif} | Bin .../{grip-horiz-before.gif => grip-top.gif} | Bin LCARStrek/global/tabbox.css | 2 +- LCARStrek/global/toolbarbutton.css | 2 +- LCARStrek/global/tree.css | 2 +- 31 files changed, 115 insertions(+), 61 deletions(-) rename EarlyBlue/global/splitter/{grip-horiz-after.gif => grip-bottom.gif} (100%) rename EarlyBlue/global/splitter/{grip-vert-before.gif => grip-left.gif} (100%) rename EarlyBlue/global/splitter/{grip-vert-after.gif => grip-right.gif} (100%) rename EarlyBlue/global/splitter/{grip-horiz-before.gif => grip-top.gif} (100%) rename LCARStrek/global/splitter/{grip-horiz-after.gif => grip-bottom.gif} (100%) rename LCARStrek/global/splitter/{grip-vert-before.gif => grip-left.gif} (100%) rename LCARStrek/global/splitter/{grip-vert-after.gif => grip-right.gif} (100%) rename LCARStrek/global/splitter/{grip-horiz-before.gif => grip-top.gif} (100%) diff --git a/EarlyBlue/global/browser.css b/EarlyBlue/global/browser.css index 82a93781..bdd4f264 100644 --- a/EarlyBlue/global/browser.css +++ b/EarlyBlue/global/browser.css @@ -105,7 +105,7 @@ tabpanels { border: 1px dotted transparent; } -.tabbrowser-tab:focus > .tab-image-middle > .tab-text { +.tabbrowser-tab:-moz-focusring > .tab-image-middle > .tab-text { border: 1px dotted #666699; } diff --git a/EarlyBlue/global/button.css b/EarlyBlue/global/button.css index 6072ec3f..39406450 100644 --- a/EarlyBlue/global/button.css +++ b/EarlyBlue/global/button.css @@ -71,10 +71,7 @@ button { /* .......... focused state .......... */ -button:focus { -} - -button:focus > .button-box { +button:-moz-focusring > .button-box { border: 1px dotted #9999CC; } diff --git a/EarlyBlue/global/checkbox.css b/EarlyBlue/global/checkbox.css index f1244e1c..7ca3b2d7 100644 --- a/EarlyBlue/global/checkbox.css +++ b/EarlyBlue/global/checkbox.css @@ -73,7 +73,7 @@ checkbox { /* ..... focused state ..... */ -checkbox:focus > .checkbox-label-center-box > .checkbox-label-box { +checkbox:-moz-focusring > .checkbox-label-center-box > .checkbox-label-box { border: 1px dotted #9999CC; } diff --git a/EarlyBlue/global/global.css b/EarlyBlue/global/global.css index 0a72446a..6976cc5e 100644 --- a/EarlyBlue/global/global.css +++ b/EarlyBlue/global/global.css @@ -299,7 +299,7 @@ description { cursor: pointer; } -.text-link:focus { +.text-link:-moz-focusring { /* Don't specify the outline-color, we should always use initial value. */ outline: 1px dotted; } diff --git a/EarlyBlue/global/listbox.css b/EarlyBlue/global/listbox.css index cbbe4856..898ec362 100644 --- a/EarlyBlue/global/listbox.css +++ b/EarlyBlue/global/listbox.css @@ -49,11 +49,11 @@ listitem { border: 1px solid transparent; } -listbox:focus > listitem[current="true"] { +listbox:-moz-focusring > listitem[current="true"] { border: 1px dotted #9999CC; } -listbox:focus > listitem[current="true"][selected="true"] { +listbox:-moz-focusring > listitem[current="true"][selected="true"] { border: 1px dotted #666699; } diff --git a/EarlyBlue/global/menulist.css b/EarlyBlue/global/menulist.css index ebb8641e..8746165b 100644 --- a/EarlyBlue/global/menulist.css +++ b/EarlyBlue/global/menulist.css @@ -69,12 +69,15 @@ menulist { -moz-margin-start: 1ex !important; } -menulist:focus > .menulist-label-box { -/* border: 1px dotted #999999; */ +menulist:focus:not(.menulist-compact) > .menulist-label-box { background-color: #336699; color: #000000; } +menulist:-moz-focusring:not([open="true"]):not(.menulist-compact) > .menulist-label-box { +/* border: 1px dotted #808080; */ +} + menulist[disabled="true"] { background-color: #CCCCCC; color: #999999; @@ -150,8 +153,6 @@ html|*.menulist-editable-input { list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif"); } -.menulist-compact:focus > .menulist-label-box { +.menulist-compact:-moz-focusring:not([open="true"]) > .menulist-label-box { border: 1px dotted #999999; - background-color: transparent; - color: inherit; } \ No newline at end of file diff --git a/EarlyBlue/global/richlistbox.css b/EarlyBlue/global/richlistbox.css index 80188a1c..b8016115 100644 --- a/EarlyBlue/global/richlistbox.css +++ b/EarlyBlue/global/richlistbox.css @@ -60,12 +60,12 @@ richlistbox:focus > richlistitem[selected="true"] { color: #FFFFFF; } -richlistbox[seltype="multiple"]:focus > richlistitem[current="true"] { +richlistbox[seltype="multiple"]:-moz-focusring > richlistitem[current="true"] { outline: 1px dotted #666699; outline-offset: -1px; } -richlistbox[seltype="multiple"]:focus > richlistitem[current="true"][selected="true"] { +richlistbox[seltype="multiple"]:-moz-focusring > richlistitem[current="true"][selected="true"] { outline: 1px dotted #666699; } diff --git a/EarlyBlue/global/splitter.css b/EarlyBlue/global/splitter.css index eafe243a..932fb426 100644 --- a/EarlyBlue/global/splitter.css +++ b/EarlyBlue/global/splitter.css @@ -59,6 +59,20 @@ splitter:hover:active { background-color: #999999; } +splitter[state="collapsed"][collapse="before"], +splitter[state="collapsed"][substate="before"], +splitter[state="collapsed"][collapse="after"]:-moz-locale-dir(rtl), +splitter[state="collapsed"][substate="after"]:-moz-locale-dir(rtl) { + cursor: e-resize; +} + +splitter[state="collapsed"][collapse="after"], +splitter[state="collapsed"][substate="after"], +splitter[state="collapsed"][collapse="before"]:-moz-locale-dir(rtl), +splitter[state="collapsed"][substate="before"]:-moz-locale-dir(rtl) { + cursor: w-resize; +} + splitter:-moz-lwtheme { background: none; } @@ -73,6 +87,16 @@ splitter[orient="vertical"] { min-height: 8px; } +splitter[orient="vertical"][state="collapsed"][collapse="before"], +splitter[orient="vertical"][state="collapsed"][substate="before"] { + cursor: s-resize; +} + +splitter[orient="vertical"][state="collapsed"][collapse="after"], +splitter[orient="vertical"][state="collapsed"][substate="after"] { + cursor: n-resize; +} + /* ::::: splitter grippy ::::: */ grippy { @@ -100,39 +124,43 @@ splitter[orient="vertical"] > grippy { /* ..... normal state ..... */ /* vertical grippies */ -splitter[collapse="before"] > grippy { - background-image: url("chrome://global/skin/splitter/grip-vert-before.gif"); +splitter[collapse="before"] > grippy, +splitter[collapse="after"] > grippy:-moz-locale-dir(rtl) { + background-image: url("chrome://global/skin/splitter/grip-left.gif"); } -splitter[collapse="after"] > grippy { - background-image: url("chrome://global/skin/splitter/grip-vert-after.gif"); +splitter[collapse="after"] > grippy, +splitter[collapse="before"] > grippy:-moz-locale-dir(rtl) { + background-image: url("chrome://global/skin/splitter/grip-right.gif"); } /* horizontal grippies */ splitter[collapse="before"][orient="vertical"] > grippy { - background-image: url("chrome://global/skin/splitter/grip-horiz-before.gif"); + background-image: url("chrome://global/skin/splitter/grip-top.gif"); } splitter[collapse="after"][orient="vertical"] > grippy { - background-image: url("chrome://global/skin/splitter/grip-horiz-after.gif"); + background-image: url("chrome://global/skin/splitter/grip-bottom.gif"); } /* ..... collapsed state ..... */ /* vertical grippies */ -splitter[collapse="before"][state="collapsed"] > grippy { - background-image: url("chrome://global/skin/splitter/grip-vert-after.gif"); +splitter[collapse="before"][state="collapsed"] > grippy, +splitter[collapse="after"][state="collapsed"] > grippy:-moz-locale-dir(rtl) { + background-image: url("chrome://global/skin/splitter/grip-right.gif"); } -splitter[collapse="after"][state="collapsed"] > grippy { - background-image: url("chrome://global/skin/splitter/grip-vert-before.gif"); +splitter[collapse="after"][state="collapsed"] > grippy, +splitter[collapse="before"][state="collapsed"] > grippy:-moz-locale-dir(rtl) { + background-image: url("chrome://global/skin/splitter/grip-left.gif"); } /* horizontal grippies */ splitter[collapse="before"][state="collapsed"][orient="vertical"] > grippy { - background-image: url("chrome://global/skin/splitter/grip-horiz-after.gif"); + background-image: url("chrome://global/skin/splitter/grip-bottom.gif"); } splitter[collapse="after"][state="collapsed"][orient="vertical"] > grippy { - background-image: url("chrome://global/skin/splitter/grip-horiz-before.gif"); + background-image: url("chrome://global/skin/splitter/grip-top.gif"); } diff --git a/EarlyBlue/global/splitter/grip-horiz-after.gif b/EarlyBlue/global/splitter/grip-bottom.gif similarity index 100% rename from EarlyBlue/global/splitter/grip-horiz-after.gif rename to EarlyBlue/global/splitter/grip-bottom.gif diff --git a/EarlyBlue/global/splitter/grip-vert-before.gif b/EarlyBlue/global/splitter/grip-left.gif similarity index 100% rename from EarlyBlue/global/splitter/grip-vert-before.gif rename to EarlyBlue/global/splitter/grip-left.gif diff --git a/EarlyBlue/global/splitter/grip-vert-after.gif b/EarlyBlue/global/splitter/grip-right.gif similarity index 100% rename from EarlyBlue/global/splitter/grip-vert-after.gif rename to EarlyBlue/global/splitter/grip-right.gif diff --git a/EarlyBlue/global/splitter/grip-horiz-before.gif b/EarlyBlue/global/splitter/grip-top.gif similarity index 100% rename from EarlyBlue/global/splitter/grip-horiz-before.gif rename to EarlyBlue/global/splitter/grip-top.gif diff --git a/EarlyBlue/global/tabbox.css b/EarlyBlue/global/tabbox.css index 264b375c..8017a7d8 100644 --- a/EarlyBlue/global/tabbox.css +++ b/EarlyBlue/global/tabbox.css @@ -86,7 +86,7 @@ tab:hover { color: #336699; } -tab:focus > .tab-middle { +tab:-moz-focusring > .tab-middle { /* Don't specify the outline-color, we should always use initial value. */ outline: 1px dotted; } diff --git a/EarlyBlue/global/toolbarbutton.css b/EarlyBlue/global/toolbarbutton.css index 52926c70..092efad3 100644 --- a/EarlyBlue/global/toolbarbutton.css +++ b/EarlyBlue/global/toolbarbutton.css @@ -70,7 +70,7 @@ toolbarbutton.tabbable { -moz-user-focus: normal !important; } -toolbarbutton:focus { +toolbarbutton:-moz-focusring { outline: 1px dotted #666699; outline-offset: -1px; } diff --git a/EarlyBlue/global/tree.css b/EarlyBlue/global/tree.css index 4e4c8a21..3a96fe18 100644 --- a/EarlyBlue/global/tree.css +++ b/EarlyBlue/global/tree.css @@ -58,7 +58,7 @@ tree { border: 1px solid transparent; } -.focusring:focus > .tree-stack > .tree-rows > .tree-bodybox { +.focusring:-moz-focusring > .tree-stack > .tree-rows > .tree-bodybox { border: 1px solid #000000; } diff --git a/LCARStrek/global/browser.css b/LCARStrek/global/browser.css index e59022d1..fdce55f8 100644 --- a/LCARStrek/global/browser.css +++ b/LCARStrek/global/browser.css @@ -105,7 +105,7 @@ tabpanels { border: 1px dotted transparent; } -.tabbrowser-tab:focus > .tab-image-middle > .tab-text { +.tabbrowser-tab:-moz-focusring > .tab-image-middle > .tab-text { border: 1px dotted #008484; } diff --git a/LCARStrek/global/button.css b/LCARStrek/global/button.css index e3311b8f..66b2007a 100644 --- a/LCARStrek/global/button.css +++ b/LCARStrek/global/button.css @@ -74,10 +74,7 @@ button { /* .......... focused state .......... */ -button:focus { -} - -button:focus > .button-box { +button:-moz-focusring > .button-box { border: 1px dotted #008484; } diff --git a/LCARStrek/global/checkbox.css b/LCARStrek/global/checkbox.css index 7e79e66f..d3f47bea 100644 --- a/LCARStrek/global/checkbox.css +++ b/LCARStrek/global/checkbox.css @@ -74,7 +74,7 @@ checkbox { /* ..... focused state ..... */ -checkbox:focus > .checkbox-label-center-box > .checkbox-label-box { +checkbox:-moz-focusring > .checkbox-label-center-box > .checkbox-label-box { border: 1px dotted #008484; } diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css index 472a7a0b..93c6c83f 100644 --- a/LCARStrek/global/global.css +++ b/LCARStrek/global/global.css @@ -344,7 +344,7 @@ description { cursor: pointer; } -.text-link:focus { +.text-link:-moz-focusring { /* Don't specify the outline-color, we should always use initial value. */ outline: 1px dotted; } diff --git a/LCARStrek/global/listbox.css b/LCARStrek/global/listbox.css index 03340314..b2bd910d 100644 --- a/LCARStrek/global/listbox.css +++ b/LCARStrek/global/listbox.css @@ -51,11 +51,11 @@ listitem { border: 1px solid transparent; } -listbox:focus > listitem[current="true"] { +listbox:-moz-focusring > listitem[current="true"] { border: 1px dotted #FF9F00; } -listbox:focus > listitem[current="true"][selected="true"] { +listbox:-moz-focusring > listitem[current="true"][selected="true"] { border: 1px dotted #FF9F00; } diff --git a/LCARStrek/global/media/videocontrols.css b/LCARStrek/global/media/videocontrols.css index 9bd50071..1574d0be 100644 --- a/LCARStrek/global/media/videocontrols.css +++ b/LCARStrek/global/media/videocontrols.css @@ -26,8 +26,8 @@ .playButton:hover, .muteButton:hover { background-color: rgba(255,207,0,0.75); } -.playButton:focus > .button-box, -.muteButton:focus > .button-box { +.playButton:-moz-focusring > .button-box, +.muteButton:-moz-focusring > .button-box { border: 1px dotted rgba(0,0,0,0.75); } diff --git a/LCARStrek/global/menulist.css b/LCARStrek/global/menulist.css index ca127487..54b29a39 100644 --- a/LCARStrek/global/menulist.css +++ b/LCARStrek/global/menulist.css @@ -83,12 +83,15 @@ menulist[open="true"] { -moz-margin-start: 1ex !important; } -menulist:focus > .menulist-label-box { -/* border: 1px dotted #008484; */ +menulist:focus:not(.menulist-compact) > .menulist-label-box { background-color: #008484; color: #FFCF00; } +menulist:-moz-focusring:not([open="true"]):not(.menulist-compact) > .menulist-label-box { +/* border: 1px dotted #FFCF00; */ +} + menulist[disabled="true"] { background-color: #000000; color: #8050B0; diff --git a/LCARStrek/global/richlistbox.css b/LCARStrek/global/richlistbox.css index c181500c..d83468c6 100644 --- a/LCARStrek/global/richlistbox.css +++ b/LCARStrek/global/richlistbox.css @@ -62,12 +62,12 @@ richlistbox:focus > richlistitem[selected="true"] { color: #FFCF00; } -richlistbox[seltype="multiple"]:focus > richlistitem[current="true"] { +richlistbox[seltype="multiple"]:-moz-focusring > richlistitem[current="true"] { outline: 1px dotted #FF9F00; -moz-outline-offset: -1px; } -richlistbox[seltype="multiple"]:focus > richlistitem[current="true"][selected="true"] { +richlistbox[seltype="multiple"]:-moz-focusring > richlistitem[current="true"][selected="true"] { outline: 1px dotted #FF9F00; } diff --git a/LCARStrek/global/splitter.css b/LCARStrek/global/splitter.css index f1c025c3..4f43f8a6 100644 --- a/LCARStrek/global/splitter.css +++ b/LCARStrek/global/splitter.css @@ -65,6 +65,20 @@ splitter.tree-splitter { margin: 0px; } +splitter[state="collapsed"][collapse="before"], +splitter[state="collapsed"][substate="before"], +splitter[state="collapsed"][collapse="after"]:-moz-locale-dir(rtl), +splitter[state="collapsed"][substate="after"]:-moz-locale-dir(rtl) { + cursor: e-resize; +} + +splitter[state="collapsed"][collapse="after"], +splitter[state="collapsed"][substate="after"], +splitter[state="collapsed"][collapse="before"]:-moz-locale-dir(rtl), +splitter[state="collapsed"][substate="before"]:-moz-locale-dir(rtl) { + cursor: w-resize; +} + splitter:-moz-lwtheme { background: none; } @@ -80,6 +94,16 @@ splitter[orient="vertical"] { margin: 3px 0px; } +splitter[orient="vertical"][state="collapsed"][collapse="before"], +splitter[orient="vertical"][state="collapsed"][substate="before"] { + cursor: s-resize; +} + +splitter[orient="vertical"][state="collapsed"][collapse="after"], +splitter[orient="vertical"][state="collapsed"][substate="after"] { + cursor: n-resize; +} + /* ::::: splitter grippy ::::: */ grippy { @@ -111,39 +135,43 @@ splitter[orient="vertical"] > grippy { /* ..... normal state ..... */ /* vertical grippies */ -splitter[collapse="before"] > grippy { - background-image: url("chrome://global/skin/splitter/grip-vert-before.gif"); +splitter[collapse="before"] > grippy, +splitter[collapse="after"] > grippy:-moz-locale-dir(rtl) { + background-image: url("chrome://global/skin/splitter/grip-left.gif"); } -splitter[collapse="after"] > grippy { - background-image: url("chrome://global/skin/splitter/grip-vert-after.gif"); +splitter[collapse="after"] > grippy, +splitter[collapse="before"] > grippy:-moz-locale-dir(rtl) { + background-image: url("chrome://global/skin/splitter/grip-right.gif"); } /* horizontal grippies */ splitter[collapse="before"][orient="vertical"] > grippy { - background-image: url("chrome://global/skin/splitter/grip-horiz-before.gif"); + background-image: url("chrome://global/skin/splitter/grip-top.gif"); } splitter[collapse="after"][orient="vertical"] > grippy { - background-image: url("chrome://global/skin/splitter/grip-horiz-after.gif"); + background-image: url("chrome://global/skin/splitter/grip-bottom.gif"); } /* ..... collapsed state ..... */ /* vertical grippies */ -splitter[collapse="before"][state="collapsed"] > grippy { - background-image: url("chrome://global/skin/splitter/grip-vert-after.gif"); +splitter[collapse="before"][state="collapsed"] > grippy, +splitter[collapse="after"][state="collapsed"] > grippy:-moz-locale-dir(rtl) { + background-image: url("chrome://global/skin/splitter/grip-right.gif"); } -splitter[collapse="after"][state="collapsed"] > grippy { - background-image: url("chrome://global/skin/splitter/grip-vert-before.gif"); +splitter[collapse="after"][state="collapsed"] > grippy, +splitter[collapse="before"][state="collapsed"] > grippy:-moz-locale-dir(rtl) { + background-image: url("chrome://global/skin/splitter/grip-left.gif"); } /* horizontal grippies */ splitter[collapse="before"][state="collapsed"][orient="vertical"] > grippy { - background-image: url("chrome://global/skin/splitter/grip-horiz-after.gif"); + background-image: url("chrome://global/skin/splitter/grip-bottom.gif"); } splitter[collapse="after"][state="collapsed"][orient="vertical"] > grippy { - background-image: url("chrome://global/skin/splitter/grip-horiz-before.gif"); + background-image: url("chrome://global/skin/splitter/grip-top.gif"); } diff --git a/LCARStrek/global/splitter/grip-horiz-after.gif b/LCARStrek/global/splitter/grip-bottom.gif similarity index 100% rename from LCARStrek/global/splitter/grip-horiz-after.gif rename to LCARStrek/global/splitter/grip-bottom.gif diff --git a/LCARStrek/global/splitter/grip-vert-before.gif b/LCARStrek/global/splitter/grip-left.gif similarity index 100% rename from LCARStrek/global/splitter/grip-vert-before.gif rename to LCARStrek/global/splitter/grip-left.gif diff --git a/LCARStrek/global/splitter/grip-vert-after.gif b/LCARStrek/global/splitter/grip-right.gif similarity index 100% rename from LCARStrek/global/splitter/grip-vert-after.gif rename to LCARStrek/global/splitter/grip-right.gif diff --git a/LCARStrek/global/splitter/grip-horiz-before.gif b/LCARStrek/global/splitter/grip-top.gif similarity index 100% rename from LCARStrek/global/splitter/grip-horiz-before.gif rename to LCARStrek/global/splitter/grip-top.gif diff --git a/LCARStrek/global/tabbox.css b/LCARStrek/global/tabbox.css index d6a92f34..28e1ee16 100644 --- a/LCARStrek/global/tabbox.css +++ b/LCARStrek/global/tabbox.css @@ -94,7 +94,7 @@ tab:hover:active { color: #000000; } -tab:focus > .tab-middle { +tab:-moz-focusring > .tab-middle { /* Don't specify the outline-color, we should always use initial value. */ outline: 1px dotted; } diff --git a/LCARStrek/global/toolbarbutton.css b/LCARStrek/global/toolbarbutton.css index 188cb26b..b8b888af 100644 --- a/LCARStrek/global/toolbarbutton.css +++ b/LCARStrek/global/toolbarbutton.css @@ -73,7 +73,7 @@ toolbarbutton.tabbable { -moz-user-focus: normal !important; } -toolbarbutton:focus { +toolbarbutton:-moz-focusring { -moz-outline-radius: 3px; outline: 1px dotted #008484; -moz-outline-offset: -1px; diff --git a/LCARStrek/global/tree.css b/LCARStrek/global/tree.css index ccc192ec..54c1da65 100644 --- a/LCARStrek/global/tree.css +++ b/LCARStrek/global/tree.css @@ -60,7 +60,7 @@ tree { outline-offset: -1px; } -.focusring:focus > .tree-stack > .tree-rows > .tree-bodybox { +.focusring:-moz-focusring > .tree-stack > .tree-rows > .tree-bodybox { outline: 1px dotted #008484; } -- 2.35.3