From 58bfce8aac5e5a9a622610d393f1200d70003ec8 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 10 Nov 2013 20:40:59 +0100 Subject: [PATCH] sync both themes with toolkit windows/shared theme changes in Mozilla 26 --- EarlyBlue/global/filepicker.css | 2 + EarlyBlue/mozapps/aboutNetworking.css | 61 +++++++++++++ EarlyBlue/mozapps/plugins/pluginProblem.css | 15 ++++ LCARStrek/global/filepicker.css | 2 + LCARStrek/mozapps/aboutNetworking.css | 96 +++++++++++++++++++++ LCARStrek/mozapps/plugins/pluginProblem.css | 14 +++ origdiff | 2 +- 7 files changed, 191 insertions(+), 1 deletion(-) create mode 100644 EarlyBlue/mozapps/aboutNetworking.css create mode 100644 LCARStrek/mozapps/aboutNetworking.css diff --git a/EarlyBlue/global/filepicker.css b/EarlyBlue/global/filepicker.css index 0d37ceea..45bdc6a2 100644 --- a/EarlyBlue/global/filepicker.css +++ b/EarlyBlue/global/filepicker.css @@ -20,10 +20,12 @@ /* ::::: file/directory items ::::: */ +treechildren::-moz-tree-image(treecolAutoCompleteValue, directory), treechildren::-moz-tree-image(FilenameColumn, directory) { list-style-image: url("chrome://global/skin/filepicker/dir-closed.gif"); } +treechildren::-moz-tree-image(treecolAutoCompleteValue, file), treechildren::-moz-tree-image(FilenameColumn, file) { list-style-image: url("chrome://global/skin/filepicker/file.gif"); } diff --git a/EarlyBlue/mozapps/aboutNetworking.css b/EarlyBlue/mozapps/aboutNetworking.css new file mode 100644 index 00000000..d23f4590 --- /dev/null +++ b/EarlyBlue/mozapps/aboutNetworking.css @@ -0,0 +1,61 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +body { + min-width: 330px; + max-width: 100%; + min-height: 330px; + max-height: 100%; + margin: 0.5em; +} + +#menu { + position: absolute; + top: 5px; + color: #000000; +} + +.warningBackground { + display: none; + background: #CCD0DD; + width:100%; + height:100%; + z-index:10; + top:0; + left:0; + position:fixed; +} + +.warningMessage { + color: #000000; + position: relative; + min-width: 330px; + max-width: 50em; + margin: 4em auto; + border: 1px solid #666699; + border-radius: 10px; + padding: 3em; + -moz-padding-start: 30px; + background: #CCD0DD; + margin-left: auto; + text-align: center; +} + +.tab { + display: none; +} + +.active { + display: block; +} + +#menu .selected { + color: #336699; +} + +#refreshdiv { + top: 5px; + position: absolute; + right: 30px; +} diff --git a/EarlyBlue/mozapps/plugins/pluginProblem.css b/EarlyBlue/mozapps/plugins/pluginProblem.css index adfd81e3..072126b0 100644 --- a/EarlyBlue/mozapps/plugins/pluginProblem.css +++ b/EarlyBlue/mozapps/plugins/pluginProblem.css @@ -25,12 +25,22 @@ width: 100%; height: 100%; } + :-moz-handler-vulnerable-updatable .hoverBox:active, :-moz-handler-vulnerable-no-update .hoverBox:active, :-moz-handler-clicktoplay .hoverBox:active { background-color: #CCCCCC; } +:-moz-handler-clicktoplay .hoverBox:active .msgTapToPlay, +:-moz-handler-clicktoplay .hoverBox:active .msgClickToPlay, +:-moz-handler-vulnerable-updatable .hoverBox:active .msgTapToPlay, +:-moz-handler-vulnerable-updatable .hoverBox:active .msgClickToPlay, +:-moz-handler-vulnerable-no-update .hoverBox:active .msgTapToPlay, +:-moz-handler-vulnerable-no-update .hoverBox:active .msgClickToPlay { + color: red; +} + :-moz-handler-vulnerable-updatable .hoverBox, :-moz-handler-vulnerable-no-update .hoverBox, :-moz-handler-blocked .hoverBox, @@ -84,6 +94,11 @@ html|a { margin-left: 5px; } +.msgTapToPlay, +.msgClickToPlay { + text-decoration: underline; +} + @media not all and (-moz-touch-enabled) { :-moz-handler-clicktoplay .msgTapToPlay { display: none; diff --git a/LCARStrek/global/filepicker.css b/LCARStrek/global/filepicker.css index 3f5bbcb5..33740a50 100644 --- a/LCARStrek/global/filepicker.css +++ b/LCARStrek/global/filepicker.css @@ -20,10 +20,12 @@ /* ::::: file/directory items ::::: */ +treechildren::-moz-tree-image(treecolAutoCompleteValue, directory), treechildren::-moz-tree-image(FilenameColumn, directory) { list-style-image: url("chrome://global/skin/filepicker/dir-closed.gif"); } +treechildren::-moz-tree-image(treecolAutoCompleteValue, file), treechildren::-moz-tree-image(FilenameColumn, file) { list-style-image: url("chrome://global/skin/filepicker/file.gif"); } diff --git a/LCARStrek/mozapps/aboutNetworking.css b/LCARStrek/mozapps/aboutNetworking.css new file mode 100644 index 00000000..9906ab51 --- /dev/null +++ b/LCARStrek/mozapps/aboutNetworking.css @@ -0,0 +1,96 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +body { + min-width: 330px; + max-width: 100%; + min-height: 330px; + max-height: 100%; + margin: 0.5em; +} + +#menu { + position: absolute; + top: 5px; + color: gray; +} + +.warningBackground { + display: none; + background: #000000; + width:100%; + height:100%; + z-index:10; + top:0; + left:0; + position:fixed; +} + +.warningMessage { + color: #000000; + position: relative; + min-width: 330px; + max-width: 50em; + margin: 4em auto; + border: 1px solid #9C9CFF; + border-radius: 10px; + padding: 3em; + -moz-padding-start: 30px; + background: #E7ADE7; + margin-left: auto; + text-align: center; +} + +.tab { + display: none; +} + +.active { + display: block; +} + +button { + border-radius: 300px; + margin: 1px 1px; + padding: 0; + min-width: 12ch; + border: none; + background-color: #C09070; + color: #000000; + text-shadow: none; +} + +button.selected { + background-color: #008484; +} + +button:hover { + background-color: #FFCF00; +} + +button[disabled] { + background-color: #8050B0; +} + +#menu button { + border-radius: 0; +} + +#menu button:first-child { + border-radius: 300px 0 0 300px; +} + +#menu button:last-child { + border-radius: 0 300px 300px 0; +} + +#refreshdiv { + top: 5px; + position: absolute; + right: 30px; +} + +#autorefcheck { + margin-top: -1px; +} diff --git a/LCARStrek/mozapps/plugins/pluginProblem.css b/LCARStrek/mozapps/plugins/pluginProblem.css index 32e67ae5..126b5388 100644 --- a/LCARStrek/mozapps/plugins/pluginProblem.css +++ b/LCARStrek/mozapps/plugins/pluginProblem.css @@ -31,6 +31,15 @@ background-color: #404000; } +:-moz-handler-clicktoplay .hoverBox:active .msgTapToPlay, +:-moz-handler-clicktoplay .hoverBox:active .msgClickToPlay, +:-moz-handler-vulnerable-updatable .hoverBox:active .msgTapToPlay, +:-moz-handler-vulnerable-updatable .hoverBox:active .msgClickToPlay, +:-moz-handler-vulnerable-no-update .hoverBox:active .msgTapToPlay, +:-moz-handler-vulnerable-no-update .hoverBox:active .msgClickToPlay { + color: #FF0000; +} + :-moz-handler-vulnerable-updatable .hoverBox, :-moz-handler-vulnerable-no-update .hoverBox, :-moz-handler-blocked .hoverBox, @@ -85,6 +94,11 @@ html|a { margin-left: 5px; } +.msgTapToPlay, +.msgClickToPlay { + text-decoration: underline; +} + @media not all and (-moz-touch-enabled) { :-moz-handler-clicktoplay .msgTapToPlay { display: none; diff --git a/origdiff b/origdiff index af4039e4..600a3aaf 100755 --- a/origdiff +++ b/origdiff @@ -11,7 +11,7 @@ NAME_POST=26 TAG_PRE_COMM=BETA_25_END TAG_POST_COMM=tip #BETA_26_END -TAG_PRE_MOZ=FIREFOX_BETA_25_END +TAG_PRE_MOZ=FIREFOX_25_0b12_RELEASE #FIREFOX_BETA_25_END TAG_POST_MOZ=tip #FIREFOX_BETA_26_END TAG_PRE_EXT=SEAMONKEY_2_22_RELEASE TAG_POST_EXT=tip #SEAMONKEY_2_23_RELEASE -- 2.43.0