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

Bug 1087618 - Part 5: Update about:welcomeback, sessionrestore, tabcrashed stylesheets. r=jaws

This commit is contained in:
Tim Nguyen 2015-01-18 10:24:00 -05:00
Родитель 4595446ad1
Коммит dea5cd9502
16 изменённых файлов: 99 добавлений и 473 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

85
browser/themes/linux/aboutSessionRestore.css
Просмотреть файл

@ -1,85 +0,0 @@
%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
html {
height: 100%;
}
body {
height: 100%;
text-align: center;
}
#errorPageContainer {
background-image: url("moz-icon://stock/gtk-dialog-warning?size=dialog");
display: -moz-box;
width: -moz-available;
height: 70%;
-moz-box-orient: vertical;
text-align: start;
}
#errorShortDesc > p {
margin-top: 0.4em;
margin-bottom: 0;
}
#errorLongContent, #errorTrailerDesc {
display: -moz-box;
-moz-box-flex: 1;
-moz-box-orient: vertical;
}
#tabList {
margin-top: 2.5em;
width: 100%;
min-height: 12em;
}
treechildren::-moz-tree-image(icon),
treechildren::-moz-tree-image(noicon) {
padding-right: 2px;
margin: 0px 2px;
width: 16px;
height: 16px;
}
treechildren::-moz-tree-image(noicon) {
list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
}
treechildren::-moz-tree-image(container, noicon) {
list-style-image: url("chrome://browser/skin/aboutSessionRestore-window-icon.png");
}
treechildren::-moz-tree-image(checked) {
list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
}
treechildren::-moz-tree-image(partial) {
list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif");
}
/* undo odd row highlighting from tree.css */
treechildren::-moz-tree-row(odd) {
background-color: transparent;
}
treechildren::-moz-tree-row(odd, selected, focus) {
background-color: Highlight;
}
/* highlight "windows" instead */
treechildren::-moz-tree-row(alternate) {
background-color: -moz-oddtreerow;
}
treechildren::-moz-tree-row(alternate, selected) {
background-color: Highlight;
}
#buttons {
-moz-margin-start: 80px; /* same as #errorLongContent in netError.css */
}
#buttons > button {
margin-top: 2em;
-moz-margin-start: 5px;
}

4
browser/themes/linux/jar.mn
Просмотреть файл

@ -6,7 +6,7 @@ browser.jar:
% skin browser classic/1.0 %skin/classic/browser/
% override chrome://global/skin/icons/warning-16.png moz-icon://stock/gtk-dialog-warning?size=menu
skin/classic/browser/sanitizeDialog.css
* skin/classic/browser/aboutSessionRestore.css
* skin/classic/browser/aboutSessionRestore.css (../shared/aboutSessionRestore.css)
skin/classic/browser/aboutSessionRestore-window-icon.png
skin/classic/browser/aboutWelcomeBack.css (../shared/aboutWelcomeBack.css)
skin/classic/browser/aboutCertError.css
@ -21,7 +21,7 @@ browser.jar:
#ifdef MOZ_SERVICES_SYNC
skin/classic/browser/aboutSyncTabs.css
#endif
skin/classic/browser/aboutTabCrashed.css
skin/classic/browser/aboutTabCrashed.css (../shared/aboutTabCrashed.css)
skin/classic/browser/actionicon-tab.png
* skin/classic/browser/browser.css
* skin/classic/browser/devedition.css

69
browser/themes/osx/aboutSessionRestore.css
Просмотреть файл

@ -1,69 +0,0 @@
%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
html {
height: 100%;
}
body {
height: 100%;
text-align: center;
}
#errorPageContainer {
background-image: url("chrome://global/skin/icons/warning-64.png");
display: -moz-box;
width: -moz-available;
height: 70%;
-moz-box-orient: vertical;
text-align: start;
}
#errorShortDesc > p {
margin-top: 0.4em;
margin-bottom: 0;
}
#errorLongContent, #errorTrailerDesc {
display: -moz-box;
-moz-box-flex: 1;
-moz-box-orient: vertical;
}
#tabList {
margin-top: 2.5em;
width: 100%;
min-height: 12em;
}
treechildren::-moz-tree-image(icon),
treechildren::-moz-tree-image(noicon) {
padding-right: 2px;
margin: 0px 2px;
width: 16px;
height: 16px;
}
treechildren::-moz-tree-image(noicon) {
list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
}
treechildren::-moz-tree-image(container, noicon) {
list-style-image: url("chrome://browser/skin/aboutSessionRestore-window-icon.png");
}
treechildren::-moz-tree-image(checked) {
list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
}
treechildren::-moz-tree-image(partial) {
list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif");
}
#buttons {
-moz-margin-start: 80px; /* same as #errorLongContent in netError.css */
}
#buttons > button {
margin-top: 2em;
-moz-margin-start: 6px;
}

