wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1125636 - Update about:config to use the new Project Chameleon style. r=Unfocused

Browse Source 
--HG--
rename : toolkit/themes/windows/global/config.css => toolkit/themes/shared/config.css
This commit is contained in:
Richard Marti 2015-02-04 17:52:47 +01:00
parent 26781c890a
commit c63dcc684f
9 changed files with 82 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
toolkit/components/viewconfig/content/config.xul
View File

@ -4,12 +4,13 @@
- 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/. -->
<?xml-stylesheet href="chrome://global/skin/in-content/info-pages.css" type="text/css"?>
<?xml-stylesheet href="chrome://global/skin/config.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://global/locale/config.dtd">
<window id="config"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&window.title;"
windowtype="Preferences:ConfigManager"
role="application"
@ -52,17 +53,18 @@
<deck id="configDeck" flex="1">
<vbox id="warningScreen" flex="1" align="center" style="overflow: auto;">
<spacer flex="1"/>
<hbox id="warningBox" align="top">
<image id="exclam"/>
<vbox id="warningInnerBox" flex="1">
<label id="warningTitle">&aboutWarningTitle.label;</label>
<vbox id="warningBox" class="container">
<hbox class="title" flex="1">
<label id="warningTitle" class="title-text" flex="1">&aboutWarningTitle.label;</label>
</hbox>
<vbox class="description" flex="1">
<label id="warningText">&aboutWarningText.label;</label>
<checkbox id="showWarningNextTime" label="&aboutWarningCheckbox.label;" checked="true"/>
<hbox pack="center">
<button id="warningButton" oncommand="ShowPrefs();" label="&aboutWarningButton.label;"/>
<button id="warningButton" class="primary" oncommand="ShowPrefs();" label="&aboutWarningButton.label;"/>
</hbox>
</vbox>
</hbox>
</vbox>
<spacer flex="2"/>
</vbox>
<vbox flex="1">

2
toolkit/themes/linux/global/jar.mn
View File

@ -8,6 +8,7 @@ toolkit.jar:
+ skin/classic/global/checkbox.css
+ skin/classic/global/colorpicker.css
+ skin/classic/global/commonDialog.css
+ skin/classic/global/config.css (../../shared/config.css)
+ skin/classic/global/dropmarker.css
+ skin/classic/global/filepicker.css
+ skin/classic/global/Filepicker.png (filepicker/Filepicker.png)
@ -51,6 +52,7 @@ toolkit.jar:
+ skin/classic/global/icons/panelarrow-vertical.svg (icons/panelarrow-vertical.svg)
+ skin/classic/global/icons/resizer.png (icons/resizer.png)
+ skin/classic/global/icons/sslWarning.png (icons/sslWarning.png)
+ skin/classic/global/icons/warning.svg (../../shared/incontent-icons/warning.svg)
+ skin/classic/global/icons/wrap.png (icons/wrap.png)
+ skin/classic/global/icons/webapps-16.png (icons/webapps-16.png)
+ skin/classic/global/icons/webapps-64.png (icons/webapps-64.png)

94
toolkit/themes/osx/global/config.css
View File

@ -1,94 +0,0 @@
/* 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/. */
%include shared.inc
@import url("chrome://global/skin/");
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
#warningScreen
{
background-color: -moz-Dialog;
}
#warningBox
{
background-color: -moz-Field;
color: -moz-FieldText;
border: 1px solid ThreeDShadow;
border-radius: 10px;
padding: 3em;
-moz-padding-start: 30px;
margin-left: 1em;
margin-right: 1em;
}
#warningInnerBox
{
max-width: 50em;
}
#warningTitle
{
margin: 0 0 .6em 0;
font-size: 160%;
border-bottom: 1px solid ThreeDLightShadow
}
#warningText
{
font-size: 110%;
margin-left: 0;
}
#warningButton
{
margin-top: 0.6em;
}
#showWarningNextTime
{
margin-top: 0.6em;
}
#exclam
{
list-style-image: url("chrome://global/skin/icons/warning-large.png");
-moz-margin-end: 3em;
}
#configTreeBody::-moz-tree-cell-text(user)
{
font-weight: bold;
}
#configTreeBody::-moz-tree-cell-text(locked)
{
font-style: italic;
}
#configTree
{
margin: 0;
border: 0;
-moz-appearance: none;
}
#filterRow
{
background: @scopeBarBackground@;
border-bottom: @scopeBarSeparatorBorder@;
padding: 1px 2px 0;
}
#filterRow > label {
margin: 0 4px;
color: @scopeBarTitleColor@;
text-shadow: @loweredShadow@;
font-weight: bold;
}
#textbox {
max-width: 35em;
}

