mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1373921 - Remove duplicated css code from about:support/profiles/url-classifier. r=dao

This commit is contained in:
UK992 2017-10-25 22:50:01 +02:00
Родитель d40acb4412
Коммит fa9dc40ccb
8 изменённых файлов: 59 добавлений и 147 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
toolkit/content/aboutProfiles.xhtml
Просмотреть файл

@ -15,12 +15,11 @@
<head> <head>
<title>&aboutProfiles.title;</title> <title>&aboutProfiles.title;</title>
<link rel="icon" type="image/png" id="favicon" href="chrome://branding/content/icon32.png"/> <link rel="icon" type="image/png" id="favicon" href="chrome://branding/content/icon32.png"/>
<link rel="stylesheet" href="chrome://global/skin/in-content/common.css" type="text/css"/>
<link rel="stylesheet" href="chrome://mozapps/skin/aboutProfiles.css" type="text/css" /> <link rel="stylesheet" href="chrome://mozapps/skin/aboutProfiles.css" type="text/css" />
<script type="application/javascript" src="chrome://global/content/aboutProfiles.js" /> <script type="application/javascript" src="chrome://global/content/aboutProfiles.js" />
</head> </head>
<body id="body" dir="&locale.dir;"> <body id="body" dir="&locale.dir;" class="wide-container">
<div id="action-box"> <div id="action-box" class="notice-box">
<h3>&aboutProfiles.restart.title;</h3> <h3>&aboutProfiles.restart.title;</h3>
<button id="restart-in-safe-mode-button">&aboutProfiles.restart.inSafeMode;</button> <button id="restart-in-safe-mode-button">&aboutProfiles.restart.inSafeMode;</button>
<button id="restart-button">&aboutProfiles.restart.normal;</button> <button id="restart-button">&aboutProfiles.restart.normal;</button>

6
toolkit/content/aboutSupport.xhtml
Просмотреть файл

@ -18,8 +18,6 @@
<link rel="icon" type="image/png" id="favicon" <link rel="icon" type="image/png" id="favicon"
href="chrome://branding/content/icon32.png"/> href="chrome://branding/content/icon32.png"/>
<link rel="stylesheet" href="chrome://global/skin/in-content/common.css"
type="text/css"/>
<link rel="stylesheet" href="chrome://global/skin/aboutSupport.css" <link rel="stylesheet" href="chrome://global/skin/aboutSupport.css"
type="text/css"/> type="text/css"/>
@ -27,10 +25,10 @@
src="chrome://global/content/aboutSupport.js"/> src="chrome://global/content/aboutSupport.js"/>
</head> </head>
<body dir="&locale.dir;"> <body dir="&locale.dir;" class="wide-container">
#ifndef ANDROID #ifndef ANDROID
<div id="action-box"> <div id="action-box" class="notice-box">
<div id="reset-box"> <div id="reset-box">
<h3>&refreshProfile.title;</h3> <h3>&refreshProfile.title;</h3>
<button id="reset-box-button"> <button id="reset-box-button">

45
toolkit/content/aboutUrlClassifier.css
Просмотреть файл

