Bug 574681 - Tweak app button appearance. r=dao a=blocking

This commit is contained in:
Stephen Horlander 2010-09-07 12:44:36 +02:00
Родитель c66432e364
Коммит 89954648f7
2 изменённых файлов: 77 добавлений и 50 удалений

Просмотреть файл

@ -13,6 +13,56 @@
background-image: -moz-linear-gradient(white, @toolbarHighlight@ 30%), background-image: -moz-linear-gradient(white, @toolbarHighlight@ 30%),
-moz-linear-gradient(@customToolbarColor@, @customToolbarColor@); -moz-linear-gradient(@customToolbarColor@, @customToolbarColor@);
} }
/* App menu button */
#main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container {
margin-top: 1px;
}
#appmenu-button {
border: 2px solid;
border-top: none;
-moz-border-left-colors: rgba(255,255,255,.5) rgba(83,42,6,.9);
-moz-border-bottom-colors: rgba(255,255,255,.5) rgba(83,42,6,.9);
-moz-border-right-colors: rgba(255,255,255,.5) rgba(83,42,6,.9);
-moz-box-shadow: 0 1px 0 rgba(255,255,255,.25) inset,
0 0 2px 1px rgba(255,255,255,.25) inset;
}
#appmenu-button:-moz-window-inactive {
-moz-border-left-colors: rgba(255,255,255,.4) rgba(0,0,0,.5);
-moz-border-bottom-colors: rgba(255,255,255,.4) rgba(0,0,0,.5);
-moz-border-right-colors: rgba(255,255,255,.4) rgba(0,0,0,.5);
-moz-box-shadow: 0 0 0 1px rgba(255,255,255,.25) inset;
}
/* Bug 413060, comment 16: Vista Aero is a special case where we use a
tooltip appearance for the address bar popup panels */
#identity-popup,
#editBookmarkPanel,
#notification-popup {
-moz-appearance: tooltip;
color: InfoText;
}
/* Make the left and right paddings smaller, to compensate for the horizontal
space added by the tooltip appearance, see bug 432529. */
#identity-popup-container {
-moz-padding-start: 6px;
-moz-padding-end: 6px;
}
#sidebar-splitter {
border: 0;
-moz-border-end: 1px solid #A9B7C9;
min-width: 0;
width: 3px;
background-color: transparent;
-moz-margin-start: -3px;
position: relative;
z-index: 10;
}
} }
@media all and (-moz-windows-compositor) { @media all and (-moz-windows-compositor) {
@ -115,35 +165,6 @@
} }
} }
@media all and (-moz-windows-default-theme) {
/* Bug 413060, comment 16: Vista Aero is a special case where we use a
tooltip appearance for the address bar popup panels */
#identity-popup,
#editBookmarkPanel,
#notification-popup {
-moz-appearance: tooltip;
color: InfoText;
}
/* Make the left and right paddings smaller, to compensate for the horizontal
space added by the tooltip appearance, see bug 432529. */
#identity-popup-container {
-moz-padding-start: 6px;
-moz-padding-end: 6px;
}
#sidebar-splitter {
border: 0;
-moz-border-end: 1px solid #A9B7C9;
min-width: 0;
width: 3px;
background-color: transparent;
-moz-margin-start: -3px;
position: relative;
z-index: 10;
}
}
/* ::::: fullscreen window controls ::::: */ /* ::::: fullscreen window controls ::::: */
#window-controls { #window-controls {

Просмотреть файл

@ -114,31 +114,42 @@ statusbarpanel#statusbar-display {
#appmenu-button { #appmenu-button {
-moz-appearance: none; -moz-appearance: none;
background-color: rgb(228,120,14); background-image: -moz-linear-gradient(rgb(247,182,82), rgb(215,98,10) 95%);
background-image: -moz-linear-gradient(rgba(255,255,255,.7),
rgba(255,255,255,.4) 10%,
rgba(255,255,255,0) 50%);
background-clip: padding-box; background-clip: padding-box;
border: 1px solid rgba(0,0,0,.5); -moz-border-radius: 0 0 4px 4px;
border-top-style: none; border: 1px solid rgba(83,42,6,.9);
-moz-border-radius-bottomleft: 4px; border-top: none;
-moz-border-radius-bottomright: 4px; -moz-box-shadow: 0 1px 0 rgba(255,255,255,.25) inset,
-moz-box-shadow: 0 0 5px rgba(255,255,255,.5) inset; 0 0 0 1px rgba(255,255,255,.25) inset;
color: white; color: white;
text-shadow: 0 0 2px #333; text-shadow: 0 0 1px rgba(0,0,0,.7),
0 1px 2px rgba(0,0,0,.5);
font-weight: bold; font-weight: bold;
padding: .1em 1.5em; padding: .1em 1.5em .15em;
margin: 0; margin: 0;
} }
#appmenu-button:-moz-window-inactive {
background: transparent;
border-color: rgba(0,0,0,.4);
}
#appmenu-button:hover:not(:active):not([open]) { #appmenu-button:hover:not(:active):not([open]) {
background-color: rgb(248,140,34); background-image: -moz-radial-gradient(center bottom, farthest-side, rgba(252,240,89,.5) 10%, rgba(252,240,89,0) 70%),
-moz-radial-gradient(center bottom, farthest-side, rgb(236,133,0), rgba(255,229,172,0)),
-moz-linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%);
border-color: rgba(83,42,6,.9);
-moz-box-shadow: 0 1px 0 rgba(255,255,255,.1) inset,
0 0 2px 1px rgba(250,234,169,.7) inset,
0 -1px 0 rgba(250,234,169,.5) inset;
} }
#appmenu-button:hover:active, #appmenu-button:hover:active,
#appmenu-button[open] { #appmenu-button[open] {
background-image: -moz-linear-gradient(rgba(0,0,0,.3), rgba(0,0,0,.2) 10%, transparent 60%); background-image: -moz-linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%);
-moz-box-shadow: 0 0 4px rgba(0,0,0,.3) inset; -moz-border-radius: 0;
-moz-box-shadow: 0 2px 4px rgba(0,0,0,.4) inset,
0 1px 1px rgba(0,0,0,.2) inset;
} }
#appmenu-button > .button-box { #appmenu-button > .button-box {
@ -303,14 +314,9 @@ statusbarpanel#statusbar-display {
margin-right: 15px; margin-right: 15px;
} }
/* aesthetic - push the fx button off the top window border */ @media all and (-moz-windows-classic) {
@media not all and (-moz-windows-classic) {
#main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container { #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container {
%ifndef WINSTRIPE_AERO margin-top: 4px;
margin-top: 1px;
%else
margin-top: 2px;
%endif
} }
} }