108
browser/themes/osx/aboutTabCrashed.css
Просмотреть файл

@ -1,108 +0,0 @@
body {
background-color: rgb(241, 244, 248);
margin-top: 2em;
font: message-box;
font-size: 100%;
}
p {
font-size: .8em;
}
#error-box {
background: url('chrome://global/skin/icons/information-24.png') no-repeat left 4px;
-moz-padding-start: 30px;
}
#error-box:-moz-locale-dir(rtl) {
background-position: right 4px;
}
#main-error-msg {
color: #4b4b4b;
font-weight: bold;
}
#report-box {
text-align: center;
width: 75%;
margin: 0 auto;
display: none;
}
.crashDumpAvailable #report-box {
display: block
}
#button-box {
text-align: center;
width: 75%;
margin: 0 auto;
}
@media all and (min-width: 300px) {
#error-box {
max-width: 50%;
margin: 0 auto;
background-image: url('chrome://global/skin/icons/information-32.png');
min-height: 36px;
-moz-padding-start: 38px;
}
button {
width: auto !important;
min-width: 150px;
}
}
@media all and (min-width: 780px) {
#error-box {
max-width: 30%;
}
}
button {
font: message-box;
font-size: 0.6875em;
-moz-appearance: none;
-moz-user-select: none;
width: 100%;
margin: 2px 0;
padding: 2px 6px;
line-height: 1.2;
background-color: hsla(210,30%,95%,.1);
background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
background-clip: padding-box;
border: 1px solid hsla(210,15%,25%,.4);
border-color: hsla(210,15%,25%,.3) hsla(210,15%,25%,.35) hsla(210,15%,25%,.4);
border-radius: 3px;
box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
0 0 0 1px hsla(0,0%,100%,.3) inset,
0 1px 0 hsla(0,0%,100%,.1);
transition-property: background-color, border-color, box-shadow;
transition-duration: 150ms;
transition-timing-function: ease;
}
button:hover {
background-color: hsla(210,30%,95%,.8);
border-color: hsla(210,15%,25%,.45) hsla(210,15%,25%,.5) hsla(210,15%,25%,.55);
box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
0 0 0 1px hsla(0,0%,100%,.3) inset,
0 1px 0 hsla(0,0%,100%,.1),
0 0 3px hsla(210,15%,25%,.1);
transition-property: background-color, border-color, box-shadow;
transition-duration: 150ms;
transition-timing-function: ease;
}
button:hover:active {
background-color: hsla(210,15%,25%,.2);
box-shadow: 0 1px 1px hsla(210,15%,25%,.2) inset,
0 0 2px hsla(210,15%,25%,.4) inset;
transition-property: background-color, border-color, box-shadow;
transition-duration: 10ms;
transition-timing-function: linear;
}

4
browser/themes/osx/jar.mn
Просмотреть файл

@ -8,7 +8,7 @@ browser.jar:
skin/classic/browser/aboutNetError.css (../shared/aboutNetError.css)
skin/classic/browser/aboutNetError_info.svg (../shared/aboutNetError_info.svg)
skin/classic/browser/aboutNetError_alert.svg (../shared/aboutNetError_alert.svg)
* skin/classic/browser/aboutSessionRestore.css (aboutSessionRestore.css)
* skin/classic/browser/aboutSessionRestore.css (../shared/aboutSessionRestore.css)
skin/classic/browser/aboutSessionRestore-window-icon.png
skin/classic/browser/aboutWelcomeBack.css (../shared/aboutWelcomeBack.css)
skin/classic/browser/aboutCertError.css
@ -20,7 +20,7 @@ browser.jar:
#ifdef MOZ_SERVICES_SYNC
skin/classic/browser/aboutSyncTabs.css
#endif
skin/classic/browser/aboutTabCrashed.css
skin/classic/browser/aboutTabCrashed.css (../shared/aboutTabCrashed.css)
skin/classic/browser/actionicon-tab.png
skin/classic/browser/actionicon-tab@2x.png
* skin/classic/browser/browser.css (browser.css)