3
toolkit/themes/osx/global/jar.mn
View File

@ -19,7 +19,7 @@ toolkit.jar:
skin/classic/global/checkbox.css
skin/classic/global/colorpicker.css
skin/classic/global/commonDialog.css
* skin/classic/global/config.css
skin/classic/global/config.css (../../shared/config.css)
skin/classic/global/customizeToolbar.css
skin/classic/global/dialog.css
skin/classic/global/dropmarker.css
@ -143,6 +143,7 @@ toolkit.jar:
skin/classic/global/icons/question-64.png (icons/question-64.png)
skin/classic/global/icons/question-large.png (icons/question-large.png)
skin/classic/global/icons/sslWarning.png (icons/sslWarning.png)
skin/classic/global/icons/warning.svg (../../shared/incontent-icons/warning.svg)
skin/classic/global/icons/webapps-16.png (icons/webapps-16.png)
skin/classic/global/icons/webapps-16@2x.png (icons/webapps-16@2x.png)
skin/classic/global/icons/webapps-64.png (icons/webapps-64.png)

49
toolkit/themes/shared/config.css Normal file
View File

@ -0,0 +1,49 @@
/* 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/. */
#warningScreen {
font-size: 15px;
padding-top: 0;
padding-bottom: 0;
-moz-padding-start: calc(48px + 4.6em);
-moz-padding-end: 48px;
}
.title {
background-image: url("chrome://global/skin/icons/warning.svg");
}
#warningTitle {
font-weight: lighter;
line-height: 1.2;
color: #333;
margin: 0;
margin-bottom: .5em;
}
#warningText {
margin: 1em 0;
}
#warningButton {
margin-top: 0.6em;
}
#filterRow {
margin-top: 4px;
-moz-margin-start: 4px;
}
#configTree {
margin-top: 4px;
margin-bottom: 4px;
}
#configTreeBody::-moz-tree-cell-text(user) {
font-weight: bold;
}
#configTreeBody::-moz-tree-cell-text(locked) {
font-style: italic;
}

3
toolkit/themes/shared/in-content/common.inc.css
View File

