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 1062127 - Style the in-content preference dialogs. r=dao

Browse Source 
--HG--
rename : browser/themes/shared/incontentprefs/preferences.css => browser/themes/shared/incontentprefs/preferences.inc.css
This commit is contained in:
Richard Marti 2014-11-12 10:15:42 +01:00
parent 4067c79db7
commit 47b41df8c0
12 changed files with 205 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/components/preferences/in-content/subdialogs.js
View File

@ -12,7 +12,8 @@ let gSubDialog = {
_injectedStyleSheets: ["chrome://mozapps/content/preferences/preferences.css",
"chrome://browser/skin/preferences/preferences.css",
"chrome://global/skin/in-content/common.css",
"chrome://browser/skin/preferences/in-content/preferences.css"],
"chrome://browser/skin/preferences/in-content/preferences.css",
"chrome://browser/skin/preferences/in-content/dialog.css"],
init: function() {
this._frame = document.getElementById("dialogFrame");

1
browser/themes/linux/jar.mn
View File

@ -153,6 +153,7 @@ browser.jar:
#endif
* skin/classic/browser/preferences/preferences.css (preferences/preferences.css)
* skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
* skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css)
skin/classic/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico)
skin/classic/browser/preferences/in-content/icons.png (../shared/incontentprefs/icons.png)
skin/classic/browser/preferences/in-content/icons@2x.png (../shared/incontentprefs/icons@2x.png)

13
browser/themes/linux/preferences/in-content/dialog.css Normal file
View File

@ -0,0 +1,13 @@
/* - 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/incontentprefs/dialog.inc.css
label,
textbox,
description,
.tab-text,
caption > label {
font-size: 1.2em;
}

24
browser/themes/linux/preferences/in-content/preferences.css
View File

@ -2,7 +2,7 @@
- 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/incontentprefs/preferences.css
%include ../../../shared/incontentprefs/preferences.inc.css
spinbuttons {
-moz-appearance: none;
@ -39,11 +39,23 @@ filefield + button {
-moz-margin-start: -4px;
}
#dialogTitle {
-moz-margin-start: 12px !important;
/**
* Dialog
*/
#dialogBox {
padding: 20px;
}
.actionButtons {
margin-right: 8px !important;
margin-left: 8px !important;
#dialogTitle {
font-size: 1em;
}
.titlebar {
margin-bottom: 12px;
}
.close-icon {
margin-top: -32px;
-moz-margin-end: -15px;
}

1
browser/themes/osx/jar.mn
View File

@ -253,6 +253,7 @@ browser.jar:
skin/classic/browser/preferences/saveFile.png (preferences/saveFile.png)
* skin/classic/browser/preferences/preferences.css (preferences/preferences.css)
* skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
* skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css)
skin/classic/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico)
skin/classic/browser/preferences/in-content/icons.png (../shared/incontentprefs/icons.png)
skin/classic/browser/preferences/in-content/icons@2x.png (../shared/incontentprefs/icons@2x.png)

30
browser/themes/osx/preferences/in-content/dialog.css Normal file
View File

@ -0,0 +1,30 @@
/* - 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/incontentprefs/dialog.inc.css
prefwindow,
.windowDialog {
font: message-box !important;
}
label,
textbox,
description,
.tab-text,
caption > label {
font-size: 1.3em;
}
button {
font-size: 1em;
}
caption {
font: message-box;
}
.prefWindow-dlgbuttons {
margin: 0;
}

28
browser/themes/osx/preferences/in-content/preferences.css
View File

@ -2,7 +2,7 @@
- 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/incontentprefs/preferences.css
%include ../../../shared/incontentprefs/preferences.inc.css
prefpane .groupbox-title {
background: none;
@ -50,10 +50,6 @@ filefield + button {
-moz-margin-start: -8px;
}
#dialogTitle {
-moz-margin-start: 6px !important;
}
#popupPolicyRow {
/* Override styles from
browser/themes/osx/preferences/preferences.css */
@ -61,3 +57,25 @@ filefield + button {
padding-bottom: 0 !important;
border-bottom: none;
}
/**
* Dialog
*/
#dialogBox {
padding: 15px 20px 20px;
}
#dialogTitle {
font-size: 1.1em;
}
.titlebar {
margin-bottom: 9px;
-moz-padding-start: 0;
}
.close-icon {
margin-top: -29px;
-moz-margin-end: -14px;
}

68
browser/themes/shared/incontentprefs/dialog.inc.css Normal file
View File