38
browser/themes/shared/aboutSessionRestore.css Normal file
Просмотреть файл

@ -0,0 +1,38 @@
%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
.title {
background-image: url("chrome://browser/skin/session-restore.svg");
}
treechildren::-moz-tree-image(icon),
treechildren::-moz-tree-image(noicon) {
padding-right: 2px;
margin: 0px 2px;
width: 16px;
height: 16px;
}
treechildren::-moz-tree-image(noicon) {
list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
}
treechildren::-moz-tree-image(container, noicon) {
list-style-image: url("chrome://browser/skin/aboutSessionRestore-window-icon.png");
}
treechildren::-moz-tree-image(checked) {
list-style-image: url("chrome://global/skin/in-content/check.svg#check");
}
treechildren::-moz-tree-image(checked, selected) {
list-style-image: url("chrome://global/skin/in-content/check.svg#check-inverted");
}
treechildren::-moz-tree-image(partial) {
list-style-image: url("chrome://global/skin/in-content/check-partial.svg#check-partial");
}
treechildren::-moz-tree-image(partial, selected) {
list-style-image: url("chrome://global/skin/in-content/check-partial.svg#check-partial-inverted");
}

11
browser/themes/shared/aboutTabCrashed.css Normal file
Просмотреть файл

@ -0,0 +1,11 @@
.title {
background-image: url("chrome://browser/skin/tab-crashed.svg");
}
#report-box {
display: none;
}
.crashDumpAvailable #report-box {
display: block
}

32
browser/themes/shared/aboutWelcomeBack.css
Просмотреть файл

@ -2,9 +2,12 @@
* 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/. */
#errorPageContainer {
background-image: url("chrome://global/skin/icons/information-64.png");
height: auto;
.title {
background-image: url("chrome://browser/skin/welcome-back.svg");
}
.radioRestoreContainer:not(:last-child) {
margin-bottom: 0.2em;
}
/* tablist starts out hidden, but JS may make it visible in response to
@ -17,26 +20,3 @@
#tabList[available] {
display: -moz-box;
}
.radioRestoreContainer {
display: flex;
}
.radioRestoreButton {
flex: 0 0 auto;
}
.radioRestoreButton:-moz-focusring {
outline: 1px dotted black;
}
.radioChooseLabel {
flex: 1 1 auto;
}
/* We want errorTrailerDesc to have the same padding-top as errorShortDesc
has padding-bottom
*/
#errorTrailerDesc {
padding-top: 1em;
}

68
browser/themes/windows/aboutSessionRestore.css
Просмотреть файл

@ -1,68 +0,0 @@
%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
html {
height: 100%;
}
body {
height: 100%;
text-align: center;
}
#errorPageContainer {
background-image: url("chrome://global/skin/icons/warning-large.png");
display: -moz-box;
width: -moz-available;
height: 70%;
-moz-box-orient: vertical;
text-align: start;
}
#errorShortDesc > p {
margin-top: 0.4em;
margin-bottom: 0;
}
#errorLongContent, #errorTrailerDesc {
display: -moz-box;
-moz-box-flex: 1;
-moz-box-orient: vertical;
}
#tabList {
margin-top: 2.5em;
width: 100%;
min-height: 12em;
}
treechildren::-moz-tree-image(icon),
treechildren::-moz-tree-image(noicon) {
padding-right: 2px;
margin: 0px 2px;
width: 16px;
height: 16px;
}
treechildren::-moz-tree-image(noicon) {
list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
}
treechildren::-moz-tree-image(container, noicon) {
list-style-image: url("chrome://browser/skin/aboutSessionRestore-window-icon.png");
}
treechildren::-moz-tree-image(checked) {
list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
}
treechildren::-moz-tree-image(partial) {
list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif");
}
#buttons {
width: 100%;
}
#buttons > button {
margin-top: 2em;
}

108
browser/themes/windows/aboutTabCrashed.css
Просмотреть файл