@ -7,7 +7,8 @@
@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
html|body,
xul|page {
xul|page,
xul|window {
font: message-box;
-moz-appearance: none;
background-color: #fbfbfb;

12
toolkit/themes/shared/incontent-icons/warning.svg Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 60 60" enable-background="new 0 0 60 60">
<linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="30" y1="10" x2="30" y2="50">
<stop offset="0" style="stop-color: #fedb00"/>
<stop offset="1" style="stop-color: #fcce00"/>
</linearGradient>
<path fill="url(#gradient)" d="M49.316,42.867L33.829,12.7c-0.879-1.715-2.274-2.7-3.828-2.7c-1.554,0-2.949,0.985-3.829,2.702
L10.685,42.864c-0.869,1.69-0.913,3.482-0.121,4.909C11.35,49.187,12.817,50,14.591,50h30.82c1.772,0,3.24-0.81,4.023-2.224
C50.227,46.349,50.185,44.56,49.316,42.867z M32.176,22.304l-0.48,14.304h-3.424L27.76,22.304H32.176z M30,44.896
c-1.44,0-2.592-1.184-2.592-2.592c0-1.44,1.152-2.592,2.592-2.592c1.472,0,2.592,1.152,2.592,2.592
C32.592,43.712,31.472,44.896,30,44.896z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 938 B

84
toolkit/themes/windows/global/config.css
View File

@ -1,84 +0,0 @@
/* 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/. */
@import url("chrome://global/skin/");
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
#warningScreen
{
background-color: -moz-Dialog;
}
#warningBox
{
background-color: -moz-Field;
color: -moz-FieldText;
border: 1px solid ThreeDShadow;
border-radius: 10px;
padding: 3em;
-moz-padding-start: 30px;
margin-left: 1em;
margin-right: 1em;
}
#warningInnerBox
{
max-width: 50em;
}
#warningTitle
{
margin: 0 0 .6em 0;
font-size: 160%;
border-bottom: 1px solid ThreeDLightShadow
}
#warningText
{
font-size: 110%;
margin-left: 0;
}
#warningButton
{
margin-top: 0.6em;
}
#showWarningNextTime
{
margin-top: 0.6em;
}
#exclam
{
%ifdef MOZ_WIDGET_GTK
list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=dialog");
%else
list-style-image: url("chrome://global/skin/icons/warning-large.png");
%endif
-moz-margin-end: 3em;
}
#configTreeBody::-moz-tree-cell-text(user)
{
font-weight: bold;
}
#configTreeBody::-moz-tree-cell-text(locked)
{
font-style: italic;
}
#configTree
{
margin-top: 5px;
margin-bottom: 5px;
}
#filterRow
{
margin-top: 5px;
}

10
toolkit/themes/windows/global/jar.mn
View File

@ -20,7 +20,7 @@ toolkit.jar:
skin/classic/global/checkbox.css
skin/classic/global/colorpicker.css
skin/classic/global/commonDialog.css
* skin/classic/global/config.css
skin/classic/global/config.css (../../shared/config.css)
skin/classic/global/customizeToolbar.css
skin/classic/global/datetimepicker.css
skin/classic/global/dialog.css
@ -73,7 +73,7 @@ toolkit.jar:
skin/classic/global/arrow/arrow-lft-hov.gif (arrow/arrow-lft.gif)
skin/classic/global/arrow/arrow-lft-sharp.gif (arrow/arrow-lft-sharp.gif)
skin/classic/global/arrow/arrow-lft-sharp-end.gif (arrow/arrow-lft-sharp-end.gif)
skin/classic/global/arrow/arrow-rit.gif (arrow/arrow-rit.gif)
skin/classic/global/arrow/arrow-rit.gif (arrow/arrow-rit.gif)
skin/classic/global/arrow/arrow-rit-dis.gif (arrow/arrow-rit-dis.gif)
skin/classic/global/arrow/arrow-rit-hov.gif (arrow/arrow-rit.gif)
skin/classic/global/arrow/arrow-rit-sharp.gif (arrow/arrow-rit-sharp.gif)
@ -141,6 +141,7 @@ toolkit.jar:
skin/classic/global/icons/sslWarning.png (icons/sslWarning.png)
skin/classic/global/icons/tabprompts-bgtexture.png (icons/tabprompts-bgtexture.png)
skin/classic/global/icons/Warning.png (icons/Warning.png)
skin/classic/global/icons/warning.svg (../../shared/incontent-icons/warning.svg)
skin/classic/global/icons/warning-large.png (icons/warning-large.png)
skin/classic/global/icons/warning-16.png (icons/warning-16.png)
skin/classic/global/icons/warning-24.png (icons/warning-24.png)
@ -218,7 +219,7 @@ toolkit.jar:
skin/classic/aero/global/checkbox.css
skin/classic/aero/global/colorpicker.css
skin/classic/aero/global/commonDialog.css
* skin/classic/aero/global/config.css
skin/classic/aero/global/config.css (../../shared/config.css)
skin/classic/aero/global/customizeToolbar.css
skin/classic/aero/global/datetimepicker.css
skin/classic/aero/global/dialog.css
@ -271,7 +272,7 @@ toolkit.jar:
skin/classic/aero/global/arrow/arrow-lft-hov.gif (arrow/arrow-lft.gif)
skin/classic/aero/global/arrow/arrow-lft-sharp.gif (arrow/arrow-lft-sharp.gif)
skin/classic/aero/global/arrow/arrow-lft-sharp-end.gif (arrow/arrow-lft-sharp-end.gif)
skin/classic/aero/global/arrow/arrow-rit.gif (arrow/arrow-rit.gif)
skin/classic/aero/global/arrow/arrow-rit.gif (arrow/arrow-rit.gif)
skin/classic/aero/global/arrow/arrow-rit-dis.gif (arrow/arrow-rit-dis.gif)
skin/classic/aero/global/arrow/arrow-rit-hov.gif (arrow/arrow-rit.gif)
skin/classic/aero/global/arrow/arrow-rit-sharp.gif (arrow/arrow-rit-sharp.gif)
@ -335,6 +336,7 @@ toolkit.jar:
skin/classic/aero/global/icons/Search-glass.png (icons/Search-glass-aero.png)
skin/classic/aero/global/icons/sslWarning.png (icons/sslWarning-aero.png)
skin/classic/aero/global/icons/tabprompts-bgtexture.png (icons/tabprompts-bgtexture.png)
skin/classic/aero/global/icons/warning.svg (../../shared/incontent-icons/warning.svg)
skin/classic/aero/global/icons/Warning.png (icons/Warning-aero.png)
skin/classic/aero/global/icons/warning-large.png (icons/warning-large-aero.png)
skin/classic/aero/global/icons/warning-16.png (icons/warning-16-aero.png)