@ -0,0 +1,68 @@
%if 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/. */
%endif
dialog,
window,
prefpane,
prefwindow,
.windowDialog {
-moz-appearance: none;
background-color: #fbfbfb;
color: #424e5a;
margin: 0;
padding: 0;
}
.contentPane {
margin: 0;
}
tabbox {
/* override the rule in certManager.xul */
margin: 0 0 5px !important;
}
tabpanels {
font-size: 1em;
}
tabs,
label,
description,
#useDocumentColors {
margin-right: 4px;
margin-left: 4px;
}
tree:not(#rejectsTree) {
min-height: 15em;
}
.actionButtons {
margin: 3px 0 0 !important;
}
caption {
-moz-padding-start: 0;
}
groupbox {
font-size: 1em;
margin-top: 0;
margin-right: 4px;
margin-left: 4px;
padding-top: 0;
padding-bottom: 5px;
}
prefpane .groupbox-body {
padding: 0 0 5px;
}
groupbox description {
margin-right: 0;
margin-left: 0;
}

42
browser/themes/shared/incontentprefs/preferences.css → browser/themes/shared/incontentprefs/preferences.inc.css
View File

@ -5,17 +5,7 @@
%endif
@namespace html "http://www.w3.org/1999/xhtml";
#dialogBox,
dialog,
window,
prefwindow,
.windowDialog {
-moz-appearance: none;
background-color: #f1f1f1;
color: #424E5A;
}
prefpane {
#mainPrefPane {
max-width: 800px;
padding: 0;
font: message-box;
@ -308,7 +298,7 @@ description > html|a {
}
/**
* Sub-dialog
* Dialog
*/
#dialogOverlay {
@ -317,20 +307,27 @@ description > html|a {
}
#dialogBox {
border: 1px solid #666;
background-color: #fbfbfb;
color: #424e5a;
font-size: 14px;
border: 1px solid rgba(0,0,0,0.35);
border-radius: 2.5px;
box-shadow: 0 2px 4px 0 rgba(0,0,0,0.5);
display: -moz-box;
margin: 0;
padding-right: 6px;
padding-left: 6px;
}
#dialogBox[resizable="true"] {
resize: both;
overflow: hidden;
min-height: 30em;
min-height: 20em;
min-width: 66ch;
}
.titlebar {
-moz-margin-start: 4px;
}
.close-icon {
background-color: transparent !important;
border: none;
@ -348,19 +345,10 @@ description > html|a {
#dialogFrame {
-moz-box-flex: 1;
/* Default dialog dimensions */
height: 30em;
height: 20em;
width: 66ch;
}
tree:not(#rejectsTree) {
min-height: 15em;
}
:-moz-any(dialog, window, prefwindow) groupbox {
-moz-margin-start: 8px;
-moz-margin-end: 8px;
}
/**
* End sub-dialog
* End Dialog
*/

4
browser/themes/windows/jar.mn
View File

@ -181,6 +181,7 @@ browser.jar:
skin/classic/browser/preferences/saveFile.png (preferences/saveFile.png)
* skin/classic/browser/preferences/preferences.css (preferences/preferences.css)
* skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
* skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css)
skin/classic/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico)
skin/classic/browser/preferences/in-content/icons.png (../shared/incontentprefs/icons.png)
skin/classic/browser/preferences/in-content/icons@2x.png (../shared/incontentprefs/icons@2x.png)
@ -618,7 +619,8 @@ browser.jar:
skin/classic/aero/browser/preferences/saveFile.png (preferences/saveFile-aero.png)
* skin/classic/aero/browser/preferences/preferences.css (preferences/preferences.css)
* skin/classic/aero/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
skin/classic/aero/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico)
* skin/classic/aero/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css)
skin/classic/aero/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico)
skin/classic/aero/browser/preferences/in-content/icons.png (../shared/incontentprefs/icons.png)
skin/classic/aero/browser/preferences/in-content/icons@2x.png (../shared/incontentprefs/icons@2x.png)
skin/classic/aero/browser/preferences/applications.css (preferences/applications.css)

13
browser/themes/windows/preferences/in-content/dialog.css Normal file
View File

@ -0,0 +1,13 @@
/* - 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/incontentprefs/dialog.inc.css
label,
textbox,
description,
.tab-text,
caption > label {
font-size: 1.2em;
}

24
browser/themes/windows/preferences/in-content/preferences.css
View File

@ -2,7 +2,7 @@
- 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/incontentprefs/preferences.css
%include ../../../shared/incontentprefs/preferences.inc.css
.actionsMenu > .menulist-label-box > .menulist-icon {
-moz-margin-end: 9px;
@ -13,11 +13,23 @@ filefield + button {
-moz-margin-start: -4px;
}
#dialogTitle {
-moz-margin-start: 13px !important;
/**
* Dialog
*/
#dialogBox {
padding: 18px 20px 20px;
}
.actionButtons {
margin-right: 8px !important;
margin-left: 8px !important;
#dialogTitle {
font-size: 1em;
}
.titlebar {
margin-bottom: 12px;
}
.close-icon {
margin-top: -28px;
-moz-margin-end: -15px;
}