@ -1,108 +0,0 @@
body {
background-color: rgb(241, 244, 248);
margin-top: 2em;
font: message-box;
font-size: 100%;
}
p {
font-size: .8em;
}
#error-box {
background: url('chrome://global/skin/icons/information-24.png') no-repeat left 4px;
-moz-padding-start: 30px;
}
#error-box:-moz-locale-dir(rtl) {
background-position: right 4px;
}
#main-error-msg {
color: #4b4b4b;
font-weight: bold;
}
#report-box {
text-align: center;
width: 75%;
margin: 0 auto;
display: none;
}
.crashDumpAvailable #report-box {
display: block
}
#button-box {
text-align: center;
width: 75%;
margin: 0 auto;
}
@media all and (min-width: 300px) {
#error-box {
max-width: 50%;
margin: 0 auto;
background-image: url('chrome://global/skin/icons/information-32.png');
min-height: 36px;
-moz-padding-start: 38px;
}
button {
width: auto !important;
min-width: 150px;
}
}
@media all and (min-width: 780px) {
#error-box {
max-width: 30%;
}
}
button {
font: message-box;
font-size: 0.6875em;
-moz-appearance: none;
-moz-user-select: none;
width: 100%;
margin: 2px 0;
padding: 2px 6px;
line-height: 1.2;
background-color: hsla(210,30%,95%,.1);
background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
background-clip: padding-box;
border: 1px solid hsla(210,15%,25%,.4);
border-color: hsla(210,15%,25%,.3) hsla(210,15%,25%,.35) hsla(210,15%,25%,.4);
border-radius: 3px;
box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
0 0 0 1px hsla(0,0%,100%,.3) inset,
0 1px 0 hsla(0,0%,100%,.1);
transition-property: background-color, border-color, box-shadow;
transition-duration: 150ms;
transition-timing-function: ease;
}
button:hover {
background-color: hsla(210,30%,95%,.8);
border-color: hsla(210,15%,25%,.45) hsla(210,15%,25%,.5) hsla(210,15%,25%,.55);
box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
0 0 0 1px hsla(0,0%,100%,.3) inset,
0 1px 0 hsla(0,0%,100%,.1),
0 0 3px hsla(210,15%,25%,.1);
transition-property: background-color, border-color, box-shadow;
transition-duration: 150ms;
transition-timing-function: ease;
}
button:hover:active {
background-color: hsla(210,15%,25%,.2);
box-shadow: 0 1px 1px hsla(210,15%,25%,.2) inset,
0 0 2px hsla(210,15%,25%,.4) inset;
transition-property: background-color, border-color, box-shadow;
transition-duration: 10ms;
transition-timing-function: linear;
}

8
browser/themes/windows/jar.mn
Просмотреть файл

@ -8,7 +8,7 @@ browser.jar:
# NOTE: If you add a new file here, you'll need to add it to the aero
# section at the bottom of this file
skin/classic/browser/sanitizeDialog.css
* skin/classic/browser/aboutSessionRestore.css
* skin/classic/browser/aboutSessionRestore.css (../shared/aboutSessionRestore.css)
skin/classic/browser/aboutSessionRestore-window-icon.png (preferences/application.png)
skin/classic/browser/aboutWelcomeBack.css (../shared/aboutWelcomeBack.css)
skin/classic/browser/aboutCertError.css
@ -23,7 +23,7 @@ browser.jar:
#ifdef MOZ_SERVICES_SYNC
skin/classic/browser/aboutSyncTabs.css
#endif
skin/classic/browser/aboutTabCrashed.css
skin/classic/browser/aboutTabCrashed.css (../shared/aboutTabCrashed.css)
skin/classic/browser/actionicon-tab.png
* skin/classic/browser/browser.css
* skin/classic/browser/devedition.css
@ -466,7 +466,7 @@ browser.jar:
browser.jar:
% skin browser classic/1.0 %skin/classic/aero/browser/ os=WINNT osversion>=6
skin/classic/aero/browser/sanitizeDialog.css (sanitizeDialog.css)
* skin/classic/aero/browser/aboutSessionRestore.css (aboutSessionRestore.css)
* skin/classic/aero/browser/aboutSessionRestore.css (../shared/aboutSessionRestore.css)
skin/classic/aero/browser/aboutSessionRestore-window-icon.png (aboutSessionRestore-window-icon-aero.png)
skin/classic/aero/browser/aboutCertError.css
skin/classic/aero/browser/aboutCertError_sectionCollapsed.png
@ -480,7 +480,7 @@ browser.jar:
#ifdef MOZ_SERVICES_SYNC
skin/classic/aero/browser/aboutSyncTabs.css
#endif
skin/classic/aero/browser/aboutTabCrashed.css
skin/classic/aero/browser/aboutTabCrashed.css (../shared/aboutTabCrashed.css)
skin/classic/aero/browser/aboutWelcomeBack.css (../shared/aboutWelcomeBack.css)
skin/classic/aero/browser/actionicon-tab.png
* skin/classic/aero/browser/browser.css (browser-aero.css)

