[Centaury] Restore winxp and vista things in css styles.

master
Fedor 2020-05-25 08:50:56 +03:00
parent f333464fb9
commit 9d107e0c8c
7 changed files with 244 additions and 101 deletions

View File

@ -445,7 +445,7 @@
} }
/* The borders on the glass frame are ours, and inside #browser, and on /* The borders on the glass frame are ours, and inside #browser, and on
* win7 we want to make sure they are "glassy", so we can't use * vista and win7 we want to make sure they are "glassy", so we can't use
* #browser as the exclude-glass container. We use #appcontent instead. */ * #browser as the exclude-glass container. We use #appcontent instead. */
#browser { #browser {
-moz-appearance: none; -moz-appearance: none;
@ -458,7 +458,7 @@
@media (-moz-os-version: windows-win8) { @media (-moz-os-version: windows-win8) {
/* Artificially draw window borders that are covered by lwtheme, see bug 591930. /* Artificially draw window borders that are covered by lwtheme, see bug 591930.
* Borders for win7 are below, win10 doesn't need them. */ * Borders for vista/win7 are below, win10 doesn't need them. */
#main-window[sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme { #main-window[sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme {
border-top: 1px solid @toolbarShadowColor@; border-top: 1px solid @toolbarShadowColor@;
} }
@ -473,20 +473,23 @@
* On aero, the menubar fog disappears for inactive windows, and renders gray * On aero, the menubar fog disappears for inactive windows, and renders gray
* illegible. * illegible.
*/ */
@media not all and (-moz-os-version: windows-vista) {
@media not all and (-moz-os-version: windows-win7) { @media not all and (-moz-os-version: windows-win7) {
#toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive { #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive {
color: ThreeDShadow; color: ThreeDShadow;
} }
} }
} }
}
#main-window[darkwindowframe="true"] #toolbar-menubar:not(:-moz-lwtheme):not(:-moz-window-inactive), #main-window[darkwindowframe="true"] #toolbar-menubar:not(:-moz-lwtheme):not(:-moz-window-inactive),
#main-window[darkwindowframe="true"] #TabsToolbar:not(:-moz-lwtheme):not(:-moz-window-inactive) { #main-window[darkwindowframe="true"] #TabsToolbar:not(:-moz-lwtheme):not(:-moz-window-inactive) {
color: white; color: white;
} }
/* Show borders on win7 and win8, but not on win10 and later: */ /* Show borders on vista through win8, but not on win10 and later: */
@media (-moz-os-version: windows-win7), @media (-moz-os-version: windows-vista),
(-moz-os-version: windows-win7),
(-moz-os-version: windows-win8) { (-moz-os-version: windows-win8) {
/* Vertical toolbar border */ /* Vertical toolbar border */
#main-window:not([customizing])[sizemode=normal] #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme), #main-window:not([customizing])[sizemode=normal] #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme),

View File

@ -131,7 +131,8 @@ toolbar:-moz-lwtheme {
} }
@media (-moz-windows-default-theme) { @media (-moz-windows-default-theme) {
@media (-moz-os-version: windows-win7) { @media (-moz-os-version: windows-vista),
(-moz-os-version: windows-win7) {
#navigator-toolbox::after { #navigator-toolbox::after {
border-bottom-color: #aabccf; border-bottom-color: #aabccf;
} }
@ -159,7 +160,9 @@ toolbar:-moz-lwtheme {
background-image: linear-gradient(@toolbarHighlight@, @toolbarHighlight@); background-image: linear-gradient(@toolbarHighlight@, @toolbarHighlight@);
} }
@media (-moz-os-version: windows-win7) { @media (-moz-os-version: windows-xp),
(-moz-os-version: windows-vista),
(-moz-os-version: windows-win7) {
#nav-bar { #nav-bar {
background-image: linear-gradient(@toolbarHighlight@, transparent) !important; background-image: linear-gradient(@toolbarHighlight@, transparent) !important;
} }
@ -312,6 +315,64 @@ toolbar:-moz-lwtheme {
} }
} }
/* Render a window top border for lwthemes on WinXP modern themes: */
@media (-moz-windows-theme: luna-blue) {
#main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme {
background-image: linear-gradient(to bottom,
rgb(8, 49, 216) 0, rgb(8, 49, 216) 1px,
rgb(15, 77, 227) 1px, rgb(15, 77, 227) 2px,
rgb(22, 106, 238) 2px, rgb(22, 106, 238) 3px,
rgb(8, 85, 221) 3px, rgb(8, 85, 221) 4px,
transparent 4px);
}
#main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme:-moz-window-inactive {
background-image: linear-gradient(to bottom,
rgb(91, 104, 205) 0, rgb(91, 104, 205) 1px,
rgb(116, 128, 220) 1px, rgb(116, 128, 220) 2px,
rgb(117, 140, 221) 2px, rgb(117, 140, 221) 4px,
transparent 4px);
}
}
@media (-moz-windows-theme: luna-silver) {
#main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme {
background-image: linear-gradient(to bottom,
rgb(102,102,126) 0, rgb(102,102,126) 1px,
rgb(168,167,191) 1px, rgb(168,167,191) 2px,
white 2px, white 3px,
rgb(188,188,207) 3px, rgb(188,188,207) 4px,
transparent 4px);
}
#main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme:-moz-window-inactive {
background-image: linear-gradient(to bottom,
rgb(186,186,197) 0, rgb(186,186,197) 1px,
rgb(236,238,245) 1px, rgb(236,238,245) 2px,
white 2px, white 3px,
rgb(215,215,227) 3px, rgb(215,215,227) 4px,
transparent 4px);
}
}
@media (-moz-windows-theme: luna-olive) {
#main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme {
background-image: linear-gradient(to bottom,
rgb(139,161,105) 0, rgb(139,161,105) 1px,
rgb(171, 189, 133) 1px, rgb(171, 189, 133) 2px,
rgb(164,178,127) 2px, rgb(164,178,127) 3px,
transparent 3px);
}
#main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme:-moz-window-inactive {
background-image: linear-gradient(to bottom,
rgb(207, 214, 188) 0, rgb(207, 214, 188) 1px,
rgb(224, 226, 200) 1px, rgb(224, 226, 200) 2px,
rgb(214, 216, 190) 2px, rgb(214, 216, 190) 3px,
transparent 3px);
}
}
#TabsToolbar:not([collapsed="true"]) + #nav-bar { #TabsToolbar:not([collapsed="true"]) + #nav-bar {
/* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */ /* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */
margin-top: calc(-1 * var(--navbar-tab-toolbar-highlight-overlap)); margin-top: calc(-1 * var(--navbar-tab-toolbar-highlight-overlap));
@ -342,6 +403,12 @@ toolbar:-moz-lwtheme {
background-color: -moz-dialog; background-color: -moz-dialog;
} }
@media (-moz-os-version: windows-xp) and (-moz-windows-default-theme) {
#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar {
margin-top: 4px;
}
}
/* ::::: titlebar ::::: */ /* ::::: titlebar ::::: */
#main-window[sizemode="normal"] > #titlebar { #main-window[sizemode="normal"] > #titlebar {
@ -372,6 +439,12 @@ toolbar:-moz-lwtheme {
margin-left: 22px; /* space needed for Aero Snap */ margin-left: 22px; /* space needed for Aero Snap */
} }
@media (-moz-os-version: windows-xp) {
.titlebar-placeholder[type="caption-buttons"] {
margin-left: 10px; /* less space needed on XP because there's no Aero Snap */
}
}
/* titlebar command buttons */ /* titlebar command buttons */
#titlebar-min { #titlebar-min {
@ -697,7 +770,10 @@ toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
max-width: 32px; max-width: 32px;
} }
@media (-moz-os-version: windows-win7) { @media (-moz-os-version: windows-xp),
(-moz-os-version: windows-vista),
(-moz-os-version: windows-win7) {
/* < Win8 */
:root { :root {
--toolbarbutton-hover-background: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1)); --toolbarbutton-hover-background: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
--toolbarbutton-hover-bordercolor: hsla(210,54%,20%,.15) hsla(210,54%,20%,.2) hsla(210,54%,20%,.25); --toolbarbutton-hover-bordercolor: hsla(210,54%,20%,.15) hsla(210,54%,20%,.2) hsla(210,54%,20%,.25);
@ -1015,7 +1091,9 @@ toolbar[brighttext] #close-button {
list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-white); list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-white);
} }
@media (-moz-os-version: windows-win7) { @media (-moz-os-version: windows-xp),
(-moz-os-version: windows-vista),
(-moz-os-version: windows-win7) {
#window-controls { #window-controls {
margin-inline-start: 4px; margin-inline-start: 4px;
} }
@ -1071,7 +1149,8 @@ toolbar[brighttext] #close-button {
} }
} }
@media (-moz-os-version: windows-win7) { @media (-moz-os-version: windows-vista),
(-moz-os-version: windows-win7) {
#window-controls { #window-controls {
-moz-box-align: start; -moz-box-align: start;
} }
@ -1115,7 +1194,8 @@ toolbar[brighttext] #close-button {
} }
@media (-moz-windows-default-theme) { @media (-moz-windows-default-theme) {
@media (-moz-os-version: windows-win7), @media (-moz-os-version: windows-vista),
(-moz-os-version: windows-win7),
(-moz-os-version: windows-win8) { (-moz-os-version: windows-win8) {
#main-window:not(:-moz-lwtheme) { #main-window:not(:-moz-lwtheme) {
--urlbar-border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.27) hsla(210,54%,20%,.3); --urlbar-border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.27) hsla(210,54%,20%,.3);
@ -1152,7 +1232,8 @@ toolbar[brighttext] #close-button {
border-radius: 1px; border-radius: 1px;
} }
@media (-moz-os-version: windows-win7), @media (-moz-os-version: windows-vista),
(-moz-os-version: windows-win7),
(-moz-os-version: windows-win8) { (-moz-os-version: windows-win8) {
#urlbar:not(:-moz-lwtheme), #urlbar:not(:-moz-lwtheme),
.searchbar-textbox:not(:-moz-lwtheme) { .searchbar-textbox:not(:-moz-lwtheme) {
@ -1175,11 +1256,13 @@ toolbar[brighttext] #close-button {
} }
} }
@media not all and (-moz-os-version: windows-xp) {
#urlbar:not(:-moz-lwtheme)[focused], #urlbar:not(:-moz-lwtheme)[focused],
.searchbar-textbox:not(:-moz-lwtheme)[focused] { .searchbar-textbox:not(:-moz-lwtheme)[focused] {
border-color: Highlight; border-color: Highlight;
} }
} }
}
@media (-moz-os-version: windows-win10) { @media (-moz-os-version: windows-win10) {
#urlbar, #urlbar,
@ -1855,7 +1938,9 @@ html|span.ac-emphasize-text-url {
} }
} }
@media (-moz-os-version: windows-win7) { @media (-moz-os-version: windows-xp),
(-moz-os-version: windows-vista),
(-moz-os-version: windows-win7) {
#sidebar-header > .close-icon { #sidebar-header > .close-icon {
padding-top: 4px; padding-top: 4px;
padding-bottom: 4px; padding-bottom: 4px;
@ -1876,9 +1961,18 @@ html|span.ac-emphasize-text-url {
margin-bottom: calc(-1 * var(--tab-toolbar-navbar-overlap)); /* overlap the nav-bar's top border */ margin-bottom: calc(-1 * var(--tab-toolbar-navbar-overlap)); /* overlap the nav-bar's top border */
} }
@media (-moz-os-version: windows-xp) and (-moz-windows-default-theme) {
#main-window[sizemode=normal] #TabsToolbar {
padding-left: 2px;
padding-right: 2px;
}
}
%include ../shared/tabs.inc.css %include ../shared/tabs.inc.css
/* Remove border between tab strip and navigation toolbar on Windows 10+ */ /* Remove border between tab strip and navigation toolbar on Windows 10+ */
@media not all and (-moz-os-version: windows-xp) {
@media not all and (-moz-os-version: windows-vista) {
@media not all and (-moz-os-version: windows-win7) { @media not all and (-moz-os-version: windows-win7) {
@media not all and (-moz-os-version: windows-win8) { @media not all and (-moz-os-version: windows-win8) {
@media (-moz-windows-default-theme) { @media (-moz-windows-default-theme) {
@ -1902,6 +1996,8 @@ html|span.ac-emphasize-text-url {
} }
} }
} }
}
}
/* Invert the unhovered close tab icons on bright-text tabs */ /* Invert the unhovered close tab icons on bright-text tabs */
@media not all and (min-resolution: 1.1dppx) { @media not all and (min-resolution: 1.1dppx) {
@ -2103,7 +2199,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
.addon-install-confirmation-name { .addon-install-confirmation-name {
font-weight: bold; font-weight: bold;
} }
7
/* Notification icon box */ /* Notification icon box */
.notification-anchor-icon:-moz-focusring { .notification-anchor-icon:-moz-focusring {
@ -2293,6 +2389,22 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton {
position: relative; position: relative;
} }
@media (-moz-os-version: windows-xp) {
@media not all and (-moz-windows-classic) {
#private-browsing-indicator-titlebar > .private-browsing-indicator {
background-image: url("chrome://browser/skin/privatebrowsing-mask-titlebar-win7-tall.png");
height: 28px;
}
#main-window[sizemode="maximized"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator {
top: -5px;
}
#main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator {
top: -1px;
}
}
}
@media (-moz-windows-classic) { @media (-moz-windows-classic) {
/** /**
* We have to use top instead of background-position in this case, otherwise * We have to use top instead of background-position in this case, otherwise
@ -2304,7 +2416,8 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton {
} }
} }
@media (-moz-os-version: windows-win7) { @media (-moz-os-version: windows-vista),
(-moz-os-version: windows-win7) {
@media (-moz-windows-glass) { @media (-moz-windows-glass) {
#main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator { #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator {
top: 1px; top: 1px;
@ -2342,14 +2455,19 @@ notification.pluginVulnerable > .notification-inner > .messageCloseButton {
margin-top: -4px; margin-top: -4px;
} }
@media not all and (-moz-os-version: windows-xp) {
%include browser-aero.css %include browser-aero.css
}
.browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent { .browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent {
padding: 0; padding: 0;
overflow: hidden; overflow: hidden;
} }
@media (-moz-os-version: windows-win7) { @media (-moz-os-version: windows-xp),
(-moz-os-version: windows-vista),
(-moz-os-version: windows-win7) {
.cui-widget-panelview[id^=PanelUI-webext-] { .cui-widget-panelview[id^=PanelUI-webext-] {
border-radius: 4px; border-radius: 4px;
} }

View File

@ -123,6 +123,8 @@ menu.subviewbutton > .menu-right:-moz-locale-dir(rtl) {
} }
/* Win8 and beyond. */ /* Win8 and beyond. */
@media not all and (-moz-os-version: windows-xp) {
@media not all and (-moz-os-version: windows-vista) {
@media not all and (-moz-os-version: windows-win7) { @media not all and (-moz-os-version: windows-win7) {
panelview .toolbarbutton-1, panelview .toolbarbutton-1,
.subviewbutton, .subviewbutton,
@ -136,4 +138,6 @@ menu.subviewbutton > .menu-right:-moz-locale-dir(rtl) {
border-radius: 0; border-radius: 0;
} }
} }
}
}

View File

@ -18,6 +18,7 @@
/*** Highlighted list items ***/ /*** Highlighted list items ***/
@media not all and (-moz-os-version: windows-xp) {
@media (-moz-windows-default-theme) { @media (-moz-windows-default-theme) {
/* /*
-moz-appearance: menuitem is almost right, but the hover effect is not -moz-appearance: menuitem is almost right, but the hover effect is not
@ -45,3 +46,4 @@
outline-offset: -2px; outline-offset: -2px;
} }
} }
}

View File

@ -166,10 +166,14 @@ toolbar[brighttext] #downloads-button:not([counter])[attention="success"] > #dow
font-size: 9px; font-size: 9px;
line-height: 9px; line-height: 9px;
text-align: center; text-align: center;
}
@media not all and (-moz-os-version: windows-xp) {
#downloads-indicator-counter {
/* Bug 812345 added this... */ /* Bug 812345 added this... */
margin-bottom: -1px; margin-bottom: -1px;
} }
}
toolbar[brighttext] #downloads-indicator-counter { toolbar[brighttext] #downloads-indicator-counter {
color: white; color: white;

View File

@ -139,6 +139,12 @@
padding-inline-end: 9px; padding-inline-end: 9px;
} }
@media not all and (-moz-os-version: windows-xp) {
#placesView {
border-top: none;
}
@media not all and (-moz-windows-classic) { @media not all and (-moz-windows-classic) {
#placesToolbox { #placesToolbox {
-moz-appearance: none; -moz-appearance: none;
@ -163,6 +169,7 @@
position: relative; position: relative;
} }
} }
}
@media (-moz-windows-glass) { @media (-moz-windows-glass) {
#placesToolbox { #placesToolbox {
@ -174,7 +181,8 @@
} }
} }
@media (-moz-windows-default-theme) and (-moz-os-version: windows-win7) { @media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
(-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
#placesView, #placesView,
#infoPane, #infoPane,
#placesList, #placesList,

View File

@ -24,7 +24,9 @@
cursor: default; cursor: default;
} }
/* Style Places sidebars as Vista media collection */
@media (-moz-windows-default-theme) { @media (-moz-windows-default-theme) {
@media not all and (-moz-os-version: windows-xp) {
.sidebar-placesTree { .sidebar-placesTree {
background-color: transparent; background-color: transparent;
border-top: none; border-top: none;
@ -33,8 +35,10 @@
.sidebar-placesTreechildren::-moz-tree-cell-text(leaf, hover) { .sidebar-placesTreechildren::-moz-tree-cell-text(leaf, hover) {
text-decoration: none; text-decoration: none;
} }
}
@media (-moz-os-version: windows-win7) { @media (-moz-os-version: windows-vista),
(-moz-os-version: windows-win7) {
#bookmarksPanel, #bookmarksPanel,
#history-panel, #history-panel,
#tabs-panel { #tabs-panel {