General updates

Combobox buttons now share the same button styling as GtkButton.
Removed some uneeded combobox styling from gtk-basic-effects
Corrected the errors caused by the greeter theme.
Copied a few things over from the 3.24 theme to the 3.0 theme.
This commit is contained in:
EMH-Mark-I 2020-04-23 19:47:13 -05:00
parent d19ed56b50
commit bbe77dd9be
9 changed files with 80 additions and 213 deletions

View File

@ -1,222 +1,92 @@
/********* /******************************************
* panel * * lightdm-gtk-greeter / XFCE screensaver *
*********/ ******************************************/
/*
Contributor notes:
Please use two space indentions.
Stack all related and child selectors and selector states into a logical hierarchy to a readable degree.
Make sure that all changes made here are part of the screensaver.
*/
/* panel */
#panel_window { #panel_window {
background-image: none; -gtk-icon-style: regular;
color: white; color: @font_color;
font: bold; } font-weight: bold;
border-top-color: @border_bright;
border-right-color: @border_dark;
border-left-color: @border_bright;
border-bottom-color: @border_dark;
background-color: @button_bg_color;
box-shadow: inset -1px -1px @border_shade, inset 1px 1px @border_light; }
#panel_window .menubar, #panel_window .menubar,
#panel_window .menubar > .menuitem { #panel_window .menubar > .menuitem {
background-color: #c0c0c0; background-color: @bg_color;
background-image: none; color: @font_color; }
color: black; }
#panel_window .menubar > .menuitem:hover { #panel_window .menubar > .menuitem:hover {
border-style: none; border-style: none;
background-color: #000080; background-color: @selected_bg_color;
background-image: none; color: @font_bright; }
color: white; }
#panel_window .menubar > .menuitem *:hover { #panel_window .menubar > .menuitem *:hover {
border-style: none; border-style: none;
background-color: #000080; background-color: @selected_bg_color;
background-image: none; color: @font_bright; }
color: white; } #panel_window .menubar > .menuitem:disabled {
#panel_window .menubar > .menuitem:insensitive { color: @disabled_font;
color: #808080; text-shadow: 1px 1px 0 @disabled_font_shadow; }
text-shadow: 1px 1px 0 white; } #panel_window .menubar .menu .menuitem {
#panel_window .menubar .menu { font-weight: normal;
border-radius: 1px; } text-shadow: none; }
#panel_window .menubar .menu .menuitem {
font: normal;
text-shadow: none; }
/**************** /****************
* login window * * login window *
****************/ ****************/
#login_window,
#shutdown_dialog,
#restart_dialog {
border-style: none;
border-radius: 2px;
background-color: @lightdm_bg_color;
color: @lightdm_fg_color;
/* draw border using box-shadow */
box-shadow: inset 1px 0 mix(shade(@lightdm_bg_color, 0.7), @lightdm_fg_color, 0.21),
inset -1px 0 mix(shade(@lightdm_bg_color, 0.7), @lightdm_fg_color, 0.21),
inset 0 1px mix(shade(@lightdm_bg_color, 0.7), @lightdm_fg_color, 0.21),
inset 0 -1px mix(shade(@lightdm_bg_color, 0.7), @lightdm_fg_color, 0.21); }
#content_frame { #content_frame {
padding-bottom: 14px; } border: 1px solid;
color: @button_text_color;
outline-color: @outline_color;
border-top-color: @border_bright;
border-right-color: @border_dark;
border-left-color: @border_bright;
border-bottom: none;
background-color: @button_bg_color;
box-shadow: inset -1px 0px @border_shade, inset 1px 1px @border_light; }
#login_window .menu { #login_window {
border-radius: 1px; } border: 1px solid;
color: @button_text_color;
/* outline-color: @outline_color;
#login_window GtkComboBox .button, border-top: none;
#login_window GtkComboBox .button:hover, border-right-color: @border_dark;
#login_window GtkComboBox .button:active, border-left-color: @border_bright;
#login_window GtkComboBox .button:active:hover, border-bottom-color: @border_dark;
#login_window GtkComboBox .button:focus, background-color: @button_bg_color;
#login_window GtkComboBox .button:hover:focus, box-shadow: inset -1px -1px @border_shade, inset 1px 0px @border_light; }
#login_window GtkComboBox .button:active:focus,
#login_window GtkComboBox .button:active:hover:focus {
padding: 0;
background: none;
border-style: none;
box-shadow: none;
}
#login_window GtkComboBox .button:focus,
#login_window GtkComboBox .button:hover:focus,
#login_window GtkComboBox .button:active:focus,
#login_window GtkComboBox .button:active:hover:focus {
background: none;
border-style: none;
}
#login_window #user_combobox {
color: @lightdm_fg_color;
font: 18px;
}
#login_window #user_combobox .menu {
font: normal;
}
#login_window #user_combobox .arrow {
color: mix(@lightdm_fg_color, @lightdm_bg_color, 0.5);
} */
#login_window .entry {
padding: 3px 5px;
border-width: 1px;
border-style: solid;
border-color: shade(@lightdm_bg_color, 0.8);
border-radius: 2px;
background-color: shade(@lightdm_bg_color, 0.9);
background-image: none;
color: @lightdm_fg_color;
box-shadow: none;
transition: all 150ms ease-out; }
#login_window .entry:focus,
#login_window .entry:hover {
border-color: shade(@lightdm_bg_color, 0.7);
box-shadow: inset 1px 0 alpha(@dark_shadow, 0.10),
inset 0 1px alpha(@dark_shadow, 0.12),
inset -1px 0 alpha(@dark_shadow, 0.10),
inset 0 -1px alpha(@dark_shadow, 0.05); }
#login_window .button,
#shutdown_dialog .button,
#restart_dialog .button {
padding: 3px 15px;
border-width: 1px;
border-radius: 2px;
border-style: solid;
border-color: shade(@lightdm_bg_color, 0.8);
background-color: shade(@lightdm_bg_color, 1.08);
background-image: none;
color: @lightdm_fg_color;
transition: all 150ms ease-out; }
#user_image { #user_image {
padding: 3px; /* Keeping this blank */ }
border-radius: 2px;
/* draw border using box-shadow */
box-shadow: inset 1px 0 shade(@lightdm_bg_color, 0.7),
inset -1px 0 shade(@lightdm_bg_color, 0.7),
inset 0 1px shade(@lightdm_bg_color, 0.7),
inset 0 -1px shade(@lightdm_bg_color, 0.7); }
#user_image_border { #user_image_border {
border-radius: 2px; /* Keeping this blank */ }
background-color: shade(@lightdm_bg_color, 0.9);
background-image: none;
box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07),
inset 0 1px alpha(@dark_shadow, 0.08),
inset -1px 0 alpha(@dark_shadow, 0.07),
inset 0 -1px alpha(@dark_shadow, 0.05); }
#buttonbox_frame { #buttonbox_frame {
padding-top: 10px; padding-top: 10px;
padding-bottom: 0; padding-bottom: 0;
border-style: none; border-style: none;
border-bottom-left-radius: 2px;
border-bottom-right-radius: 2px;
background-color: transparent; background-color: transparent;
background-image: none; background-image: none;
box-shadow: none; } box-shadow: none; }
/******************************
* default and focused button *
******************************/
/*
#login_window .button.default,
#shutdown_dialog .button.default,
#restart_dialog .button.default,
#login_window .button:focus,
#login_window .button:active:focus,
#shutdown_dialog .button:focus,
#shutdown_dialog .button:active:focus,
#restart_dialog .button:focus,
#restart_dialog .button:active:focus {
border-color: shade(@theme_selected_bg_color, 0.8);
background-color: shade(@theme_selected_bg_color, 1.08);
background-image: none;
color: @theme_selected_fg_color;
}
#login_window .button.default:hover,
#shutdown_dialog .button.default:hover,
#restart_dialog .button.default:hover,
#login_window .button:hover:focus,
#login_window .button:active:hover:focus,
#shutdown_dialog .button:hover:focus,
#shutdown_dialog .button:active:hover:focus,
#restart_dialog .button:hover:focus,
#restart_dialog .button:active:hover:focus {
border-color: shade(@theme_selected_bg_color, 0.7);
background-color: @theme_selected_bg_color;
}*/
/*******************
* shutdown button *
*******************/
/*
#shutdown_button.button {
border-color: shade(@error_bg_color, 0.8);
background-color: shade(@error_bg_color, 1.08);
background-image: none;
color: @error_fg_color; }
#shutdown_button.button:hover,
#shutdown_button.button:active,
#shutdown_button.button:active:hover {
border-color: shade(@error_bg_color, 0.7);
background-color: @error_bg_color; } */
/******************
* restart button *
******************/
/*
#restart_button.button {
border-color: shade(@warning_bg_color, 0.8);
background-color: shade(@warning_bg_color, 1.08);
background-image: none;
color: @warning_fg_color; }
#restart_button.button:hover,
#restart_button.button:active,
#restart_button.button:active:hover {
border-color: shade(@warning_bg_color, 0.7);
background-color: @warning_bg_color; } */
/******************** /********************
* password warning * * password warning *
********************/ ********************/
#greeter_infobar { #greeter_infobar {
font: bold; } margin-left: 4px;
margin-right: 4px;
background-color: transparent;
border: none;
font-weight: bold; }
#window { #window {
border: 2px solid red; } /* Keeping this blank */ }