@ -2,14 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
html { @import url("chrome://global/skin/in-content/info-pages.css");
--aboutUrlClassifier-table-background: #ebebeb;
background-color: var(--in-content-page-background);
}
body {
margin: 40px 48px;
}
.major-section { .major-section {
margin-top: 2em; margin-top: 2em;
@ -19,41 +12,6 @@ body {
font-weight: bold; font-weight: bold;
} }
table {
background-color: var(--aboutUrlClassifier-table-background);
color: var(--in-content-text-color);
font: message-box;
text-align: start;
width: 100%;
border: 1px solid var(--in-content-border-color);
border-spacing: 0px;
}
th, td {
border: 1px solid var(--in-content-border-color);
padding: 4px;
}
thead th {
text-align: center;
}
th {
text-align: start;
background-color: var(--in-content-table-header-background);
color: var(--in-content-selected-text);
}
th.column {
white-space: nowrap;
width: 0px;
}
td {
text-align: start;
border-color: var(--in-content-table-border-dark-color);
}
#provider-table > tbody > tr > td:last-child { #provider-table > tbody > tr > td:last-child {
text-align: center; text-align: center;
} }
@ -73,4 +31,5 @@ td {
button { button {
margin-inline-start: 0; margin-inline-start: 0;
margin-inline-end: 8px; margin-inline-end: 8px;
padding: 3px;
} }

3
toolkit/content/aboutUrlClassifier.xhtml
Просмотреть файл

@ -14,12 +14,11 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>&aboutUrlClassifier.title;</title> <title>&aboutUrlClassifier.title;</title>
<link rel="stylesheet" href="chrome://global/skin/in-content/common.css" type="text/css"/>
<link rel="stylesheet" href="chrome://global/content/aboutUrlClassifier.css" type="text/css"/> <link rel="stylesheet" href="chrome://global/content/aboutUrlClassifier.css" type="text/css"/>
<script type="text/javascript" src="chrome://global/content/aboutUrlClassifier.js"></script> <script type="text/javascript" src="chrome://global/content/aboutUrlClassifier.js"></script>
</head> </head>
<body onload="onLoad()" class="aboutPageWideContainer"> <body onload="onLoad()" class="wide-container">
<h1>&aboutUrlClassifier.title;</h1> <h1>&aboutUrlClassifier.title;</h1>
<div id="provider"> <div id="provider">
<h2 class="major-section">&aboutUrlClassifier.providerTitle;</h2> <h2 class="major-section">&aboutUrlClassifier.providerTitle;</h2>

45
toolkit/themes/shared/aboutProfiles.css
Просмотреть файл

@ -2,14 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
html { @import url("chrome://global/skin/in-content/info-pages.css");
--aboutProfiles-table-background: #ebebeb;
background-color: var(--in-content-page-background);
}
body {
margin: 40px 48px;
}
.page-subtitle { .page-subtitle {
margin-bottom: 3em; margin-bottom: 3em;
@ -18,49 +11,15 @@ body {
button { button {
margin-inline-start: 0; margin-inline-start: 0;
margin-inline-end: 8px; margin-inline-end: 8px;
} padding: 3px;
table {
background-color: var(--aboutProfiles-table-background);
color: var(--in-content-text-color);
font: message-box;
text-align: start;
width: 100%;
border: 1px solid var(--in-content-border-color);
border-spacing: 0px;
}
th, td {
border: 1px solid var(--in-content-border-color);
padding: 4px;
text-align: start;
}
th {
background-color: var(--in-content-table-header-background);
color: var(--in-content-selected-text);
}
th.column {
white-space: nowrap;
width: 0px;
}
td {
border-color: var(--in-content-table-border-dark-color);
unicode-bidi: plaintext; /* Make sure file paths will be LTR */
} }
#action-box { #action-box {
background-color: var(--aboutProfiles-table-background);
border: 1px solid var(--in-content-border-color);
color: var(--in-content-text-color);
float: right; float: right;
margin-top: 2em; margin-top: 2em;
margin-bottom: 20px; margin-bottom: 20px;
margin-inline-start: 20px; margin-inline-start: 20px;
margin-inline-end: 0; margin-inline-end: 0;
padding: 16px;
width: 30%; width: 30%;
} }

53
toolkit/themes/shared/aboutSupport.css
Просмотреть файл

@ -2,14 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
html { @import url("chrome://global/skin/in-content/info-pages.css");
--aboutSupport-table-background: #ebebeb;
background-color: var(--in-content-page-background);
}
body {
margin: 40px 48px;
}
.page-subtitle { .page-subtitle {
margin-bottom: 3em; margin-bottom: 3em;
@ -26,31 +19,7 @@ body {
button { button {
margin-inline-start: 0; margin-inline-start: 0;
margin-inline-end: 8px; margin-inline-end: 8px;
} padding: 3px;
table {
background-color: var(--aboutSupport-table-background);
color: var(--in-content-text-color);
font: message-box;
text-align: start;
width: 100%;
border: 1px solid var(--in-content-border-color);
border-spacing: 0px;
}
th, td {
border: 1px solid var(--in-content-border-color);
padding: 4px;
}
thead th {
text-align: center;
}
th {
text-align: start;
background-color: var(--in-content-table-header-background);
color: var(--in-content-selected-text);
} }
th.title-column { th.title-column {
@ -59,16 +28,6 @@ th.title-column {
font-size: medium; font-size: medium;
} }
th.column {
white-space: nowrap;
width: 0px;
}
td {
text-align: start;
border-color: var(--in-content-table-border-dark-color);
}
td.integer { td.integer {
text-align: end; text-align: end;
font-family: monospace; font-family: monospace;
@ -92,15 +51,11 @@ td.integer {
} }
#action-box { #action-box {
background-color: var(--aboutSupport-table-background);
border: 1px solid var(--in-content-border-color);
color: var(--in-content-text-color);
float: right; float: right;
margin-top: 2em; margin-top: 2em;
margin-bottom: 20px; margin-bottom: 20px;
margin-inline-start: 20px; margin-inline-start: 20px;
margin-inline-end: 0; margin-inline-end: 0;
padding: 16px;
width: 30%; width: 30%;
} }
@ -127,10 +82,6 @@ td.integer {
overflow: auto; overflow: auto;
} }
.block {
display: block;
}
.hidden { .hidden {
display: none; display: none;
} }

1
toolkit/themes/shared/in-content/common.inc.css
Просмотреть файл

@ -38,6 +38,7 @@
--in-content-primary-button-background: #0a84ff; --in-content-primary-button-background: #0a84ff;
--in-content-primary-button-background-hover: #0060df; --in-content-primary-button-background-hover: #0060df;
--in-content-primary-button-background-active: #003EAA; --in-content-primary-button-background-active: #003EAA;
--in-content-table-background: #ebebeb;
--in-content-table-border-dark-color: #d1d1d1; --in-content-table-border-dark-color: #d1d1d1;
--in-content-table-header-background: #0a84ff; --in-content-table-header-background: #0a84ff;
} }

48
toolkit/themes/shared/in-content/info-pages.inc.css
Просмотреть файл

@ -20,6 +20,10 @@ body {
justify-content: center; justify-content: center;
} }
body.wide-container {
display: block;
}
.container { .container {
min-width: var(--in-content-container-min-width); min-width: var(--in-content-container-min-width);
max-width: var(--in-content-container-max-width); max-width: var(--in-content-container-max-width);
@ -122,9 +126,51 @@ tree {
width: 100%; width: 100%;
} }
/* Illustrated Info Pages */ /* Tables */
table {
background-color: var(--in-content-table-background);
color: var(--in-content-text-color);
font: message-box;
text-align: start;
width: 100%;
border: 1px solid var(--in-content-border-color);
border-spacing: 0px;
}
th, td {
border: 1px solid var(--in-content-border-color);
padding: 4px;
text-align: start;
}
thead th {
text-align: center;
}
th {
background-color: var(--in-content-table-header-background);
color: var(--in-content-selected-text);
}
th.column {
white-space: nowrap;
width: 0px;
}
td {
border-color: var(--in-content-table-border-dark-color);
unicode-bidi: plaintext; /* Make sure file paths will be LTR */
}
/* Illustrated Info Pages */
.illustrated .title { .illustrated .title {
margin-inline-start: 0; margin-inline-start: 0;
padding-inline-start: 0; padding-inline-start: 0;
} }
.notice-box {
background-color: var(--in-content-table-background);
border: 1px solid var(--in-content-border-color);
color: var(--in-content-text-color);
padding: 16px;
}