Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 14:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1000625 - Merge xul and html common.css rules and update netError to match style. r=jaws, r=Unfocused, ui-r=mmaslaney

Browse Source 
--HG--
extra : rebase_source : 630aa57db4f5aa188076651741357d6cde87f2ed
This commit is contained in:
Valentin Tsatskin 2014-08-07 12:56:35 +02:00
parent 2199bd75e8
commit b1eb2d2892
2 changed files with 8 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
browser/base/content/aboutneterror/netError.css
View File

@ -60,14 +60,6 @@ ul {
}
}
/* common.css overrides */
button {
font-size: 1em;
min-width: 150px;
}
/* Pressing the retry button will cause the cursor to flicker from a pointer to
* not-allowed. Override the disabled cursor behaviour since we will never show
* the button disabled as the initial state. */

42
browser/themes/shared/in-content/common.inc.css
View File

@ -5,7 +5,9 @@
%endif
@namespace html "http://www.w3.org/1999/xhtml";
html|body,
page {
font: message-box;
-moz-appearance: none;
background-color: #f1f1f1;
color: #424e5a;
@ -21,12 +23,9 @@ treecol {
}
html|body {
font: message-box;
font-size: 15px;
font-weight: normal;
margin: 0;
color: #424e5a;
background-color: #f1f1f1;
}
html|h1 {
@ -128,38 +127,9 @@ tab[selected] {
/* html buttons */
html|button {
line-height: 20px;
height: 30px;
max-height: 30px;
padding: 3px;
color: #333333;
border: 1px solid rgba(23,50,77,.4);
border-radius: 5px;
background-color: #f1f1f1;
background-image: linear-gradient(#fff, rgba(255,255,255,.1));
box-shadow: 0 1px 1px 0 #fff, inset 0 2px 2px 0 #fff;
text-shadow: 0 1px 1px #fefffe;
-moz-appearance: none;
-moz-border-top-colors: none !important;
-moz-border-right-colors: none !important;
-moz-border-bottom-colors: none !important;
-moz-border-left-colors: none !important;
}
html|button:enabled:hover {
background-image: linear-gradient(#fff, rgba(255,255,255,.6));
}
html|button:enabled:hover:active {
background-image: linear-gradient(rgba(255,255,255,.1), rgba(255,255,255,.6));
}
html|button:disabled {
cursor: not-allowed;
color: rgba(115,121,128,.5);
border-color: rgba(23,50,77,.25);
background-image: linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,.1));
text-shadow: 0 1px 1px #fff;
/* override forms.css */
font-size: inherit;
}
/* xul buttons and menulists */
@ -181,21 +151,25 @@ menulist {
background-color: #FBFBFB;
}
html|button:enabled:hover,
button:not([disabled="true"]):hover,
colorpicker[type="button"]:not([disabled="true"]):hover,
menulist:not([disabled="true"]):hover {
background-color: #EBEBEB;
}
html|button:enabled:hover:active,
button:not([disabled="true"]):hover:active,
colorpicker[type="button"]:not([disabled="true"]):hover:active,
menulist[open="true"]:not([disabled="true"]) {
background-color: #DADADA;
}
html|button:disabled,
button[disabled="true"],
colorpicker[type="button"][disabled="true"],
menulist[disabled="true"] {
cursor: not-allowed;
opacity: 0.5;
}