1
toolkit/themes/linux/global/jar.mn
Просмотреть файл

@ -58,6 +58,7 @@ toolkit.jar:
* skin/classic/global/in-content/common.css (in-content/common.css)
* skin/classic/global/in-content/info-pages.css (in-content/info-pages.css)
skin/classic/global/in-content/check.svg (../../shared/in-content/check.svg)
skin/classic/global/in-content/check-partial.svg (../../shared/in-content/check-partial.svg)
skin/classic/global/in-content/dropdown.svg (../../shared/in-content/dropdown.svg)
skin/classic/global/in-content/help-glyph.svg (../../shared/in-content/help-glyph.svg)
skin/classic/global/in-content/radio.svg (../../shared/in-content/radio.svg)

1
toolkit/themes/osx/global/jar.mn
Просмотреть файл

@ -189,6 +189,7 @@ toolkit.jar:
* skin/classic/global/in-content/common.css (in-content/common.css)
* skin/classic/global/in-content/info-pages.css (in-content/info-pages.css)
skin/classic/global/in-content/check.svg (../../shared/in-content/check.svg)
skin/classic/global/in-content/check-partial.svg (../../shared/in-content/check-partial.svg)
skin/classic/global/in-content/dropdown.svg (../../shared/in-content/dropdown.svg)
skin/classic/global/in-content/help-glyph.svg (../../shared/in-content/help-glyph.svg)
skin/classic/global/in-content/radio.svg (../../shared/in-content/radio.svg)

31
toolkit/themes/shared/in-content/check-partial.svg Normal file
Просмотреть файл

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<svg xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
x="0"
y="0"
width="21"
height="21"
viewBox="0 0 21 21">
<style>
use:not(:target) {
display: none;
}
use {
fill: #2292d0;
}
use[id$="-inverted"] {
fill: #fff;
stroke: #0095dd;
stroke-width: 0.5;
}
use[id$="-native"] {
fill: -moz-dialogText;
}
</style>
<defs style="display: none;">
<rect id="check-shape" x="3" y="9" width="15" height="3"/>
</defs>
<use id="check-partial" xlink:href="#check-shape"/>
<use id="check-partial-inverted" xlink:href="#check-shape"/>
<use id="check-partial-native" xlink:href="#check-shape"/>
</svg>
Режим "рядом"

После

Ширина:  |  Высота:  |  Размер: 764 B

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

@ -24,6 +24,7 @@ html|h1 {
font-size: 2.5em;
font-weight: lighter;
line-height: 1.2;
color: #333;
margin: 0;
margin-bottom: .5em;
}
@ -384,7 +385,6 @@ xul|textbox[disabled="true"] {
html|a,
xul|*.text-link,
xul|*.inline-link {
font-size: 1.25rem;
line-height: 22px;
color: #0095dd;
text-decoration: none;

2
toolkit/themes/windows/global/jar.mn
Просмотреть файл

@ -174,6 +174,7 @@ toolkit.jar:
* skin/classic/global/in-content/common.css (in-content/common.css)
* skin/classic/global/in-content/info-pages.css (in-content/info-pages.css)
skin/classic/global/in-content/check.svg (../../shared/in-content/check.svg)
skin/classic/global/in-content/check-partial.svg (../../shared/in-content/check-partial.svg)
skin/classic/global/in-content/dropdown.svg (../../shared/in-content/dropdown.svg)
skin/classic/global/in-content/help-glyph.svg (../../shared/in-content/help-glyph.svg)
skin/classic/global/in-content/radio.svg (../../shared/in-content/radio.svg)
@ -368,6 +369,7 @@ toolkit.jar:
* skin/classic/aero/global/in-content/common.css (in-content/common.css)
* skin/classic/aero/global/in-content/info-pages.css (in-content/info-pages.css)
skin/classic/aero/global/in-content/check.svg (../../shared/in-content/check.svg)
skin/classic/aero/global/in-content/check-partial.svg (../../shared/in-content/check-partial.svg)
skin/classic/aero/global/in-content/dropdown.svg (../../shared/in-content/dropdown.svg)
skin/classic/aero/global/in-content/help-glyph.svg (../../shared/in-content/help-glyph.svg)
skin/classic/aero/global/in-content/radio.svg (../../shared/in-content/radio.svg)