зеркало из https://github.com/mozilla/pjs.git
Merge backout of changeset 764a4259b9f7.
This commit is contained in:
Коммит
8b6ca68dee
|
@ -1008,7 +1008,7 @@
|
||||||
<svg:svg height="0">
|
<svg:svg height="0">
|
||||||
<svg:mask id="pinstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox">
|
<svg:mask id="pinstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox">
|
||||||
<svg:rect x="0" y="0" width="1" height="1" fill="white"/>
|
<svg:rect x="0" y="0" width="1" height="1" fill="white"/>
|
||||||
<svg:circle cx="-0.41" cy="0.5" r="0.65"/>
|
<svg:circle cx="-0.46" cy="0.48" r="0.65"/>
|
||||||
</svg:mask>
|
</svg:mask>
|
||||||
<svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse">
|
<svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse">
|
||||||
<svg:circle cx="9" cy="3" r="3" fill="white"/>
|
<svg:circle cx="9" cy="3" r="3" fill="white"/>
|
||||||
|
|
Двоичные данные
browser/themes/pinstripe/browser/Toolbar-lion.png
Двоичные данные
browser/themes/pinstripe/browser/Toolbar-lion.png
Двоичный файл не отображается.
До Ширина: | Высота: | Размер: 6.3 KiB |
|
@ -293,22 +293,21 @@ toolbarbutton.bookmark-item > menupopup {
|
||||||
.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker,
|
.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker,
|
||||||
#restore-button {
|
#restore-button {
|
||||||
-moz-box-orient: vertical;
|
-moz-box-orient: vertical;
|
||||||
-moz-appearance: toolbarbutton;
|
padding: 0 3px;
|
||||||
height: 22px;
|
height: 22px;
|
||||||
padding: 0;
|
border: 1px solid @toolbarbuttonBorderColor@;
|
||||||
border: 0;
|
border-radius: @toolbarbuttonCornerRadius@;
|
||||||
|
box-shadow: 0 1px rgba(255, 255, 255, 0.2);
|
||||||
|
background: @toolbarbuttonBackground@;
|
||||||
|
background-origin: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
.toolbarbutton-1:not([type="menu-button"]):-moz-lwtheme,
|
.toolbarbutton-1:not([type="menu-button"]):-moz-lwtheme,
|
||||||
.toolbarbutton-1 > .toolbarbutton-menubutton-button:-moz-lwtheme,
|
.toolbarbutton-1 > .toolbarbutton-menubutton-button:-moz-lwtheme,
|
||||||
.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme,
|
.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme,
|
||||||
#restore-button:-moz-lwtheme {
|
#restore-button:-moz-lwtheme {
|
||||||
-moz-appearance: none;
|
border-color: rgba(0, 0, 0, 0.4);
|
||||||
padding: 0 3px;
|
background-image: -moz-linear-gradient(rgba(255,255,255,0.5), rgba(255,255,255,0.2) 50%, rgba(255,255,255,0.1) 50%, rgba(255,255,255,0.2));
|
||||||
border: 1px solid rgba(0, 0, 0, 0.4);
|
|
||||||
border-radius: @toolbarbuttonCornerRadius@;
|
|
||||||
background: -moz-linear-gradient(rgba(255,255,255,0.5), rgba(255,255,255,0.2) 50%, rgba(255,255,255,0.1) 50%, rgba(255,255,255,0.2)) repeat-x;
|
|
||||||
background-origin: border-box;
|
|
||||||
box-shadow: inset 0 1px rgba(255,255,255,0.3), 0 1px rgba(255,255,255,0.2);
|
box-shadow: inset 0 1px rgba(255,255,255,0.3), 0 1px rgba(255,255,255,0.2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -338,7 +337,6 @@ toolbar:not([mode="icons"]) .toolbarbutton-1:not([type="menu-button"]),
|
||||||
toolbar:not([mode="icons"]) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
|
toolbar:not([mode="icons"]) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
|
||||||
toolbar:not([mode="icons"]) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker,
|
toolbar:not([mode="icons"]) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker,
|
||||||
toolbar:not([mode="icons"]) #restore-button {
|
toolbar:not([mode="icons"]) #restore-button {
|
||||||
-moz-appearance: none;
|
|
||||||
padding: 0;
|
padding: 0;
|
||||||
height: auto;
|
height: auto;
|
||||||
border: none;
|
border: none;
|
||||||
|
@ -410,6 +408,16 @@ toolbar:not([mode="icons"]) .toolbarbutton-1:not([open="true"]) > .toolbarbutton
|
||||||
margin: 2px 0 0;
|
margin: 2px 0 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"]):not([disabled="true"]):active:hover:not(:-moz-lwtheme),
|
||||||
|
toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"])[open="true"]:not(:-moz-lwtheme),
|
||||||
|
toolbar[mode="icons"] .toolbarbutton-1:not([disabled="true"]) > .toolbarbutton-menubutton-button:active:hover:not(:-moz-lwtheme),
|
||||||
|
toolbar[mode="icons"] .toolbarbutton-1[open="true"] > .toolbarbutton-menubutton-dropmarker:not(:-moz-lwtheme),
|
||||||
|
toolbar[mode="icons"] #restore-button:not([disabled="true"]):active:hover:not(:-moz-lwtheme) {
|
||||||
|
background: @toolbarbuttonPressedBackgroundColor@;
|
||||||
|
text-shadow: @loweredShadow@;
|
||||||
|
box-shadow: @toolbarbuttonPressedInnerShadow@, @loweredShadow@;
|
||||||
|
}
|
||||||
|
|
||||||
toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"]):not([disabled="true"]):active:hover:-moz-lwtheme,
|
toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"]):not([disabled="true"]):active:hover:-moz-lwtheme,
|
||||||
toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"])[open="true"]:-moz-lwtheme,
|
toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"])[open="true"]:-moz-lwtheme,
|
||||||
toolbar[mode="icons"] .toolbarbutton-1:not([disabled="true"]) > .toolbarbutton-menubutton-button:active:hover:-moz-lwtheme,
|
toolbar[mode="icons"] .toolbarbutton-1:not([disabled="true"]) > .toolbarbutton-menubutton-button:active:hover:-moz-lwtheme,
|
||||||
|
@ -420,16 +428,39 @@ toolbar[mode="icons"] #restore-button:not([disabled="true"]):active:hover:-moz-l
|
||||||
box-shadow: inset 0 2px 5px rgba(0,0,0,0.6), 0 1px rgba(255,255,255,0.2);
|
box-shadow: inset 0 2px 5px rgba(0,0,0,0.6), 0 1px rgba(255,255,255,0.2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"]):not(#fullscreen-button)[checked="true"]:not(:-moz-lwtheme) {
|
||||||
|
background: #606060;
|
||||||
|
box-shadow: inset #2A2A2A 0 3px 3.5px, @loweredShadow@;
|
||||||
|
}
|
||||||
|
|
||||||
toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"]):not(#fullscreen-button)[checked="true"]:-moz-lwtheme {
|
toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"]):not(#fullscreen-button)[checked="true"]:-moz-lwtheme {
|
||||||
background-color: rgba(0,0,0,0.4);
|
background-color: rgba(0,0,0,0.4);
|
||||||
box-shadow: inset 0 2px 5px rgba(0,0,0,0.7), 0 1px rgba(255,255,255,0.2);
|
box-shadow: inset 0 2px 5px rgba(0,0,0,0.7), 0 1px rgba(255,255,255,0.2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"]):not(#fullscreen-button)[checked="true"]:not([disabled="true"]):active:hover:not(:-moz-lwtheme) {
|
||||||
|
background: #4E4E4E;
|
||||||
|
box-shadow: inset #1c1c1c 0 3px 3.5px;
|
||||||
|
}
|
||||||
|
|
||||||
toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"]):not(#fullscreen-button)[checked="true"]:not([disabled="true"]):active:hover:-moz-lwtheme {
|
toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"]):not(#fullscreen-button)[checked="true"]:not([disabled="true"]):active:hover:-moz-lwtheme {
|
||||||
background-color: rgba(0, 0, 0, 0.6);
|
background-color: rgba(0, 0, 0, 0.6);
|
||||||
box-shadow: inset 0 2px 5px rgba(0, 0, 0, 0.8), 0 1px rgba(255, 255, 255, 0.2);
|
box-shadow: inset 0 2px 5px rgba(0, 0, 0, 0.8), 0 1px rgba(255, 255, 255, 0.2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"]):-moz-window-inactive:not(:-moz-lwtheme),
|
||||||
|
toolbar[mode="icons"] .toolbarbutton-1 > .toolbarbutton-menubutton-button:-moz-window-inactive:not(:-moz-lwtheme),
|
||||||
|
toolbar[mode="icons"] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-window-inactive:not(:-moz-lwtheme),
|
||||||
|
toolbar[mode="icons"] #restore-button:-moz-window-inactive:not(:-moz-lwtheme) {
|
||||||
|
border-color: @toolbarbuttonInactiveBorderColor@;
|
||||||
|
background-image: @toolbarbuttonInactiveBackgroundImage@;
|
||||||
|
}
|
||||||
|
|
||||||
|
toolbar[mode="icons"] .toolbarbutton-1:not([type="menu-button"]):not(#fullscreen-button)[checked="true"]:-moz-window-inactive {
|
||||||
|
background: #8E8E8E;
|
||||||
|
box-shadow: inset rgba(0, 0, 0, 0.5) 0 3px 3.5px, @loweredShadow@;
|
||||||
|
}
|
||||||
|
|
||||||
toolbar[mode="icons"] .toolbarbutton-1 > menupopup {
|
toolbar[mode="icons"] .toolbarbutton-1 > menupopup {
|
||||||
margin-top: 1px;
|
margin-top: 1px;
|
||||||
}
|
}
|
||||||
|
@ -446,28 +477,17 @@ toolbar[mode="icons"] .toolbarbutton-1 > menupopup {
|
||||||
}
|
}
|
||||||
|
|
||||||
#back-button,
|
#back-button,
|
||||||
#forward-button:-moz-locale-dir(rtl),
|
toolbar:not([mode="icons"]) #forward-button:-moz-locale-dir(rtl) {
|
||||||
toolbar[mode="icons"] #back-button:-moz-locale-dir(rtl):-moz-lwtheme {
|
|
||||||
-moz-image-region: rect(0, 40px, 20px, 20px);
|
-moz-image-region: rect(0, 40px, 20px, 20px);
|
||||||
}
|
}
|
||||||
|
|
||||||
#forward-button,
|
#forward-button,
|
||||||
#back-button:-moz-locale-dir(rtl),
|
toolbar:not([mode="icons"]) #back-button:-moz-locale-dir(rtl) {
|
||||||
#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:-moz-locale-dir(rtl),
|
|
||||||
toolbar[mode="icons"] #forward-button:-moz-locale-dir(rtl):-moz-lwtheme {
|
|
||||||
-moz-image-region: rect(0, 60px, 20px, 40px);
|
-moz-image-region: rect(0, 60px, 20px, 40px);
|
||||||
}
|
}
|
||||||
|
|
||||||
#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:-moz-locale-dir(rtl),
|
|
||||||
#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:-moz-locale-dir(rtl),
|
|
||||||
toolbar[mode="icons"] #back-button:-moz-locale-dir(rtl):-moz-lwtheme,
|
|
||||||
toolbar[mode="icons"] #forward-button:-moz-locale-dir(rtl):-moz-lwtheme {
|
|
||||||
-moz-transform: scaleX(-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button {
|
#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button {
|
||||||
-moz-appearance: none;
|
-moz-margin-end: -5px;
|
||||||
-moz-margin-end: -7px;
|
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
-moz-image-region: rect(0, 20px, 20px, 0);
|
-moz-image-region: rect(0, 20px, 20px, 0);
|
||||||
|
@ -477,45 +497,31 @@ toolbar[mode="icons"] #forward-button:-moz-locale-dir(rtl):-moz-lwtheme {
|
||||||
border-radius: 10000px;
|
border-radius: 10000px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not(:-moz-lwtheme) {
|
toolbar[mode="icons"] #back-button:-moz-locale-dir(rtl),
|
||||||
height: 31px;
|
toolbar[mode="icons"] #forward-button:-moz-locale-dir(rtl) {
|
||||||
padding: 4px 5px 5px 3px;
|
-moz-transform: scaleX(-1);
|
||||||
margin-bottom: -1px;
|
|
||||||
background: url(chrome://browser/skin/keyhole-circle.png) 0 0 no-repeat;
|
|
||||||
}
|
|
||||||
|
|
||||||
#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:-moz-window-inactive:not(:-moz-lwtheme) {
|
|
||||||
background-position: -60px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not([disabled="true"]):active:hover:not(:-moz-lwtheme),
|
|
||||||
#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button[open="true"]:not(:-moz-lwtheme) {
|
|
||||||
background-position: -30px 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
toolbar[mode="icons"] #forward-button {
|
toolbar[mode="icons"] #forward-button {
|
||||||
-moz-margin-start: 0;
|
-moz-margin-start: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button > .toolbarbutton-icon {
|
#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button {
|
||||||
/* shift the icon away from the back button */
|
/* 1px to the right */
|
||||||
margin-left: 3px;
|
padding-left: 4px;
|
||||||
margin-right: -1px;
|
padding-right: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button {
|
#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:-moz-lwtheme {
|
||||||
mask: url(chrome://browser/content/browser.xul#pinstripe-keyhole-forward-mask);
|
mask: url(chrome://browser/content/browser.xul#pinstripe-keyhole-forward-mask);
|
||||||
}
|
}
|
||||||
|
|
||||||
#navigator-toolbox[iconsize="small"][mode="icons"] > #nav-bar #forward-button {
|
#navigator-toolbox[iconsize="small"][mode="icons"] > #nav-bar #forward-button {
|
||||||
width: 27px;
|
width: 27px;
|
||||||
}
|
|
||||||
|
|
||||||
#navigator-toolbox[iconsize="small"][mode="icons"] > #nav-bar #forward-button:-moz-lwtheme {
|
|
||||||
padding-left: 2px;
|
padding-left: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
toolbar[mode="icons"] #forward-button:-moz-lwtheme {
|
toolbar[mode="icons"] #forward-button {
|
||||||
border-top-left-radius: 0;
|
border-top-left-radius: 0;
|
||||||
border-bottom-left-radius: 0;
|
border-bottom-left-radius: 0;
|
||||||
}
|
}
|
||||||
|
@ -523,9 +529,6 @@ toolbar[mode="icons"] #forward-button:-moz-lwtheme {
|
||||||
#navigator-toolbox[iconsize="small"][mode="icons"] > #nav-bar #back-button {
|
#navigator-toolbox[iconsize="small"][mode="icons"] > #nav-bar #back-button {
|
||||||
-moz-margin-end: 0;
|
-moz-margin-end: 0;
|
||||||
width: 26px;
|
width: 26px;
|
||||||
}
|
|
||||||
|
|
||||||
#navigator-toolbox[iconsize="small"][mode="icons"] > #nav-bar #back-button:-moz-lwtheme {
|
|
||||||
padding-right: 2px;
|
padding-right: 2px;
|
||||||
border-right-width: 0;
|
border-right-width: 0;
|
||||||
border-top-right-radius: 0;
|
border-top-right-radius: 0;
|
||||||
|
@ -1953,12 +1956,11 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
|
||||||
:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1,
|
:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1,
|
||||||
:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
|
:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
|
||||||
:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
|
:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
|
||||||
-moz-appearance: none;
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
border: none;
|
||||||
|
border-radius: 0;
|
||||||
/* !important flags needed because of bug 561154: */
|
/* !important flags needed because of bug 561154: */
|
||||||
margin: 0 !important;
|
|
||||||
padding: 0 !important;
|
|
||||||
border: none !important;
|
|
||||||
border-radius: 0 !important;
|
|
||||||
background: none !important;
|
background: none !important;
|
||||||
box-shadow: none !important;
|
box-shadow: none !important;
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,7 +42,6 @@ browser.jar:
|
||||||
skin/classic/browser/section_collapsed-rtl.png
|
skin/classic/browser/section_collapsed-rtl.png
|
||||||
skin/classic/browser/section_expanded.png
|
skin/classic/browser/section_expanded.png
|
||||||
skin/classic/browser/Secure-Glyph-White.png
|
skin/classic/browser/Secure-Glyph-White.png
|
||||||
skin/classic/browser/keyhole-circle.png
|
|
||||||
skin/classic/browser/Toolbar.png
|
skin/classic/browser/Toolbar.png
|
||||||
skin/classic/browser/toolbarbutton-dropmarker.png
|
skin/classic/browser/toolbarbutton-dropmarker.png
|
||||||
skin/classic/browser/urlbar-arrow.png
|
skin/classic/browser/urlbar-arrow.png
|
||||||
|
@ -135,8 +134,3 @@ browser.jar:
|
||||||
skin/classic/browser/syncCommon.css
|
skin/classic/browser/syncCommon.css
|
||||||
skin/classic/browser/syncQuota.css
|
skin/classic/browser/syncQuota.css
|
||||||
#endif
|
#endif
|
||||||
skin/classic/browser/lion/keyhole-circle.png (keyhole-circle-lion.png)
|
|
||||||
skin/classic/browser/lion/Toolbar.png (Toolbar-lion.png)
|
|
||||||
|
|
||||||
% override chrome://browser/skin/keyhole-circle.png chrome://browser/skin/lion/keyhole-circle.png os=Darwin osversion>=10.7
|
|
||||||
% override chrome://browser/skin/Toolbar.png chrome://browser/skin/lion/Toolbar.png os=Darwin osversion>=10.7
|
|
||||||
|
|
Двоичные данные
browser/themes/pinstripe/browser/keyhole-circle-lion.png
Двоичные данные
browser/themes/pinstripe/browser/keyhole-circle-lion.png
Двоичный файл не отображается.
До Ширина: | Высота: | Размер: 2.2 KiB |
Двоичные данные
browser/themes/pinstripe/browser/keyhole-circle.png
Двоичные данные
browser/themes/pinstripe/browser/keyhole-circle.png
Двоичный файл не отображается.
До Ширина: | Высота: | Размер: 2.2 KiB |
|
@ -80,9 +80,33 @@
|
||||||
#placesToolbar > toolbarbutton {
|
#placesToolbar > toolbarbutton {
|
||||||
list-style-image: url("chrome://browser/skin/places/toolbar.png");
|
list-style-image: url("chrome://browser/skin/places/toolbar.png");
|
||||||
margin: 4px 4px 5px;
|
margin: 4px 4px 5px;
|
||||||
padding: 0;
|
padding: 1px 3px;
|
||||||
height: 22px;
|
border: 1px solid @toolbarbuttonBorderColor@;
|
||||||
-moz-appearance: toolbarbutton;
|
border-radius: @toolbarbuttonCornerRadius@;
|
||||||
|
box-shadow: @loweredShadow@;
|
||||||
|
background: @toolbarbuttonBackground@;
|
||||||
|
background-origin: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
#placesToolbar > toolbarbutton:not([disabled="true"]):active:hover,
|
||||||
|
#placesToolbar > toolbarbutton[open="true"] {
|
||||||
|
background: @toolbarbuttonPressedBackgroundColor@;
|
||||||
|
text-shadow: @loweredShadow@;
|
||||||
|
box-shadow: @toolbarbuttonPressedInnerShadow@, @loweredShadow@;
|
||||||
|
}
|
||||||
|
|
||||||
|
#placesToolbar > toolbarbutton:-moz-focusring {
|
||||||
|
border-color: @toolbarbuttonFocusedBorderColorAqua@;
|
||||||
|
box-shadow: @focusRingShadow@;
|
||||||
|
}
|
||||||
|
|
||||||
|
#placesToolbar > toolbarbutton:-moz-system-metric(mac-graphite-theme):-moz-focusring {
|
||||||
|
border-color: @toolbarbuttonFocusedBorderColorGraphite@;
|
||||||
|
}
|
||||||
|
|
||||||
|
#placesToolbar > toolbarbutton:-moz-window-inactive {
|
||||||
|
border-color: @toolbarbuttonInactiveBorderColor@;
|
||||||
|
background-image: @toolbarbuttonInactiveBackgroundImage@;
|
||||||
}
|
}
|
||||||
|
|
||||||
#placesToolbar > toolbarbutton[disabled="true"] > .toolbarbutton-icon {
|
#placesToolbar > toolbarbutton[disabled="true"] > .toolbarbutton-icon {
|
||||||
|
@ -112,12 +136,17 @@
|
||||||
#back-button:-moz-locale-dir(ltr),
|
#back-button:-moz-locale-dir(ltr),
|
||||||
#forward-button:-moz-locale-dir(rtl) {
|
#forward-button:-moz-locale-dir(rtl) {
|
||||||
-moz-image-region: rect(0px, 16px, 16px, 0px);
|
-moz-image-region: rect(0px, 16px, 16px, 0px);
|
||||||
|
border-top-right-radius: 0;
|
||||||
|
border-bottom-right-radius: 0;
|
||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
|
border-right: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#forward-button:-moz-locale-dir(ltr),
|
#forward-button:-moz-locale-dir(ltr),
|
||||||
#back-button:-moz-locale-dir(rtl) {
|
#back-button:-moz-locale-dir(rtl) {
|
||||||
-moz-image-region: rect(0px, 32px, 16px, 16px);
|
-moz-image-region: rect(0px, 32px, 16px, 16px);
|
||||||
|
border-top-left-radius: 0;
|
||||||
|
border-bottom-left-radius: 0;
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -203,9 +203,24 @@ toolbarseparator {
|
||||||
#Console\:clear {
|
#Console\:clear {
|
||||||
-moz-box-orient: vertical;
|
-moz-box-orient: vertical;
|
||||||
-moz-box-align: center;
|
-moz-box-align: center;
|
||||||
-moz-appearance: toolbarbutton;
|
|
||||||
font: menu;
|
font: menu;
|
||||||
text-shadow: @loweredShadow@;
|
text-shadow: @loweredShadow@;
|
||||||
margin: 4px 0 9px;
|
margin: 4px 0 9px;
|
||||||
padding: 0 1px;
|
padding: 0 4px;
|
||||||
|
border: 1px solid @toolbarbuttonBorderColor@;
|
||||||
|
border-radius: @toolbarbuttonCornerRadius@;
|
||||||
|
box-shadow: @loweredShadow@;
|
||||||
|
background: @toolbarbuttonBackground@;
|
||||||
|
background-origin: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
#Console\:clear:active:hover {
|
||||||
|
background: @toolbarbuttonPressedBackgroundColor@;
|
||||||
|
text-shadow: @loweredShadow@;
|
||||||
|
box-shadow: @toolbarbuttonPressedInnerShadow@, @loweredShadow@;
|
||||||
|
}
|
||||||
|
|
||||||
|
#Console\:clear:-moz-window-inactive {
|
||||||
|
border-color: @toolbarbuttonInactiveBorderColor@;
|
||||||
|
background-image: @toolbarbuttonInactiveBackgroundImage@;
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,12 @@
|
||||||
%define sidebarItemInactiveBorderTop 1px solid #979797
|
%define sidebarItemInactiveBorderTop 1px solid #979797
|
||||||
%define sidebarItemInactiveBackground -moz-linear-gradient(top, #B4B4B4, #8A8A8A) repeat-x
|
%define sidebarItemInactiveBackground -moz-linear-gradient(top, #B4B4B4, #8A8A8A) repeat-x
|
||||||
|
|
||||||
|
%define toolbarbuttonBorderColor rgba(59, 59, 59, 0.9)
|
||||||
%define toolbarbuttonCornerRadius 3px
|
%define toolbarbuttonCornerRadius 3px
|
||||||
%define toolbarbuttonBackground -moz-linear-gradient(top, #FFF, #ADADAD) repeat-x
|
%define toolbarbuttonBackground -moz-linear-gradient(top, #FFF, #ADADAD) repeat-x
|
||||||
|
%define toolbarbuttonFocusedBorderColorAqua rgba(102, 122, 155, 0.9)
|
||||||
|
%define toolbarbuttonFocusedBorderColorGraphite rgba(59, 59, 59, 0.7)
|
||||||
%define toolbarbuttonPressedInnerShadow inset rgba(0, 0, 0, 0.3) 0 -6px 10px, inset #000 0 1px 3px, inset rgba(0, 0, 0, 0.2) 0 1px 3px
|
%define toolbarbuttonPressedInnerShadow inset rgba(0, 0, 0, 0.3) 0 -6px 10px, inset #000 0 1px 3px, inset rgba(0, 0, 0, 0.2) 0 1px 3px
|
||||||
|
%define toolbarbuttonPressedBackgroundColor #B5B5B5
|
||||||
%define toolbarbuttonInactiveBorderColor rgba(146, 146, 146, 0.84)
|
%define toolbarbuttonInactiveBorderColor rgba(146, 146, 146, 0.84)
|
||||||
|
%define toolbarbuttonInactiveBackgroundImage -moz-linear-gradient(top, #FFF, #CCC)
|
||||||
|
|
|
@ -86,15 +86,13 @@ toolbarbutton[checked="true"] {
|
||||||
border: none !important;
|
border: none !important;
|
||||||
background-color: transparent !important;
|
background-color: transparent !important;
|
||||||
list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
|
list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
|
||||||
padding: 0;
|
padding: 0 0 0 2px;
|
||||||
-moz-padding-start: 2px;
|
|
||||||
width: auto;
|
width: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.toolbarbutton-menu-dropmarker[disabled="true"] {
|
.toolbarbutton-menu-dropmarker[disabled="true"] {
|
||||||
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.png");
|
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.png");
|
||||||
padding: 0;
|
padding: 0 0 0 2px !important;
|
||||||
-moz-padding-start: 2px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ::::: toolbarbutton menu-button ::::: */
|
/* ::::: toolbarbutton menu-button ::::: */
|
||||||
|
@ -124,7 +122,7 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
|
||||||
/* .......... dropmarker .......... */
|
/* .......... dropmarker .......... */
|
||||||
|
|
||||||
.toolbarbutton-menubutton-dropmarker {
|
.toolbarbutton-menubutton-dropmarker {
|
||||||
-moz-appearance: none;
|
-moz-appearance: none !important;
|
||||||
border: none;
|
border: none;
|
||||||
background-color: transparent !important;
|
background-color: transparent !important;
|
||||||
list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
|
list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
|
||||||
|
|
|
@ -46,6 +46,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
#viewGroup {
|
#viewGroup {
|
||||||
|
background-color: rgba(0, 0, 0, 0.55);
|
||||||
|
padding: 1px;
|
||||||
|
border-radius: @toolbarbuttonCornerRadius@;
|
||||||
|
box-shadow: @loweredShadow@;
|
||||||
margin: 4px 0 9px;
|
margin: 4px 0 9px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -53,16 +57,74 @@
|
||||||
#viewGroup > toolbarbutton {
|
#viewGroup > toolbarbutton {
|
||||||
-moz-box-orient: vertical;
|
-moz-box-orient: vertical;
|
||||||
-moz-box-align: center;
|
-moz-box-align: center;
|
||||||
-moz-appearance: toolbarbutton;
|
-moz-appearance: none;
|
||||||
font: menu;
|
font: menu;
|
||||||
text-shadow: @loweredShadow@;
|
text-shadow: @loweredShadow@;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0 1px;
|
padding: 0 4px;
|
||||||
height: 22px;
|
border: none;
|
||||||
|
border-left: 1px solid rgba(0, 0, 0, 0.8);
|
||||||
|
background: @toolbarbuttonBackground@;
|
||||||
|
}
|
||||||
|
|
||||||
|
#viewGroup > radio:active:hover,
|
||||||
|
#viewGroup > toolbarbutton:active:hover {
|
||||||
|
background: @toolbarbuttonPressedBackgroundColor@;
|
||||||
|
text-shadow: @loweredShadow@;
|
||||||
|
box-shadow: @toolbarbuttonPressedInnerShadow@;
|
||||||
}
|
}
|
||||||
|
|
||||||
#viewGroup > radio[selected=true],
|
#viewGroup > radio[selected=true],
|
||||||
#viewGroup > toolbarbutton[checked=true] {
|
#viewGroup > toolbarbutton[checked=true] {
|
||||||
color: #FFF !important;
|
color: #FFF !important;
|
||||||
text-shadow: rgba(0, 0, 0, 0.4) 0 1px;
|
text-shadow: rgba(0, 0, 0, 0.4) 0 1px;
|
||||||
|
background: #606060;
|
||||||
|
box-shadow: inset #2A2A2A 0 3px 3.5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#viewGroup > radio[selected=true]:active:hover,
|
||||||
|
#viewGroup > toolbarbutton[checked=true]:active:hover {
|
||||||
|
background-color: #4E4E4E;
|
||||||
|
box-shadow: inset #1c1c1c 0 3px 3.5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#viewGroup:-moz-window-inactive {
|
||||||
|
background-color: rgba(0, 0, 0, 0.25);
|
||||||
|
}
|
||||||
|
|
||||||
|
#viewGroup > radio:-moz-window-inactive,
|
||||||
|
#viewGroup > toolbarbutton:-moz-window-inactive {
|
||||||
|
border-color: rgba(0, 0, 0, 0.4);
|
||||||
|
background-image: @toolbarbuttonInactiveBackgroundImage@;
|
||||||
|
}
|
||||||
|
|
||||||
|
#viewGroup > radio[selected=true]:-moz-window-inactive,
|
||||||
|
#viewGroup > toolbarbutton[checked=true]:-moz-window-inactive {
|
||||||
|
background: #8E8E8E;
|
||||||
|
box-shadow: inset rgba(0, 0, 0, 0.5) 0 3px 3.5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#viewGroup > radio:-moz-locale-dir(ltr):first-child,
|
||||||
|
#viewGroup > radio:-moz-locale-dir(ltr)[first-visible],
|
||||||
|
#viewGroup > radio:-moz-locale-dir(rtl):last-child,
|
||||||
|
#viewGroup > radio:-moz-locale-dir(rtl)[last-visible],
|
||||||
|
#viewGroup > toolbarbutton:-moz-locale-dir(ltr):first-child,
|
||||||
|
#viewGroup > toolbarbutton:-moz-locale-dir(ltr)[first-visible],
|
||||||
|
#viewGroup > toolbarbutton:-moz-locale-dir(rtl):last-child,
|
||||||
|
#viewGroup > toolbarbutton:-moz-locale-dir(rtl)[last-visible] {
|
||||||
|
border-top-left-radius: 2px;
|
||||||
|
border-bottom-left-radius: 2px;
|
||||||
|
border-left: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
#viewGroup > radio:-moz-locale-dir(ltr):last-child,
|
||||||
|
#viewGroup > radio:-moz-locale-dir(ltr)[last-visible],
|
||||||
|
#viewGroup > radio:-moz-locale-dir(rtl):first-child,
|
||||||
|
#viewGroup > radio:-moz-locale-dir(rtl)[first-visible],
|
||||||
|
#viewGroup > toolbarbutton:-moz-locale-dir(ltr):last-child,
|
||||||
|
#viewGroup > toolbarbutton:-moz-locale-dir(ltr)[last-visible],
|
||||||
|
#viewGroup > toolbarbutton:-moz-locale-dir(rtl):first-child,
|
||||||
|
#viewGroup > toolbarbutton:-moz-locale-dir(rtl)[first-visible] {
|
||||||
|
border-top-right-radius: 2px;
|
||||||
|
border-bottom-right-radius: 2px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -111,9 +111,35 @@ richlistitem[type="download"] button {
|
||||||
}
|
}
|
||||||
|
|
||||||
#clearListButton {
|
#clearListButton {
|
||||||
-moz-appearance: toolbarbutton;
|
-moz-appearance: none;
|
||||||
min-height: 18px;
|
min-height: 18px;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
margin: 0 6px;
|
margin: 0 6px;
|
||||||
|
padding: 0 2px;
|
||||||
text-shadow: @loweredShadow@;
|
text-shadow: @loweredShadow@;
|
||||||
|
border: 1px solid @toolbarbuttonBorderColor@;
|
||||||
|
border-radius: @toolbarbuttonCornerRadius@;
|
||||||
|
box-shadow: @loweredShadow@;
|
||||||
|
background: @toolbarbuttonBackground@;
|
||||||
|
background-origin: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
#clearListButton:hover:active:not([disabled="true"]) {
|
||||||
|
background: @toolbarbuttonPressedBackgroundColor@;
|
||||||
|
text-shadow: @loweredShadow@;
|
||||||
|
box-shadow: @toolbarbuttonPressedInnerShadow@, @loweredShadow@;
|
||||||
|
}
|
||||||
|
|
||||||
|
#clearListButton:-moz-focusring {
|
||||||
|
border-color: @toolbarbuttonFocusedBorderColorAqua@;
|
||||||
|
box-shadow: @focusRingShadow@;
|
||||||
|
}
|
||||||
|
|
||||||
|
#clearListButton:-moz-system-metric(mac-graphite-theme):-moz-focusring {
|
||||||
|
border-color: @toolbarbuttonFocusedBorderColorGraphite@;
|
||||||
|
}
|
||||||
|
|
||||||
|
#clearListButton:-moz-window-inactive {
|
||||||
|
border-color: @toolbarbuttonInactiveBorderColor@;
|
||||||
|
background-image: @toolbarbuttonInactiveBackgroundImage@;
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,11 +39,36 @@ wizardpage {
|
||||||
}
|
}
|
||||||
|
|
||||||
.wizard-buttons button {
|
.wizard-buttons button {
|
||||||
-moz-appearance: toolbarbutton;
|
-moz-appearance: none;
|
||||||
min-height: 22px;
|
min-height: 22px;
|
||||||
margin: 0 6px;
|
margin: 0 6px;
|
||||||
padding: 0;
|
padding: 0 2px;
|
||||||
text-shadow: @loweredShadow@;
|
text-shadow: @loweredShadow@;
|
||||||
|
border: 1px solid @toolbarbuttonBorderColor@;
|
||||||
|
border-radius: @toolbarbuttonCornerRadius@;
|
||||||
|
box-shadow: @loweredShadow@;
|
||||||
|
background: @toolbarbuttonBackground@;
|
||||||
|
background-origin: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wizard-buttons button:hover:active:not([disabled="true"]) {
|
||||||
|
background: @toolbarbuttonPressedBackgroundColor@;
|
||||||
|
text-shadow: @loweredShadow@;
|
||||||
|
box-shadow: @toolbarbuttonPressedInnerShadow@, @loweredShadow@;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wizard-buttons button:-moz-focusring {
|
||||||
|
border-color: @toolbarbuttonFocusedBorderColorAqua@;
|
||||||
|
box-shadow: @focusRingShadow@;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wizard-buttons button:-moz-system-metric(mac-graphite-theme):-moz-focusring {
|
||||||
|
border-color: @toolbarbuttonFocusedBorderColorGraphite@;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wizard-buttons button:-moz-window-inactive {
|
||||||
|
border-color: @toolbarbuttonInactiveBorderColor@;
|
||||||
|
background-image: @toolbarbuttonInactiveBackgroundImage@;
|
||||||
}
|
}
|
||||||
|
|
||||||
.loadingBox {
|
.loadingBox {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче