Skip to content
This repository has been archived by the owner on Oct 28, 2019. It is now read-only.

Commit

Permalink
Rebase on Firefox 38.0.1
Browse files Browse the repository at this point in the history
Conflicts:

* theme/shared/browser/aboutSessionRestore.css
* theme/shared/browser/aboutTabCrashed.css
* theme/shared/browser/browser.css
* theme/shared/browser/downloads/downloads.css
* theme/shared/browser/preferences/in-content/preferences.css
* theme/shared/global/config.css
* theme/shared/global/in-content/common.css
  • Loading branch information
seleznev committed May 17, 2015
1 parent f364e49 commit eb7373f
Show file tree
Hide file tree
Showing 63 changed files with 2,278 additions and 541 deletions.
4 changes: 2 additions & 2 deletions config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": "35.1",
"min-version": "37.0",
"max-version": "40.0a1",
"min-version": "38.0",
"max-version": "41.0a1",
"theme": {
"xpi": "gnome-firefox-theme.xpi"
},
Expand Down
File renamed without changes.
69 changes: 11 additions & 58 deletions theme/shared/browser/aboutSessionRestore.css
Original file line number Diff line number Diff line change
@@ -1,43 +1,12 @@

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;
.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;
margin: 0 2px;
width: 16px;
height: 16px;
}
Expand All @@ -48,33 +17,17 @@ treechildren::-moz-tree-image(noicon) {
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-image(checked) {
list-style-image: url("chrome://global/skin/in-content/check.svg#check");
}
treechildren::-moz-tree-row(alternate, selected) {
background-color: Highlight;
treechildren::-moz-tree-image(checked, selected) {
list-style-image: url("chrome://global/skin/in-content/check.svg#check-inverted");
}

#buttons {
-moz-margin-start: 80px; /* same as #errorLongContent in netError.css */
treechildren::-moz-tree-image(partial) {
list-style-image: url("chrome://global/skin/in-content/check-partial.svg#check-partial");
}
#buttons > button {
margin-top: 2em;
-moz-margin-start: 5px;
treechildren::-moz-tree-image(partial, selected) {
list-style-image: url("chrome://global/skin/in-content/check-partial.svg#check-partial-inverted");
}
109 changes: 6 additions & 103 deletions theme/shared/browser/aboutTabCrashed.css
Original file line number Diff line number Diff line change
@@ -1,108 +1,11 @@
body {
background-color: rgb(241, 244, 248);
margin-top: 2em;
font: message-box;
font-size: 100%;
}

p {
font-size: .8em;
}
/* 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/. */

#error-box {
background: url('chrome://global/skin/icons/information-24.png') no-repeat left 4px;
-moz-padding-start: 30px;
.title {
background-image: url("chrome://browser/skin/tab-crashed.svg");
}

#error-box:-moz-locale-dir(rtl) {
background-position: right 4px;
}

#main-error-msg {
color: #4b4b4b;
#reportSent {
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;
}
43 changes: 26 additions & 17 deletions theme/shared/browser/aboutWelcomeBack.css
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -18,25 +21,31 @@
display: -moz-box;
}

.radioRestoreContainer {
display: flex;
treechildren::-moz-tree-image(icon),
treechildren::-moz-tree-image(noicon) {
padding-right: 2px;
margin: 0 2px;
width: 16px;
height: 16px;
}

.radioRestoreButton {
flex: 0 0 auto;
treechildren::-moz-tree-image(noicon) {
list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
}

.radioRestoreButton:-moz-focusring {
outline: 1px dotted black;
treechildren::-moz-tree-image(container, noicon) {
list-style-image: url("chrome://browser/skin/aboutSessionRestore-window-icon.png");
}

.radioChooseLabel {
flex: 1 1 auto;
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");
}

/* We want errorTrailerDesc to have the same padding-top as errorShortDesc
has padding-bottom
*/
#errorTrailerDesc {
padding-top: 1em;
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");
}
Loading

3 comments on commit eb7373f

@seleznev
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just added changes between 37.0.1 and 38.0.1 with git cherry-pick. I didn't read code and didn't any tests.

@neitsab
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just compiled it and it works great, thanks.

edit: I'm using the default Arch package which is FF 38.0.1 x64. Extension and theme both works well, multiple windows etc. (also with HTitle)

@garrett
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've tested it here with preferences (works fine, but should probably be reskinned), developer tools (appears to work correctly), and general UI (everything I've tried has been fine.

Making a release now. (If there's anything that needs fixing, we can release a 38.2 later.)

Please sign in to comment.