commit 03dc434bf3866d75c8d4531a5b8e565a65b56bd4
parent 5f9f8d210c61593e6ef55ccbefcb1dfecb85059b
Author: Lootyhoof <lootyhoofer@gmail.com>
Date: Mon, 20 Aug 2018 21:44:10 +0100
Update global styles for v28
Diffstat:
14 files changed, 98 insertions(+), 161 deletions(-)
diff --git a/src/chrome/os/darwin/menu.css b/src/chrome/os/darwin/menu.css
@@ -5,7 +5,8 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
menu,
-menuitem {
+menuitem,
+menucaption {
-moz-appearance: none;
-moz-box-align: center;
color: #fff;
@@ -36,6 +37,11 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
color: inherit;
}
+menucaption > .menu-text,
+menucaption > .menu-iconic-text {
+ font-weight: bold;
+}
+
.menu-description {
font-style: italic;
color: GrayText;
@@ -80,15 +86,6 @@ menuitem[src] > .menu-iconic-left > .menu-iconic-icon {
-moz-box-pack: end;
}
-/* The native menuarrow we use is 9px wide on 10.7+ and 8px wide on 10.6,
- * so it needs to be 'pulled in' one pixel more by the negative margin in
- * order to align properly: */
-@media not all and (-moz-mac-lion-theme) {
- .menu-right {
- -moz-margin-end: -10px;
- }
-}
-
.menu-right {
margin-top: 0px;
margin-bottom: 0px;
@@ -140,7 +137,8 @@ menubar > menu[_moz-menuactive="true"][open="true"] {
/* ::::: menu/menuitems in popups ::::: */
menupopup > menu,
-menupopup > menuitem {
+menupopup > menuitem,
+menupopup > menucaption {
max-width: 42em;
}
@@ -153,6 +151,7 @@ menuitem[_moz-menuactive="true"] {
/* ::::: menu/menuitems in menulist popups ::::: */
menulist > menupopup > menuitem,
+menulist > menupopup > menucaption,
menulist > menupopup > menu {
max-width: none;
font: inherit;
@@ -161,27 +160,20 @@ menulist > menupopup > menu {
/* ::::: menuitems in editable menulist popups ::::: */
-menulist[editable="true"] > menupopup > menuitem {
+menulist[editable="true"] > menupopup > menuitem,
+menulist[editable="true"] > menupopup > menucaption {
-moz-appearance: none;
}
-menulist[editable="true"] > menupopup > menuitem > .menu-iconic-left {
+menulist[editable="true"] > menupopup > :-moz-any(menuitem, menucaption) > .menu-iconic-left {
display: none;
}
/* ::::: checked menuitems ::::: */
-:not(menulist) > menupopup > menuitem[checked="true"] > .menu-iconic-left,
-:not(menulist) > menupopup > menuitem[selected="true"] > .menu-iconic-left {
- padding-top: 1px;
- -moz-margin-start: -15px;
- -moz-padding-start: 15px;
- background: url("chrome://global/skin/menu/menu-check.svg#check") bottom left no-repeat transparent;
-}
-
-:not(menulist) > menupopup > menuitem[checked="true"] > .menu-iconic-left:-moz-locale-dir(rtl),
-:not(menulist) > menupopup > menuitem[selected="true"] > .menu-iconic-left:-moz-locale-dir(rtl) {
- transform: scaleX(-1);
+:not(menulist) > menupopup > menuitem[checked="true"],
+:not(menulist) > menupopup > menuitem[selected="true"] {
+ -moz-appearance: checkmenuitem;
}
menulist:not([editable="true"]) > menupopup > menuitem[checked="true"]::before,
@@ -216,11 +208,3 @@ menulist > menupopup > menuseparator,
max-width: none !important;
font: message-box;
}
-
-/* ::::: tree column picker ::::: */
-
-.treecell-popupcell-menu {
- margin-left: -2px;
- list-style-image: url("chrome://global/skin/tree/columnpicker.svg");
- -moz-image-region: auto;
-}
diff --git a/src/chrome/os/darwin/menulist.css b/src/chrome/os/darwin/menulist.css
@@ -19,7 +19,7 @@ menulist {
}
menulist:not([popuponly="true"]) {
- min-height: 20px !important;
+ min-height: 20px;
}
.menulist-label-box {
diff --git a/src/chrome/os/darwin/scrollbars.css b/src/chrome/os/darwin/scrollbars.css
@@ -10,7 +10,6 @@ scrollbar {
-moz-binding: url(chrome://global/content/bindings/scrollbar.xml#scrollbar);
cursor: default;
background-color: white;
- pointer-events: auto;
}
scrollbar[root="true"] {
diff --git a/src/chrome/os/darwin/toolbar.css b/src/chrome/os/darwin/toolbar.css
@@ -25,14 +25,6 @@ menubar {
min-width: 1px;
}
-.toolbar-holder {
- min-width: 1px;
-}
-
-.toolbar-primary {
- min-height: 24px;
-}
-
toolbarseparator {
-moz-appearance: none;
margin: 3px 4px;
diff --git a/src/chrome/os/darwin/toolbarbutton.css b/src/chrome/os/darwin/toolbarbutton.css
@@ -7,11 +7,8 @@
toolbarbutton {
-moz-box-align: center;
-moz-box-pack: center;
- margin: 0px 2px 0px 2px;
- padding: 3px 1px 3px 1px;
- border-right: 1px solid transparent;
- border-left: 1px solid transparent;
- background-color: transparent;
+ margin: 0 2px;
+ padding: 3px 2px;
color: #fff;
}
@@ -80,49 +77,30 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
.toolbarbutton-badge {
background-color: rgb(110,110,110);
-}
-
-.toolbarbutton-badge::after {
- /* The |content| property is set in the content stylesheet. */
font-size: 9px;
- padding: 1px 2px 2px;
+ padding: 1px 2px;
color: #fff;
- background-color: inherit;
border-radius: 2px;
box-shadow: 0 1px 0 hsla(0, 100%, 100%, .2) inset,
0 -1px 0 hsla(0, 0%, 0%, .1) inset,
0 1px 0 hsla(206, 50%, 10%, .2);
- position: absolute;
- top: -8px;
- right: -8px;
- z-index: 1;
- min-width: 10px;
+ margin: -6px 0 0 !important;
+ margin-inline-end: -6px !important;
+ min-width: 14px;
+ max-width: 28px;
line-height: 10px;
text-align: center;
+ -moz-stack-sizing: ignore;
}
-.toolbarbutton-badge:-moz-window-inactive::after {
+.toolbarbutton-badge:-moz-window-inactive {
background-color: rgb(230,230,230);
box-shadow: none;
- border: 1px solid rgb(206,206,206);
color: rgb(192,192,192);
}
-.toolbarbutton-badge:-moz-locale-dir(rtl)::after {
- left: -8px;
- right: auto;
-}
-
-toolbar[mode="icons"] > *|* > .toolbarbutton-badge::after {
- right: -10px;
-}
-
-toolbar[mode="icons"] > *|* > .toolbarbutton-badge:-moz-locale-dir(rtl)::after {
- left: -10px;
-}
-
-.toolbarbutton-badge-container {
- position: relative;
+toolbar[mode="icons"] > *|* > .toolbarbutton-badge {
+ margin-inline-end: -10px !important;
}
/* .......... dropmarker .......... */
diff --git a/src/chrome/os/linux/menu.css b/src/chrome/os/linux/menu.css
@@ -12,6 +12,7 @@
menu,
menuitem,
+menucaption,
.splitmenu-menuitem {
-moz-appearance: none;
-moz-box-align: center;
@@ -34,7 +35,8 @@ menuitem[_moz-menuactive="true"],
menu[disabled="true"],
menuitem[disabled="true"],
-.splitmenu-menuitem[disabled="true"] {
+.splitmenu-menuitem[disabled="true"],
+menucaption[disabled="true"] {
color: GrayText;
}
@@ -67,6 +69,7 @@ menuitem.spell-suggestion {
/* ::::: menu/menuitems in menulist popups ::::: */
menulist > menupopup > menuitem,
+menulist > menupopup > menucaption,
menulist > menupopup > menu {
padding: 1px 5px;
max-width: none;
@@ -77,6 +80,7 @@ menulist > menupopup > menu {
.menu-text,
.menu-iconic-left,
+.menu-iconic-right,
.menu-iconic-text {
margin-top: 0px !important;
margin-bottom: 0px !important;
@@ -91,6 +95,12 @@ menulist > menupopup > menu {
font-weight: inherit;
}
+menucaption > .menu-text,
+menucaption > .menu-iconic-text {
+ margin-inline-start: 0 !important;
+ font-weight: bold;
+}
+
.menu-description {
font-style: italic;
color: GrayText;
@@ -109,7 +119,8 @@ menulist > menupopup > menu {
-moz-box-pack: end;
}
-.menu-iconic-left {
+.menu-iconic-left,
+.menu-iconic-right {
width: 16px;
/* We can only hardcode this, to make the default GTK icon<->label spacing */
-moz-padding-end: 3px !important;
@@ -152,6 +163,7 @@ menulist > menupopup > menu {
menulist > menupopup > menuitem > .menu-iconic-left,
+menulist > menupopup > menucaption > .menu-iconic-left,
menulist > menupopup > menu > .menu-iconic-left {
display: none;
}
@@ -200,11 +212,3 @@ menulist > menupopup > menuseparator,
max-width: none !important;
font: message-box;
}
-
-/* ::::: tree column picker ::::: */
-
-.treecell-popupcell-menu {
- -moz-margin-start: -2px;
- list-style-image: url("chrome://global/skin/tree/columnpicker.svg");
- -moz-image-region: auto;
-}
diff --git a/src/chrome/os/linux/menulist.css b/src/chrome/os/linux/menulist.css
@@ -80,7 +80,7 @@ menulist:hover:active > .menulist-dropmarker {
/* ..... focused state ..... */
-menulist:focus:not([open="true"]):not(.menulist-compact) > .menulist-label-box {
+menulist:focus:not([open="true"]) > .menulist-label-box {
background-color: rgb(110,110,110);
color: #fff;
}
diff --git a/src/chrome/os/linux/scrollbars.css b/src/chrome/os/linux/scrollbars.css
@@ -12,11 +12,10 @@
/* ::::: scrollbar ::::: */
scrollbar {
- -moz-appearance: scrollbartrack-horizontal;
+ -moz-appearance: scrollbar-horizontal;
-moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar");
cursor: default;
background: url("chrome://global/skin/scrollbar/slider.gif") scrollbar;
- pointer-events: auto;
}
@media all and (-moz-overlay-scrollbars) {
@@ -33,7 +32,7 @@ scrollbar {
scrollbar[orient="vertical"]
{
- -moz-appearance: scrollbartrack-vertical;
+ -moz-appearance: scrollbar-vertical;
}
/* ::::: borders for thumb and buttons ::::: */
@@ -48,6 +47,15 @@ scrollbarbutton {
background-color: -moz-Dialog;
}
+/* ::::: slider - a thumb is inside ::::: */
+slider {
+ -moz-appearance: scrollbartrack-horizontal;
+}
+
+slider[orient="vertical"] {
+ -moz-appearance: scrollbartrack-vertical;
+}
+
/* ::::: thumb (horizontal) ::::: */
thumb {
@@ -133,7 +141,7 @@ scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"
/* ::::: scrollbar ::::: */
html|div scrollbar {
- -moz-appearance: scrollbartrack-horizontal;
+ -moz-appearance: scrollbar-horizontal;
-moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar");
cursor: default;
background: url("chrome://global/skin/scrollbar/slider.gif") scrollbar;
@@ -141,7 +149,7 @@ scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"
html|div scrollbar[orient="vertical"]
{
- -moz-appearance: scrollbartrack-vertical;
+ -moz-appearance: scrollbar-vertical;
}
/* ::::: borders for thumb and buttons ::::: */
diff --git a/src/chrome/os/linux/toolbarbutton.css b/src/chrome/os/linux/toolbarbutton.css
@@ -100,36 +100,26 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
/* ::::: toolbarbutton badged ::::: */
-.toolbarbutton-badge {
- background-color: rgb(110,110,110);
+.toolbarbutton-badge-stack > .toolbarbutton-icon[label]:not([label=""]) {
+ margin-inline-end: 0;
}
-.toolbarbutton-badge::after {
- /* The |content| property is set in the content stylesheet. */
+.toolbarbutton-badge {
+ background-color: rgb(110,110,110);
font-size: 10px;
- font-weight: bold;
- padding: 1px 2px 2px;
+ padding: 0 2px 1px;
color: #fff;
- background-color: inherit;
border-radius: 2px;
box-shadow: 0 1px 0 hsla(0, 100%, 100%, .2) inset,
0 -1px 0 hsla(0, 0%, 0%, .1) inset,
0 1px 0 hsla(206, 50%, 10%, .2);
- position: absolute;
- top: -4px;
- right: -2px;
- min-width: 10px;
+ margin: -6px 0 0 !important;
+ margin-inline-end: -8px !important;
+ min-width: 14px;
+ max-width: 28px;
line-height: 10px;
text-align: center;
-}
-
-.toolbarbutton-badge:-moz-locale-dir(rtl)::after {
- left: -2px;
- right: auto;
-}
-
-.toolbarbutton-badge-container {
- position: relative;
+ -moz-stack-sizing: ignore;
}
/* .......... dropmarker .......... */
diff --git a/src/chrome/os/winnt/menu.css b/src/chrome/os/winnt/menu.css
@@ -12,6 +12,7 @@
menu,
menuitem,
+menucaption,
.splitmenu-menuitem {
-moz-appearance: none;
-moz-box-align: center;
@@ -62,6 +63,12 @@ menuitem.spell-suggestion {
-moz-padding-end: 2px;
}
+menucaption > .menu-text,
+menucaption > .menu-iconic-text {
+ font-weight: bold;
+ padding-inline-start: 0 !important;
+}
+
.menu-description {
font-style: italic;
color: GrayText;
@@ -151,7 +158,8 @@ menubar > menu:-moz-window-inactive {
/* ::::: menu/menuitems in popups ::::: */
menupopup > menu,
-menupopup > menuitem {
+menupopup > menuitem,
+menupopup > menucaption {
max-width: 42em;
}
@@ -164,9 +172,8 @@ menuitem[_moz-menuactive="true"],
/* ::::: menu/menuitems in menulist popups ::::: */
-.menulist-menupopup > menuitem,
menulist > menupopup > menuitem,
-.menulist-menupopup > menu,
+menulist > menupopup > menucaption,
menulist > menupopup > menu {
-moz-appearance: none;
border: 1px solid transparent;
@@ -176,17 +183,15 @@ menulist > menupopup > menu {
color: #FFFFFF;
}
-.menulist-menupopup > menuitem > .menu-iconic-left,
menulist > menupopup > menuitem > .menu-iconic-left,
-.menulist-menupopup > menu > .menu-iconic-left,
+menulist > menupopup > menucaption > .menu-iconic-left,
menulist > menupopup > menu > .menu-iconic-left {
display: none;
padding-top: 0px;
}
-.menulist-menupopup > menuitem > label,
menulist > menupopup > menuitem > label,
-.menulist-menupopup > menu > label,
+menulist > menupopup > menucaption > label,
menulist > menupopup > menu > label {
padding-top: 0px;
padding-bottom: 0px;
@@ -229,8 +234,7 @@ menuseparator[collapsed="true"] {
margin: 0 !important;
}
-menulist > menupopup > menuseparator,
-.menulist-menupopup > menuseparator {
+menulist > menupopup > menuseparator {
padding: 6px 0 5px 0;
border-top: 1px solid #FFFFFF;
border-bottom: none;
@@ -242,11 +246,3 @@ menulist > menupopup > menuseparator,
max-width: none !important;
font: message-box;
}
-
-/* ::::: tree column picker ::::: */
-
-.treecell-popupcell-menu {
- -moz-margin-start: -2px;
- list-style-image: url("chrome://global/skin/tree/columnpicker.svg");
- -moz-image-region: auto;
-}
diff --git a/src/chrome/os/winnt/menulist.css b/src/chrome/os/winnt/menulist.css
@@ -79,7 +79,7 @@ menulist:hover:active > .menulist-dropmarker {
/* ..... focused state ..... */
-menulist:focus:not([open="true"]):not(.menulist-compact) > .menulist-label-box {
+menulist:focus:not([open="true"]) > .menulist-label-box {
background-color: rgb(110,110,110);
color: #fff;
}
diff --git a/src/chrome/os/winnt/scrollbars.css b/src/chrome/os/winnt/scrollbars.css
@@ -59,6 +59,15 @@ thumb:active {
background-color: rgb(110,110,110);
}
+/* ::::: slider - a thumb is inside ::::: */
+slider {
+ -moz-appearance: scrollbartrack-horizontal;
+}
+
+slider[orient="vertical"] {
+ -moz-appearance: scrollbartrack-vertical;
+}
+
/* ::::: thumb (horizontal) ::::: */
thumb {
diff --git a/src/chrome/os/winnt/toolbar.css b/src/chrome/os/winnt/toolbar.css
@@ -54,4 +54,4 @@ toolbarseparator {
toolbarspacer {
width: 15px;
-}
-\ No newline at end of file
+}
diff --git a/src/chrome/os/winnt/toolbarbutton.css b/src/chrome/os/winnt/toolbarbutton.css
@@ -76,11 +76,6 @@ toolbarbutton[checked="true"]:not([disabled="true"]) {
toolbarbutton:-moz-lwtheme {
text-shadow: none;
}
-
- toolbarbutton:-moz-lwtheme:not(:hover):not([checked="true"]):not([open="true"]):not([disabled="true"]) {
- color: inherit;
- text-shadow: inherit;
- }
toolbarbutton:-moz-lwtheme:not([disabled="true"]) {
color: inherit;
@@ -137,44 +132,27 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
/* ::::: toolbarbutton badged ::::: */
-.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) {
- -moz-margin-end: 0;
-}
-
-.toolbarbutton-badge[badge=""] {
- display: none;
+.toolbarbutton-badge-stack > .toolbarbutton-icon[label]:not([label=""]) {
+ margin-inline-end: 0;
}
.toolbarbutton-badge {
background-color: rgb(110,110,110);
-}
-
-.toolbarbutton-badge::after {
- /* The |content| property is set in the content stylesheet. */
font-size: 10px;
font-weight: bold;
- padding: 1px 2px 2px;
+ padding: 0 2px 1px;
color: #fff;
- background-color: inherit;
border-radius: 2px;
box-shadow: 0 1px 0 hsla(0, 100%, 100%, .2) inset,
0 -1px 0 hsla(0, 0%, 0%, .1) inset,
0 1px 0 hsla(206, 50%, 10%, .2);
- position: absolute;
- top: -4px;
- right: -2px;
- min-width: 10px;
+ margin: -6px 0 0 !important;
+ margin-inline-end: -8px !important;
+ min-width: 14px;
+ max-width: 28px;
line-height: 10px;
text-align: center;
-}
-
-.toolbarbutton-badge:-moz-locale-dir(rtl)::after {
- left: -2px;
- right: auto;
-}
-
-.toolbarbutton-badge-container {
- position: relative;
+ -moz-stack-sizing: ignore;
}
/* .......... dropmarker .......... */
