From 2e88f3cc60e31ba850945b78dadddf8399020592 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Mon, 7 Jul 2014 02:52:20 +0200 Subject: [PATCH] sync both themes with toolkit windows theme changes in Mozilla 31 cycle --- EarlyBlue/global/aboutSupport.css | 9 +++++ EarlyBlue/global/dirListing/dirListing.css | 2 +- EarlyBlue/global/popup.css | 29 -------------- EarlyBlue/global/scrollbars.css | 10 ++--- .../extensions/category-experiments.png | Bin 0 -> 270 bytes .../mozapps/extensions/experimentGeneric.png | Bin 0 -> 270 bytes EarlyBlue/mozapps/extensions/extensions.css | 36 +++++++++++++++++- LCARStrek/global/aboutSupport.css | 9 +++++ LCARStrek/global/dirListing/dirListing.css | 2 +- LCARStrek/global/popup.css | 29 -------------- LCARStrek/global/scrollbars.css | 10 ++--- .../extensions/category-experiments.png | Bin 0 -> 270 bytes .../mozapps/extensions/category-languages.png | Bin 340 -> 281 bytes .../mozapps/extensions/experimentGeneric.png | Bin 0 -> 270 bytes LCARStrek/mozapps/extensions/extensions.css | 36 +++++++++++++++++- 15 files changed, 98 insertions(+), 74 deletions(-) create mode 100644 EarlyBlue/mozapps/extensions/category-experiments.png create mode 100644 EarlyBlue/mozapps/extensions/experimentGeneric.png create mode 100644 LCARStrek/mozapps/extensions/category-experiments.png create mode 100644 LCARStrek/mozapps/extensions/experimentGeneric.png diff --git a/EarlyBlue/global/aboutSupport.css b/EarlyBlue/global/aboutSupport.css index 6f7b77f9..5c556dfa 100644 --- a/EarlyBlue/global/aboutSupport.css +++ b/EarlyBlue/global/aboutSupport.css @@ -92,6 +92,7 @@ td { -moz-margin-end: 0; padding: 16px; width: 30%; + visibility: hidden; } #reset-box:-moz-dir(rtl) { @@ -106,3 +107,11 @@ td { display: block; margin: auto; } + +.block { + display: block; +} + +.hidden { + display: none; +} diff --git a/EarlyBlue/global/dirListing/dirListing.css b/EarlyBlue/global/dirListing/dirListing.css index 38cbae52..a67fa447 100644 --- a/EarlyBlue/global/dirListing/dirListing.css +++ b/EarlyBlue/global/dirListing/dirListing.css @@ -77,7 +77,7 @@ th:hover > a { text-decoration: underline; } -tbody > tr:hover { +body > table > tbody > tr:hover { outline: 1px solid #808080; outline-radius: .3em; } diff --git a/EarlyBlue/global/popup.css b/EarlyBlue/global/popup.css index b9433889..076cc04e 100644 --- a/EarlyBlue/global/popup.css +++ b/EarlyBlue/global/popup.css @@ -29,35 +29,6 @@ panel[type="arrow"] { background: transparent; border: none; padding: 0; - transition: opacity 300ms; -} - -.panel-arrowcontainer[panelopen] { - transition-duration: 200ms, 150ms; - transition-property: opacity, transform; - transition-timing-function: ease-out; -} - -.panel-arrowcontainer:not([panelopen]) { - /* Does not work correctly in Linux right now. - 2012-09-30 - * Actually, only breaks uncommon Window Managers, but arrowpanels disappear completely. 2013-07-21 - opacity: 0; */ -} - -.panel-arrowcontainer:not([panelopen])[side="top"] { - transform: translateY(-20px); -} - -.panel-arrowcontainer:not([panelopen])[side="bottom"] { - transform: translateY(20px); -} - -.panel-arrowcontainer:not([panelopen])[side="left"] { - transform: translateX(-20px); -} - -.panel-arrowcontainer:not([panelopen])[side="right"] { - transform: translateX(20px); } panel[type="arrow"][side="top"], diff --git a/EarlyBlue/global/scrollbars.css b/EarlyBlue/global/scrollbars.css index c645af5e..700282c8 100644 --- a/EarlyBlue/global/scrollbars.css +++ b/EarlyBlue/global/scrollbars.css @@ -18,12 +18,12 @@ scrollbar { pointer-events: auto; } -scrollbar[root="true"] { - position: relative; - z-index: 2147483647; /* largest positive value of a signed 32-bit integer */ -} - @media all and (-moz-overlay-scrollbars) { + scrollbar[root="true"] { + position: relative; + z-index: 2147483647; /* largest positive value of a signed 32-bit integer */ + } + scrollbar:not([active="true"]), scrollbar[disabled="true"] { visibility: hidden; diff --git a/EarlyBlue/mozapps/extensions/category-experiments.png b/EarlyBlue/mozapps/extensions/category-experiments.png new file mode 100644 index 0000000000000000000000000000000000000000..f0b5c02aadecabb39216e80477767bf554246fe1 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;*aCb)TpbV9r=^|IIXW*MD8g70 zlryqG z@vM2~v-$^I8|0er9sD-0FjxD>EA2^ZmDDs3F7eo5r}Xg~&ylAxJLXU0_7c4!^6>Y+ zH_g}W&Y9FH;j2Nmv}Zu#&03`ga+>>kB74@@1!y?~Bk@O1Ta JS?83{1OQ6dTl)Y2 literal 0 HcmV?d00001 diff --git a/EarlyBlue/mozapps/extensions/experimentGeneric.png b/EarlyBlue/mozapps/extensions/experimentGeneric.png new file mode 100644 index 0000000000000000000000000000000000000000..645a876384bc4afa8859ba6ddadfbafbf7ac2220 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;*aCb)Tszj*r=^`?bTHfx6k#k0 z@(X5gcy=QV#7XjYcVXyYmGuB}I14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfJ$7~mWl6!S zZ@vSC8a-VcLpZLho-^cPG8AxoC?2$=hh2a@e`Dx3pE9vV-fM^AH0NIDh`4bquS?Z% z#_X0YG!PC{x JWt~$(69C?JT`B+o literal 0 HcmV?d00001 diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css index abd2c0e9..5654e301 100644 --- a/EarlyBlue/mozapps/extensions/extensions.css +++ b/EarlyBlue/mozapps/extensions/extensions.css @@ -4,8 +4,6 @@ @import url("chrome://global/skin/inContentUI.css"); -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - .nav-button { list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png"); } @@ -259,6 +257,9 @@ #category-dictionary > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png"); } +#category-experiment > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-experiments.png"); +} #category-availableUpdates > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-available.png"); } @@ -444,6 +445,10 @@ list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); } +.addon-view[type="experiment"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.png"); +} + .name-container { font-size: 150%; font-weight: bold; @@ -1016,3 +1021,30 @@ button.button-link { /* Needed to override normal button style from inContent.css */ button.button-link:not([disabled="true"]):active:hover { } + +/*** telemetry experiments ***/ + +#detail-experiment-container { + font-size: 80%; + margin-bottom: 1em; +} + +#detail-experiment-bullet-container, +#detail-experiment-state, +#detail-experiment-time, +.experiment-bullet-container, +.experiment-state, +.experiment-time { + vertical-align: middle; + display: inline-block; +} + +.addon .experiment-bullet, +#detail-experiment-bullet { + fill: #808080; +} + +.addon[active="true"] .experiment-bullet, +#detail-view[active="true"] #detail-experiment-bullet { + fill: #336699; +} diff --git a/LCARStrek/global/aboutSupport.css b/LCARStrek/global/aboutSupport.css index b6cc59ac..7bfe0013 100644 --- a/LCARStrek/global/aboutSupport.css +++ b/LCARStrek/global/aboutSupport.css @@ -148,6 +148,7 @@ td { -moz-margin-end: 0; padding: 16px; width: 30%; + visibility: hidden; } #reset-box:-moz-dir(rtl) { @@ -162,3 +163,11 @@ td { display: block; margin: auto; } + +.block { + display: block; +} + +.hidden { + display: none; +} diff --git a/LCARStrek/global/dirListing/dirListing.css b/LCARStrek/global/dirListing/dirListing.css index 16a0b149..ee4e1ddb 100644 --- a/LCARStrek/global/dirListing/dirListing.css +++ b/LCARStrek/global/dirListing/dirListing.css @@ -79,7 +79,7 @@ th:hover > a { color: #000000; } -tbody > tr:hover { +body > table > tbody > tr:hover { outline: 1px solid #008484; -moz-outline-radius: .3em; } diff --git a/LCARStrek/global/popup.css b/LCARStrek/global/popup.css index 920b8bf4..0320d30a 100644 --- a/LCARStrek/global/popup.css +++ b/LCARStrek/global/popup.css @@ -29,35 +29,6 @@ panel[type="arrow"] { background: transparent; border: none; padding: 0; - transition: opacity 300ms; -} - -.panel-arrowcontainer[panelopen] { - transition-duration: 200ms, 150ms; - transition-property: opacity, transform; - transition-timing-function: ease-out; -} - -.panel-arrowcontainer:not([panelopen]) { - /* Does not work correctly in Linux right now. - 2012-09-30 - * Actually, only breaks uncommon Window Managers, but arrowpanels disappear completely. 2013-07-21 - opacity: 0; */ -} - -.panel-arrowcontainer:not([panelopen])[side="top"] { - transform: translateY(-20px); -} - -.panel-arrowcontainer:not([panelopen])[side="bottom"] { - transform: translateY(20px); -} - -.panel-arrowcontainer:not([panelopen])[side="left"] { - transform: translateX(-20px); -} - -.panel-arrowcontainer:not([panelopen])[side="right"] { - transform: translateX(20px); } panel[type="arrow"][side="top"], diff --git a/LCARStrek/global/scrollbars.css b/LCARStrek/global/scrollbars.css index f85dd362..7b7a97f2 100644 --- a/LCARStrek/global/scrollbars.css +++ b/LCARStrek/global/scrollbars.css @@ -19,12 +19,12 @@ scrollbar { pointer-events: auto; } -scrollbar[root="true"] { - position: relative; - z-index: 2147483647; /* largest positive value of a signed 32-bit integer */ -} - @media all and (-moz-overlay-scrollbars) { + scrollbar[root="true"] { + position: relative; + z-index: 2147483647; /* largest positive value of a signed 32-bit integer */ + } + scrollbar:not([active="true"]), scrollbar[disabled="true"] { visibility: hidden; diff --git a/LCARStrek/mozapps/extensions/category-experiments.png b/LCARStrek/mozapps/extensions/category-experiments.png new file mode 100644 index 0000000000000000000000000000000000000000..9449c9a8c7b4e3c14c34603fe72644679bbb7de6 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;*aCb)T(|Pp&zbXIAy}mrD8g70 zlryqG z@vM2~v-$^I8|0er9sD-0FjxD>EA2^ZmDDs3F7eo5r}Xg~&ylAxJLXU0_7c4!^6>Y+ zH_g}W&Y9FH;j2Nmv}Zu#&03`ga+>>kB74@@1!y?~Bk@O1Ta JS?83{1OPw$TpIuY literal 0 HcmV?d00001 diff --git a/LCARStrek/mozapps/extensions/category-languages.png b/LCARStrek/mozapps/extensions/category-languages.png index 5a8d7e7838cdd5620787be4df25ac6d9d5bfa6d0..c6187be68cf2df72080e61c36d0b3ad7c7fe8c1a 100644 GIT binary patch delta 239 zcmcb@G?Qt9gas2b0|Nt}$fR^2#Tnoe;%d)OF=x*I|MMAKs}AG?1sO|%{DK)Ap4~_T zagw~!S*9v(&ARH9 z!?QqAz;w|<4z?pQ3eAe#DMcA8m>+9Rh;?YY5i%ieLC6Z`DLMxmUWxg*X}D-IXJ=@* hc$k=&Ofln;U|=}Qp=l}<_TxCn6`rnsF6*2UngDy6NWuUB delta 298 zcmV+_0oDGQ0@MPK7$^t^0001UdV2H#0004VQb$4nuFf3k00006VoOIv0L%c;0NtQX zCH#?49)H>f1``qjUBEL#0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht z7XSbNuSrBfR9M69l~E3WAPhsPdQ*2SJSxEtqah0-2y>XQPe|;e+bWDuS?fJNBLeu@ zA|<@eh+H0bAqZNFM}=8!&R-DtTAV{nM!BHz`ghO;bqD%wLGB)l3}H+>b>2k_h=9%c zqSrT1LL$Hl*!&%@FSIR6K4oH!yw?uJY0kaQ5pm;KUYDxj zjAzX=pVdF$+920_@8Gw2g}K^4UTIHStE8rRaEZqbJEf1`c#b@k*)e|_x0mP@k%zzk zy=lH~ch00vA?L!4O|l}_BUan1Em|bJKB#c-bjyF|XE-XqW%nqyd0^@&?gexVgQu&X J%Q~loCICQLT@C;M literal 0 HcmV?d00001 diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css index 154fcd08..bf7145cc 100644 --- a/LCARStrek/mozapps/extensions/extensions.css +++ b/LCARStrek/mozapps/extensions/extensions.css @@ -4,8 +4,6 @@ @import url("chrome://global/skin/inContentUI.css"); -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - .nav-button { list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png"); } @@ -271,6 +269,9 @@ #category-dictionary > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png"); } +#category-experiment > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-experiments.png"); +} #category-availableUpdates > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-available.png"); } @@ -477,6 +478,10 @@ list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); } +.addon-view[type="experiment"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.png"); +} + .name-container { font-size: 150%; font-weight: bold; @@ -1065,3 +1070,30 @@ button.button-link { /* Needed to override normal button style from inContent.css */ button.button-link:not([disabled="true"]):active:hover { } + +/*** telemetry experiments ***/ + +#detail-experiment-container { + font-size: 80%; + margin-bottom: 1em; +} + +#detail-experiment-bullet-container, +#detail-experiment-state, +#detail-experiment-time, +.experiment-bullet-container, +.experiment-state, +.experiment-time { + vertical-align: middle; + display: inline-block; +} + +.addon .experiment-bullet, +#detail-experiment-bullet { + fill: #8050B0; +} + +.addon[active="true"] .experiment-bullet, +#detail-view[active="true"] #detail-experiment-bullet { + fill: #FFCF00; +} -- 2.35.3