From bbe77dd9be96081d88b14c2ec9227fc8fddbd802 Mon Sep 17 00:00:00 2001 From: EMH-Mark-I Date: Thu, 23 Apr 2020 19:47:13 -0500 Subject: [PATCH] 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. --- .../gtk-3.0/apps/lightdm-gtk-greeter.css | 250 +++++------------- Theme/Chicago95/gtk-3.0/gtk-basic-effects.css | 2 - Theme/Chicago95/gtk-3.0/gtk-combobox.css | 11 +- Theme/Chicago95/gtk-3.0/gtk-headerbars.css | 2 + Theme/Chicago95/gtk-3.0/gtk.css | 6 +- .../gtk-3.24/apps/lightdm-gtk-greeter.css | 8 +- .../Chicago95/gtk-3.24/gtk-basic-effects.css | 2 - Theme/Chicago95/gtk-3.24/gtk-combobox.css | 11 +- Theme/Chicago95/gtk-3.24/gtk-headerbars.css | 1 + 9 files changed, 80 insertions(+), 213 deletions(-) diff --git a/Theme/Chicago95/gtk-3.0/apps/lightdm-gtk-greeter.css b/Theme/Chicago95/gtk-3.0/apps/lightdm-gtk-greeter.css index 957a02e..f7cccca 100644 --- a/Theme/Chicago95/gtk-3.0/apps/lightdm-gtk-greeter.css +++ b/Theme/Chicago95/gtk-3.0/apps/lightdm-gtk-greeter.css @@ -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 { - background-image: none; - color: white; - font: bold; } + -gtk-icon-style: regular; + color: @font_color; + 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 > .menuitem { - background-color: #c0c0c0; - background-image: none; - color: black; } + background-color: @bg_color; + color: @font_color; } #panel_window .menubar > .menuitem:hover { border-style: none; - background-color: #000080; - background-image: none; - color: white; } + background-color: @selected_bg_color; + color: @font_bright; } #panel_window .menubar > .menuitem *:hover { border-style: none; - background-color: #000080; - background-image: none; - color: white; } - #panel_window .menubar > .menuitem:insensitive { - color: #808080; - text-shadow: 1px 1px 0 white; } - #panel_window .menubar .menu { - border-radius: 1px; } - #panel_window .menubar .menu .menuitem { - font: normal; - text-shadow: none; } + background-color: @selected_bg_color; + color: @font_bright; } + #panel_window .menubar > .menuitem:disabled { + color: @disabled_font; + text-shadow: 1px 1px 0 @disabled_font_shadow; } + #panel_window .menubar .menu .menuitem { + font-weight: normal; + text-shadow: none; } /**************** * 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 { - 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 { - border-radius: 1px; } - -/* -#login_window GtkComboBox .button, -#login_window GtkComboBox .button:hover, -#login_window GtkComboBox .button:active, -#login_window GtkComboBox .button:active:hover, -#login_window GtkComboBox .button:focus, -#login_window GtkComboBox .button:hover:focus, -#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; } +#login_window { + border: 1px solid; + color: @button_text_color; + outline-color: @outline_color; + border-top: none; + 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 0px @border_light; } #user_image { - padding: 3px; - 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); } +/* Keeping this blank */ } #user_image_border { - border-radius: 2px; - 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); } +/* Keeping this blank */ } #buttonbox_frame { padding-top: 10px; padding-bottom: 0; border-style: none; - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; background-color: transparent; background-image: 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 * ********************/ #greeter_infobar { - font: bold; } + margin-left: 4px; + margin-right: 4px; + background-color: transparent; + border: none; + font-weight: bold; } #window { - border: 2px solid red; } +/* Keeping this blank */ } diff --git a/Theme/Chicago95/gtk-3.0/gtk-basic-effects.css b/Theme/Chicago95/gtk-3.0/gtk-basic-effects.css index cf82b7a..300fe15 100644 --- a/Theme/Chicago95/gtk-3.0/gtk-basic-effects.css +++ b/Theme/Chicago95/gtk-3.0/gtk-basic-effects.css @@ -38,12 +38,10 @@ slider { background-size: 2px 2px; background-position: 0 0, 1px 1px; } -combobox > window, colorswatch:selected, entry, switch, scale trough, -combobox button:checked, popover button.flat:selected, popover button.flat:active, button.appmenu:selected, diff --git a/Theme/Chicago95/gtk-3.0/gtk-combobox.css b/Theme/Chicago95/gtk-3.0/gtk-combobox.css index d645d89..afed347 100644 --- a/Theme/Chicago95/gtk-3.0/gtk-combobox.css +++ b/Theme/Chicago95/gtk-3.0/gtk-combobox.css @@ -20,12 +20,11 @@ combobox { margin-right: 2px; margin-left: 2px; min-width: 16px; - min-height: 16px; - border-top: 1px solid @border_color; - border-left: 1px solid @border_color; - border-bottom: 1px solid @border_dark; - border-right: 1px solid @border_dark; - box-shadow: inset -1px -1px @border_shade, inset 1px 1px @border_bright; } + min-height: 16px; } + combobox button:active, + combobox button:checked { + border-color: @border_shade; + box-shadow: none; } * combobox button { padding-left: 0px; } diff --git a/Theme/Chicago95/gtk-3.0/gtk-headerbars.css b/Theme/Chicago95/gtk-3.0/gtk-headerbars.css index 543313e..a7df9a8 100644 --- a/Theme/Chicago95/gtk-3.0/gtk-headerbars.css +++ b/Theme/Chicago95/gtk-3.0/gtk-headerbars.css @@ -23,6 +23,8 @@ headerbar, .titlebar:backdrop { background-image: none; background-color: @inactive_title_bg_color; } + headerbar, + .titlebar, headerbar .title, headerbar .subtitle, headerbar > checkbutton label, diff --git a/Theme/Chicago95/gtk-3.0/gtk.css b/Theme/Chicago95/gtk-3.0/gtk.css index 62ebabe..279c58f 100755 --- a/Theme/Chicago95/gtk-3.0/gtk.css +++ b/Theme/Chicago95/gtk-3.0/gtk.css @@ -36,7 +36,7 @@ @define-color outline_color black; @define-color font_color @text_color; /* Windows Theme: windowtext (any white area text)*/ @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 icon_shadow black; @define-color icon_shadow_bright white; @@ -179,5 +179,5 @@ @import url("apps/unity.css"); @import url("apps/xfce.css"); @import url("apps/nemo.css"); -@import url("apps/synaptic.css"); -@import url("apps/lightdm-gtk-greeter.css"); */ +@import url("apps/synaptic.css");*/ +@import url("apps/lightdm-gtk-greeter.css"); diff --git a/Theme/Chicago95/gtk-3.24/apps/lightdm-gtk-greeter.css b/Theme/Chicago95/gtk-3.24/apps/lightdm-gtk-greeter.css index 7eff426..f7cccca 100644 --- a/Theme/Chicago95/gtk-3.24/apps/lightdm-gtk-greeter.css +++ b/Theme/Chicago95/gtk-3.24/apps/lightdm-gtk-greeter.css @@ -13,7 +13,7 @@ #panel_window { -gtk-icon-style: regular; color: @font_color; - font: bold; + font-weight: bold; border-top-color: @border_bright; border-right-color: @border_dark; border-left-color: @border_bright; @@ -32,11 +32,11 @@ border-style: none; background-color: @selected_bg_color; color: @font_bright; } - #panel_window .menubar > .menuitem:insensitive { + #panel_window .menubar > .menuitem:disabled { color: @disabled_font; text-shadow: 1px 1px 0 @disabled_font_shadow; } #panel_window .menubar .menu .menuitem { - font: normal; + font-weight: normal; text-shadow: none; } /**************** @@ -86,7 +86,7 @@ margin-right: 4px; background-color: transparent; border: none; - font: bold; } + font-weight: bold; } #window { /* Keeping this blank */ } diff --git a/Theme/Chicago95/gtk-3.24/gtk-basic-effects.css b/Theme/Chicago95/gtk-3.24/gtk-basic-effects.css index cf82b7a..300fe15 100644 --- a/Theme/Chicago95/gtk-3.24/gtk-basic-effects.css +++ b/Theme/Chicago95/gtk-3.24/gtk-basic-effects.css @@ -38,12 +38,10 @@ slider { background-size: 2px 2px; background-position: 0 0, 1px 1px; } -combobox > window, colorswatch:selected, entry, switch, scale trough, -combobox button:checked, popover button.flat:selected, popover button.flat:active, button.appmenu:selected, diff --git a/Theme/Chicago95/gtk-3.24/gtk-combobox.css b/Theme/Chicago95/gtk-3.24/gtk-combobox.css index d645d89..afed347 100644 --- a/Theme/Chicago95/gtk-3.24/gtk-combobox.css +++ b/Theme/Chicago95/gtk-3.24/gtk-combobox.css @@ -20,12 +20,11 @@ combobox { margin-right: 2px; margin-left: 2px; min-width: 16px; - min-height: 16px; - border-top: 1px solid @border_color; - border-left: 1px solid @border_color; - border-bottom: 1px solid @border_dark; - border-right: 1px solid @border_dark; - box-shadow: inset -1px -1px @border_shade, inset 1px 1px @border_bright; } + min-height: 16px; } + combobox button:active, + combobox button:checked { + border-color: @border_shade; + box-shadow: none; } * combobox button { padding-left: 0px; } diff --git a/Theme/Chicago95/gtk-3.24/gtk-headerbars.css b/Theme/Chicago95/gtk-3.24/gtk-headerbars.css index 7a9da46..a7df9a8 100644 --- a/Theme/Chicago95/gtk-3.24/gtk-headerbars.css +++ b/Theme/Chicago95/gtk-3.24/gtk-headerbars.css @@ -47,3 +47,4 @@ headerbar, headerbar scale { margin-top: 4px; margin-bottom: -6px; } +