View File

@ -38,12 +38,10 @@ slider {
background-size: 2px 2px; background-size: 2px 2px;
background-position: 0 0, 1px 1px; } background-position: 0 0, 1px 1px; }
combobox > window,
colorswatch:selected, colorswatch:selected,
entry, entry,
switch, switch,
scale trough, scale trough,
combobox button:checked,
popover button.flat:selected, popover button.flat:selected,
popover button.flat:active, popover button.flat:active,
button.appmenu:selected, button.appmenu:selected,

View File

@ -20,12 +20,11 @@ combobox {
margin-right: 2px; margin-right: 2px;
margin-left: 2px; margin-left: 2px;
min-width: 16px; min-width: 16px;
min-height: 16px; min-height: 16px; }
border-top: 1px solid @border_color; combobox button:active,
border-left: 1px solid @border_color; combobox button:checked {
border-bottom: 1px solid @border_dark; border-color: @border_shade;
border-right: 1px solid @border_dark; box-shadow: none; }
box-shadow: inset -1px -1px @border_shade, inset 1px 1px @border_bright; }
* combobox button { * combobox button {
padding-left: 0px; } padding-left: 0px; }

View File

@ -23,6 +23,8 @@ headerbar,
.titlebar:backdrop { .titlebar:backdrop {
background-image: none; background-image: none;
background-color: @inactive_title_bg_color; } background-color: @inactive_title_bg_color; }
headerbar,
.titlebar,
headerbar .title, headerbar .title,
headerbar .subtitle, headerbar .subtitle,
headerbar > checkbutton label, headerbar > checkbutton label,

