mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-04-01 12:03:08 +00:00
Bug 892449 - Merge forms.css into platform.css. r=mbrubeck
This commit is contained in:
Jim Mathies
parent
94ffbce5e5
commit
ab8f2fb997
@ -6,7 +6,6 @@
|
||||
|
||||
<?xml-stylesheet href="chrome://browser/skin/platform.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://browser/skin/browser.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://browser/skin/forms.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://browser/skin/cssthrobber.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://browser/skin/tiles.css" type="text/css"?>
|
||||
|
||||
@ -1,156 +0,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/. */
|
||||
|
||||
%filter substitution
|
||||
%include defines.inc
|
||||
|
||||
/* Find bar ------------------------------------------------------------- */
|
||||
|
||||
#content-navigator {
|
||||
background-color: @metro_orange@;
|
||||
padding: 0;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
#content-navigator > toolbar {
|
||||
min-height: @findbar_height@ !important;
|
||||
}
|
||||
|
||||
#content-navigator > .previous-button,
|
||||
#content-navigator > .next-button,
|
||||
#content-navigator > .close-button {
|
||||
list-style-image: url(chrome://browser/skin/images/appbar-icons.png);
|
||||
min-width: @touch_button_small@ !important; /* button size */
|
||||
min-height: @touch_button_small@ !important; /* button size */
|
||||
border: none !important;
|
||||
background-image: none !important;
|
||||
background-color: inherit !important;
|
||||
pointer-events: auto;
|
||||
-moz-user-focus: ignore !important;
|
||||
margin: 0 @margin_normal@ !important;
|
||||
}
|
||||
|
||||
#content-navigator > .close-button {
|
||||
-moz-margin-start: 0;
|
||||
-moz-image-region: rect(0px, 480px, 40px, 440px);
|
||||
}
|
||||
|
||||
#content-navigator > .close-button:hover {
|
||||
-moz-image-region: rect(40px, 480px, 80px, 440px);
|
||||
}
|
||||
|
||||
#content-navigator > .close-button:active {
|
||||
-moz-image-region: rect(80px, 480px, 120px, 440px);
|
||||
}
|
||||
|
||||
#content-navigator > .previous-button {
|
||||
-moz-margin-end: 0;
|
||||
-moz-image-region: rect(0px, 400px, 40px, 360px);
|
||||
}
|
||||
|
||||
#content-navigator > .previous-button:hover {
|
||||
-moz-image-region: rect(40px, 400px, 80px, 360px);
|
||||
}
|
||||
|
||||
#content-navigator > .previous-button:active{
|
||||
-moz-image-region: rect(80px, 400px, 120px, 360px);
|
||||
}
|
||||
|
||||
#content-navigator > .next-button {
|
||||
-moz-margin-start: 0;
|
||||
-moz-image-region: rect(0px, 440px, 40px, 400px);
|
||||
}
|
||||
|
||||
#content-navigator > .next-button:hover {
|
||||
-moz-image-region: rect(40px, 440px, 80px, 400px);
|
||||
}
|
||||
|
||||
#content-navigator > .next-button:active {
|
||||
-moz-image-region: rect(80px, 440px, 120px, 400px);
|
||||
}
|
||||
|
||||
#find-helper-textbox {
|
||||
pointer-events: auto;
|
||||
-moz-margin-end: 0;
|
||||
border: none !important;
|
||||
width: 20em;
|
||||
}
|
||||
|
||||
.textbox-search-icon {
|
||||
list-style-image: url("chrome://browser/skin/images/search-glass-30.png");
|
||||
-moz-image-region: auto;
|
||||
}
|
||||
|
||||
/* Override the default box ordering and make the find textbox appear to the
|
||||
right of the icon */
|
||||
#find-helper-textbox input {
|
||||
-moz-box-ordinal-group: 2
|
||||
}
|
||||
|
||||
#find-helper-textbox deck {
|
||||
margin-right: @margin_normal@;
|
||||
}
|
||||
|
||||
#find-helper-textbox[status="1"] { /* Ci.nsITypeAheadFind.FIND_NOTFOUND */
|
||||
background: rgb(255,200,200);
|
||||
}
|
||||
|
||||
#find-helper-textbox:hover:active {
|
||||
background: #8db8d8;
|
||||
}
|
||||
|
||||
/* Select popup ------------------------------------------------------------- */
|
||||
|
||||
#select-container {
|
||||
padding: 0;
|
||||
position: absolute;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
#select-commands {
|
||||
-moz-appearance: none;
|
||||
background-color: white;
|
||||
border: #000 solid @metro_border_thick@;
|
||||
display: -moz-box;
|
||||
-moz-user-focus: ignore;
|
||||
-moz-box-align: stretch;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* listcell element doesn't have flex="1" so we need to force it */
|
||||
#select-commands .option-command > listcell {
|
||||
-moz-box-flex: 1 !important;
|
||||
}
|
||||
|
||||
.option-command {
|
||||
min-height: @touch_button_small@;
|
||||
min-width: @touch_action_minwidth@; /* keep the button from being too narrow */
|
||||
border: 0 none;
|
||||
}
|
||||
|
||||
.option-command.selected {
|
||||
background-color: @selected_color@ !important;
|
||||
color: black;
|
||||
}
|
||||
|
||||
.option-command.optgroup {
|
||||
font-weight: bold;
|
||||
font-style: italic;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.option-command:not([disabled]):hover {
|
||||
background-color: #dedad0;
|
||||
color: black;
|
||||
}
|
||||
|
||||
.option-command:not([disabled]):active {
|
||||
background-color: @selected_color@ !important;
|
||||
color: black;
|
||||
}
|
||||
|
||||
.select-popup > richlistbox > scrollbox {
|
||||
width: 100%;
|
||||
overflow-x: hidden !important;
|
||||
}
|
||||
@ -13,7 +13,6 @@ chrome.jar:
|
||||
* skin/browser.css (browser.css)
|
||||
* skin/content.css (content.css)
|
||||
skin/config.css (config.css)
|
||||
* skin/forms.css (forms.css)
|
||||
* skin/platform.css (platform.css)
|
||||
* skin/tiles.css (tiles.css)
|
||||
skin/touchcontrols.css (touchcontrols.css)
|
||||
|
||||
@ -214,6 +214,61 @@ menulist {
|
||||
padding-right: 50px;
|
||||
}
|
||||
|
||||
/* form select popup */
|
||||
|
||||
#select-container {
|
||||
padding: 0;
|
||||
position: absolute;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
#select-commands {
|
||||
-moz-appearance: none;
|
||||
background-color: white;
|
||||
border: #000 solid @metro_border_thick@;
|
||||
display: -moz-box;
|
||||
-moz-user-focus: ignore;
|
||||
-moz-box-align: stretch;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* listcell element doesn't have flex="1" so we need to force it */
|
||||
#select-commands .option-command > listcell {
|
||||
-moz-box-flex: 1 !important;
|
||||
}
|
||||
|
||||
.option-command {
|
||||
min-height: @touch_button_small@;
|
||||
min-width: @touch_action_minwidth@; /* keep the button from being too narrow */
|
||||
border: 0 none;
|
||||
}
|
||||
|
||||
.option-command.selected {
|
||||
background-color: @selected_color@ !important;
|
||||
color: black;
|
||||
}
|
||||
|
||||
.option-command.optgroup {
|
||||
font-weight: bold;
|
||||
font-style: italic;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.option-command:not([disabled]):hover {
|
||||
background-color: #dedad0;
|
||||
color: black;
|
||||
}
|
||||
|
||||
.option-command:not([disabled]):active {
|
||||
background-color: @selected_color@ !important;
|
||||
color: black;
|
||||
}
|
||||
|
||||
.select-popup > richlistbox > scrollbox {
|
||||
width: 100%;
|
||||
overflow-x: hidden !important;
|
||||
}
|
||||
|
||||
/* Toolbar Button --------------------------------------------------------- */
|
||||
|
||||
toolbarbutton {
|
||||
@ -607,3 +662,98 @@ arrowbox {
|
||||
font-size: @metro_font_large@;
|
||||
font-weight: 100;
|
||||
}
|
||||
|
||||
/* Find bar ------------------------------------------------------------- */
|
||||
|
||||
#content-navigator {
|
||||
background-color: @metro_orange@;
|
||||
padding: 0;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
#content-navigator > toolbar {
|
||||
min-height: @findbar_height@ !important;
|
||||
}
|
||||
|
||||
#content-navigator > .previous-button,
|
||||
#content-navigator > .next-button,
|
||||
#content-navigator > .close-button {
|
||||
list-style-image: url(chrome://browser/skin/images/appbar-icons.png);
|
||||
min-width: @touch_button_small@ !important; /* button size */
|
||||
min-height: @touch_button_small@ !important; /* button size */
|
||||
border: none !important;
|
||||
background-image: none !important;
|
||||
background-color: inherit !important;
|
||||
pointer-events: auto;
|
||||
-moz-user-focus: ignore !important;
|
||||
margin: 0 @margin_normal@ !important;
|
||||
}
|
||||
|
||||
#content-navigator > .close-button {
|
||||
-moz-margin-start: 0;
|
||||
-moz-image-region: rect(0px, 480px, 40px, 440px);
|
||||
}
|
||||
|
||||
#content-navigator > .close-button:hover {
|
||||
-moz-image-region: rect(40px, 480px, 80px, 440px);
|
||||
}
|
||||
|
||||
#content-navigator > .close-button:active {
|
||||
-moz-image-region: rect(80px, 480px, 120px, 440px);
|
||||
}
|
||||
|
||||
#content-navigator > .previous-button {
|
||||
-moz-margin-end: 0;
|
||||
-moz-image-region: rect(0px, 400px, 40px, 360px);
|
||||
}
|
||||
|
||||
#content-navigator > .previous-button:hover {
|
||||
-moz-image-region: rect(40px, 400px, 80px, 360px);
|
||||
}
|
||||
|
||||
#content-navigator > .previous-button:active{
|
||||
-moz-image-region: rect(80px, 400px, 120px, 360px);
|
||||
}
|
||||
|
||||
#content-navigator > .next-button {
|
||||
-moz-margin-start: 0;
|
||||
-moz-image-region: rect(0px, 440px, 40px, 400px);
|
||||
}
|
||||
|
||||
#content-navigator > .next-button:hover {
|
||||
-moz-image-region: rect(40px, 440px, 80px, 400px);
|
||||
}
|
||||
|
||||
#content-navigator > .next-button:active {
|
||||
-moz-image-region: rect(80px, 440px, 120px, 400px);
|
||||
}
|
||||
|
||||
#find-helper-textbox {
|
||||
pointer-events: auto;
|
||||
-moz-margin-end: 0;
|
||||
border: none !important;
|
||||
width: 20em;
|
||||
}
|
||||
|
||||
.textbox-search-icon {
|
||||
list-style-image: url("chrome://browser/skin/images/search-glass-30.png");
|
||||
-moz-image-region: auto;
|
||||
}
|
||||
|
||||
/* Override the default box ordering and make the find textbox appear to the
|
||||
right of the icon */
|
||||
#find-helper-textbox input {
|
||||
-moz-box-ordinal-group: 2
|
||||
}
|
||||
|
||||
#find-helper-textbox deck {
|
||||
margin-right: @margin_normal@;
|
||||
}
|
||||
|
||||
#find-helper-textbox[status="1"] { /* Ci.nsITypeAheadFind.FIND_NOTFOUND */
|
||||
background: rgb(255,200,200);
|
||||
}
|
||||
|
||||
#find-helper-textbox:hover:active {
|
||||
background: #8db8d8;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user