View File

@ -36,7 +36,7 @@
@define-color outline_color black; @define-color outline_color black;
@define-color font_color @text_color; /* Windows Theme: windowtext (any white area text)*/ @define-color font_color @text_color; /* Windows Theme: windowtext (any white area text)*/
@define-color font_bright white; @define-color font_bright white;
@define-color disabled_font_shadow @border_light; /* Windows Theme: buttonhilight, testing confirmed this is what Windows 95 Uses for this setting */ @define-color disabled_font_shadow @border_bright; /* Windows Theme: buttonhilight, testing confirmed this is what Windows 95 Uses for this setting */
@define-color disabled_font @border_shade; /* Windows Theme: buttonshadow, testing confirmed this is what Windows 95 Uses for this setting */ @define-color disabled_font @border_shade; /* Windows Theme: buttonshadow, testing confirmed this is what Windows 95 Uses for this setting */
@define-color icon_shadow black; @define-color icon_shadow black;
@define-color icon_shadow_bright white; @define-color icon_shadow_bright white;
@ -179,5 +179,5 @@
@import url("apps/unity.css"); @import url("apps/unity.css");
@import url("apps/xfce.css"); @import url("apps/xfce.css");
@import url("apps/nemo.css"); @import url("apps/nemo.css");
@import url("apps/synaptic.css"); @import url("apps/synaptic.css");*/
@import url("apps/lightdm-gtk-greeter.css"); */ @import url("apps/lightdm-gtk-greeter.css");

View File

@ -13,7 +13,7 @@
#panel_window { #panel_window {
-gtk-icon-style: regular; -gtk-icon-style: regular;
color: @font_color; color: @font_color;
font: bold; font-weight: bold;
border-top-color: @border_bright; border-top-color: @border_bright;
border-right-color: @border_dark; border-right-color: @border_dark;
border-left-color: @border_bright; border-left-color: @border_bright;
@ -32,11 +32,11 @@
border-style: none; border-style: none;
background-color: @selected_bg_color; background-color: @selected_bg_color;
color: @font_bright; } color: @font_bright; }
#panel_window .menubar > .menuitem:insensitive { #panel_window .menubar > .menuitem:disabled {
color: @disabled_font; color: @disabled_font;
text-shadow: 1px 1px 0 @disabled_font_shadow; } text-shadow: 1px 1px 0 @disabled_font_shadow; }
#panel_window .menubar .menu .menuitem { #panel_window .menubar .menu .menuitem {
font: normal; font-weight: normal;
text-shadow: none; } text-shadow: none; }
/**************** /****************
@ -86,7 +86,7 @@
margin-right: 4px; margin-right: 4px;
background-color: transparent; background-color: transparent;
border: none; border: none;
font: bold; } font-weight: bold; }
#window { #window {
/* Keeping this blank */ } /* Keeping this blank */ }

View File

@ -38,12 +38,10 @@ slider {
background-size: 2px 2px; background-size: 2px 2px;
background-position: 0 0, 1px 1px; } background-position: 0 0, 1px 1px; }
combobox > window,
colorswatch:selected, colorswatch:selected,
entry, entry,
switch, switch,
scale trough, scale trough,
combobox button:checked,
popover button.flat:selected, popover button.flat:selected,
popover button.flat:active, popover button.flat:active,
button.appmenu:selected, button.appmenu:selected,

View File

@ -20,12 +20,11 @@ combobox {
margin-right: 2px; margin-right: 2px;
margin-left: 2px; margin-left: 2px;
min-width: 16px; min-width: 16px;
min-height: 16px; min-height: 16px; }
border-top: 1px solid @border_color; combobox button:active,
border-left: 1px solid @border_color; combobox button:checked {
border-bottom: 1px solid @border_dark; border-color: @border_shade;
border-right: 1px solid @border_dark; box-shadow: none; }
box-shadow: inset -1px -1px @border_shade, inset 1px 1px @border_bright; }
* combobox button { * combobox button {
padding-left: 0px; } padding-left: 0px; }

View File

@ -47,3 +47,4 @@ headerbar,
headerbar scale { headerbar scale {
margin-top: 4px; margin-top: 4px;
margin-bottom: -6px; } margin-bottom: -6px; }