GTK 3.0 changes for new theme color naming

This commit is contained in:
grassmunk 2020-04-21 16:14:39 -07:00
parent b8b24c64b9
commit 71a185ef08
13 changed files with 142 additions and 156 deletions

View File

@ -1,5 +1,7 @@
/* Whisker Menu and Application Menu Panel Button style */
/* FOR GTK3.24 */
/* We will remove the border effect and margin effects on the button and apply it to the box inside.
This will allow people to be able to run their pointer to the far corner of the screen and activate
the whisker menu without having to correct their pointer location. */
@ -29,14 +31,17 @@ the whisker menu without having to correct their pointer location. */
border-radius: 0px; }
#whiskermenu-button image,
#applicationmenu-button image {
margin-right: -4px;
margin-left: 1px;
padding: 1px;
margin-right: -2px;
background-repeat: no-repeat;
background-size: contain;
background-position: center; }
#whiskermenu-button label,
#applicationmenu-button label {
padding: 1px;
padding: 0px;
margin-right: 1px;
margin-left: -1px;
border: none;
color: black;
font-family: "MS Sans Serif Bold", Sans, Sans-Serif;
@ -48,88 +53,98 @@ the whisker menu without having to correct their pointer location. */
#whiskermenu-window {
box-shadow: inset 23px 0 @whisker_menu_logo; }
#whiskermenu-window treeview {
padding-left: 2px;
padding-right: 5px;
padding-top: 1px;
padding-bottom: 1px; }
#whiskermenu-window button {
padding: 1px;
min-height: 16px;
min-width: 16px; }
#whiskermenu-window button:not(:hover):not(:checked) {
border-color: transparent;
box-shadow: none;
background-color: transparent; }
#whiskermenu-window scrolledwindow {
border: none;
box-shadow: none; }
#whiskermenu-window scrolledwindow.frame {
padding: 0px;
border: 2px solid @border_dark;
border-image: url("../assets/frame_inset.png");
border-image-slice: 2 2 2 2;
border-radius: 0px;
box-shadow: none; }
#whiskermenu-window scrolledwindow viewport button:hover {
outline-color: @border_bright; }
#whiskermenu-window separator {
margin: 5px; }
#whiskermenu-window > frame {
border: 2px solid @border_dark;
border-image: url("../assets/frame_outset.png");
border-image-slice: 2 2 2 2;}
#whiskermenu-window > frame > stack > box > box:first-child {
padding: 2px;
margin: 0;
color: @text_color;
/*background-image: linear-gradient(to right, @selected_bg_color, @transparent);*/ /* Note: You can setup a gradient here if you want! */ }
#whiskermenu-window frame {
#whiskermenu-window treeview {
padding-left: 5px;
padding-right: 5px;
padding-top: 2px;
padding-bottom: 2px; }
#whiskermenu-window button {
padding: 2px;
min-height: 16px; }
#whiskermenu-window button:not(:hover):not(:checked) {
border-color: transparent;
box-shadow: none;
background-color: transparent; }
#whiskermenu-window scrolledwindow viewport button:hover {
outline-color: @border_bright; }
#whiskermenu-window separator {
margin: 5px; }
#whiskermenu-window scrolledwindow {
border: 1px solid @bg_shade;
box-shadow: none;
padding: 0px; }
#whiskermenu-window frame {
/*
These are the Whisker Menu side bar images to replicate Windows 95.
comment branding_C95.png and uncomment which one you would prefer to use:
- w95: Replicated version of the original in a higher resolution
- w95-orig: the original from the boss
- L95: A linux version
- L95_aliased: A linux version with aliased font style.
- C95: A Chicago95 version of this theme.
- C95_aliased: A Chicago95 version with aliased font style.
- w95: Replicated version of the original in a higher resolution
- l95: A linux version
- C95: Branded version of this theme
If none of these catch your fancy edit misc/whisker-sidebar.svg in
Inkscape
*/
/* background-image: url("../assets/branding_W95.png"); */
/* background-image: url("../assets/branding_W95-orig.png"); */
/* background-image: url("../assets/branding_L95.png"); */
/* background-image: url("../assets/branding_L95_aliased.png"); */
/* background-image: url("../assets/branding_C95.png"); */
background-image: url("../assets/branding_C95_aliased.png");
background-repeat: no-repeat;
background-position: 0% 100%; }
#whiskermenu-window frame > stack,
#whiskermenu-window frame > box { /* frame > box is for older versions of Whisker menu. */
margin-left: 18px; }
#whiskermenu-window frame scrolledwindow button {
/* background-image: url("../assets/branding_W95.png"); */
/* background-image: url("../assets/branding_W95-orig.png"); */
/* background-image: url("../assets/branding_L95.png"); */
/* background-image: url("../assets/branding_L95_aliased.png"); */
/* background-image: url("../assets/branding_C95.png"); */
background-image: url("../assets/branding_C95_aliased.png");
background-repeat: no-repeat;
background-position: 0% 100%; }
#whiskermenu-window frame > box {
margin-left: 18px; }
#whiskermenu-window frame > box > box > scrolledwindow {
padding: 5px;
border-top: 1px solid transparent;
border-right: 1px solid transparent;
border-bottom: 1px solid transparent;
border-left: 1px solid @border_shade;
box-shadow: inset 1px 0px @border_bright; }
#whiskermenu-window frame > box > box > scrolledwindow button {
border: 1px solid transparent;
background-color: @selected_bg_color;
box-shadow: none; }
#whiskermenu-window frame scrolledwindow button:checked {
#whiskermenu-window frame > box > box > scrolledwindow button:checked {
background-color: @border_shade; }
#whiskermenu-window frame scrolledwindow button:hover,
#whiskermenu-window frame scrolledwindow button:active,
#whiskermenu-window frame scrolledwindow button:checked {
#whiskermenu-window frame > box > box > scrolledwindow button:hover,
#whiskermenu-window frame > box > box > scrolledwindow button:active,
#whiskermenu-window frame > box > box > scrolledwindow button:checked,
#whiskermenu-window frame > box > box > scrolledwindow button:disabled
#whiskermenu-window frame > box > box > scrolledwindow button:backdrop {
color: white; }
#whiskermenu-window frame > box > box > box button image {
padding: 0px; }
#whiskermenu-window entry {
margin-top: 3px;
margin-bottom: 3px;
min-height: 16px; }
#whiskermenu-window scrollbar button {
margin: 0px;
padding: 0px;
min-width: 16px;
min-height: 16px;
border: none;
box-shadow: none; }
#whiskermenu-window frame, #whiskermenu-window GtkListBox, #whiskermenu-window scrolledwindow, #whiskermenu-window viewport {
background-color: transparent; }
#whiskermenu-window frame > box > box:nth-child(1) {
padding: 2px;
margin: 0;
color: @text_color;
/*background-image: linear-gradient(to right, @selected_bg_color, @transparent);*/ /* Note: You can setup a gradient here if you want! */ }
#whiskermenu-window frame > box > box:nth-child(2) .frame {
border: 1px solid @bg_shade;
padding: 0px; }
#whiskermenu-window frame > box > box > box button image {
padding: 0px; }
#whiskermenu-window entry {
margin-top: 3px;
margin-bottom: 3px;
min-height: 16px; }
#whiskermenu-window frame, #whiskermenu-window GtkListBox, #whiskermenu-window scrolledwindow, #whiskermenu-window viewport {
background-color: transparent; }
#whiskermenu-window scrollbar button {
margin: 0px;
padding: 0px;
min-width: 16px;
min-height: 16px;
border: none;
box-shadow: none; }
#whiskermenu-window stack > scrolledwindow {
border-left: 1px solid @border_dark;
border-right: 1px solid @border_bright;
border-top: 1px solid @border_dark;
border-bottom: 1px solid @border_bright;
box-shadow: inset -1px -1px @border_color, inset 1px 1px @border_shade;
background: @base_color;
padding: 1px; }

View File

@ -96,23 +96,6 @@ wnck-pager {
background-color: @border_shade;
color: white; }
/* Panel entry */
/* NOTE! Entry background colouring is bugged in some versions of XFCE. */
.xfce4-panel entry {
background-color: @base_color;
margin: 2px;
box-shadow: none; }
.xfce4-panel entry selection {
background-color: @selected_bg_color;
color: @text_bright }
/* Plugin buttons */
.xfce4-panel .toggle {
border: none;
box-shadow: none;
margin: 0px;
background-color: transparent; }
/* Tasklist */
.tasklist .toggle {
/* We remove borders and shadows for the '.tasklist' '.toggle' button
@ -150,7 +133,7 @@ wnck-pager {
border-top: 3px solid @border_dark;
border-image: url("../buttons/toggle_pressed.png");
border-image-slice: 3 2 2 2;
background-color: @scrollbar_trough_bg_color; /* This is how windows themes are applied */
background-color: @scrollbar_trough_bg_color; /* This is how windows themes are applied */
background-image: linear-gradient(45deg, @bg_color 25%, transparent 25%, transparent 75%, @bg_color 75%, @bg_color), linear-gradient(45deg, @bg_color 25%, transparent 25%, transparent 75%, @bg_color 75%, @bg_dark);
background-size: 2px 2px;
background-position: 0 0, 1px 1px;
@ -168,14 +151,11 @@ wnck-pager {
/* XFCE Power Manager plugin */
#xfce4-power-manager-plugin,
#xfce4-power-manager-plugin:active,
#xfce4-power-manager-plugin:hover,
#xfce4-power-manager-plugin:checked {
#xfce4-power-manager-plugin:active {
margin: 0px;
box-shadow: none;
border: transparent; }
#xfce4-power-manager-plugin * {
-gtk-icon-style: regular;
-gtk-icon-transform: scale(1); }
/* XFCE Notification plugin */
@ -221,7 +201,6 @@ wnck-pager {
border-bottom-color: @border_dark; }
/* XFCE terminal */
#xfce4-terminal-notebook overlay > box,
#xfce4-terminal-notebook stack > box {
border: 2px solid @border_dark;
border-image: url("../assets/frame_inset.png");
@ -239,12 +218,3 @@ wnck-pager {
padding: 0px;
margin-top: -1px;
margin-bottom: -2px; }
/* XFCE Session logout dialogue */
/* Doesn't look like this works, so moving it to the override... */
.xfsm-logout-dialog {
border-left: 1px solid @border_bright;
border-top: 1px solid @border_bright;
border-bottom: 1px solid @border_dark;
border-right: 1px solid @border_dark;
box-shadow: inset -1px -1px @border_shade, inset 1px 1px @border_light; }

View File

@ -32,7 +32,8 @@ slider {
border-radius: 0px; }
/* Makes a checkerboard */
slider:disabled,
trough {
trough,
paned > separator {
background-color: @scrollbar_trough_bg_color;
background-image: linear-gradient(45deg, @bg_color 25%, transparent 25%, transparent 75%, @bg_color 75%, @bg_color), linear-gradient(45deg, @bg_color 25%, transparent 25%, transparent 75%, @bg_color 75%, @bg_dark);
background-size: 2px 2px;

View File

@ -47,29 +47,23 @@ combobox entry {
/* Combobox window and menu decorations */
combobox window decoration {
padding: 0px; /* Padding is not required here. */
border: 1px solid @border_dark; } /* Need to make the border 1px and a solid colour. */
combobox window .context-menu,
combobox window menu { /* The combobox window menu is included for sub-menus that branch off of the .context-menu. */
background-color: @bg_bright; /* Background colour needs to be applied. */
border: none; } /* Borders are not necessary here. */
combobox window .context-menu menuitem {
padding: 1px; } /* Menuitems need only be 1px. */
combobox window .context-menu separator {
margin-left: 1px; /* A margin is required so that the separator isn't touching the menu border. */
margin-right: 1px; } /* A margin is required so that the separator isn't touching the menu border. */
padding: 1px;
border: 1px solid @border_dark;
background-color: @bg_bright;
box-shadow: none; }
combobox window menu {
background-color: @bg_bright;
border-color: @bg_bright; }
#gtk-combobox-popup-menu,
#gtk-combobox-popup-menu window {
border: none; /* Borders are not necessary here. */
box-shadow: none; /* Box shadows are not necessary here. */
background-color: @bg_bright; } /* Background colour needs to be applied. */
border: none;
box-shadow: none;
background-color: @bg_bright; }
#gtk-combobox-popup-menu arrow {
-gtk-icon-source: none; }
#gtk-combobox-popup-menu menuitem {
padding: 0px; /* Remove any inherited padding. */
padding-left: 2px; /* Need padding on the left to keep menuitem images from touching the border. */
padding-right: 2px; /* Need padding on the right to keep menuitem images from touching the border. */
min-height: 16px; }
padding: 0px; }
/* Combobox arrows */
combobox arrow {

View File

@ -83,6 +83,7 @@ statusbar {
scrolledwindow.frame {
padding: 0px;
padding-right: 1px;
background-color: @base_color;
border: 2px solid @border_dark;
border-image: url("assets/frame_inset.png");

View File

@ -9,31 +9,29 @@
Make sure that all changes made here are part of the GtkHeaderbar.
*/
/* This applies to GTK Client Side Decorations (CSD) */
headerbar,
.titlebar {
padding: 0px;
padding-left: 2px;
padding-right: 2px;
background-color: @window_title_bg_color;
background-color: @selected_bg_color;
background-image: none;
text-shadow: none; }
headerbar:backdrop,
.titlebar:backdrop {
background-image: none;
background-color: @inactive_title_bg_color; }
background-color: @selected_inactive_bg_color; }
headerbar .title,
headerbar .subtitle,
headerbar > checkbutton label,
.titlebar > checkbutton label {
font-size: 8pt;
color: @window_title_text_color; }
color: @selected_fg_color; }
headerbar .title:backdrop,
headerbar .subtitle:backdrop,
headerbar:backdrop > checkbutton label,
.titlebar:backdrop > checkbutton label {
color: @inactive_title_bg_color; }
color: @selected_inactive_fg_color; }
headerbar entry {
margin: 3px;
padding-top: 1px;

View File

@ -26,33 +26,36 @@ window > menu {
/* NOTE: Menu border styling is moved to client side decorations. See gtk-window.css for menu border styling. */
menu {
background-color: @menu_bg_color; /* NOTE: While a background colour is required here, there will be a 2px internal padding applied to window decorations which will also have a background colour too. */
border-left: 3px solid transparent;
border-right: 3px solid transparent;
border-top: 2px solid transparent;
border-bottom: 2px solid transparent;
background-color: @menu_bg_color;
color: @menu_text_color; }
/* menuitem */
menu menuitem {
padding-left: 2px;
padding-right: 2px;
padding-top: 1px;
padding-bottom: 1px;
background-color: transparent; }
menu menuitem check,
menu menuitem radio {
padding-right: 4px; }
menuitem:active,
menuitem:hover {
background-color: @theme_selected_bg_color;
color: @selected_fg_color; }
/* menubar */
menubar,
.menubar {
-GtkWidget-window-dragging: false;
background-color: @menu_bg_color;
color: @menu_text_color; }
-GtkWidget-window-dragging: false; }
menubar menuitem {
padding: 0px 6px;
min-height:17px; }
/* menuitem */
menu menuitem {
padding-left: 2px;
padding-right: 2px;
padding-top: 2px;
padding-bottom: 2px;
background-color: @menu_bg_color; }
menu menuitem check,
menu menuitem radio {
padding-right: 4px; }
menuitem:active,
menuitem:hover {
background-color: @theme_selected_bg_color;
color: @selected_fg_color; }
menu separator {
padding: 3px;
border: none;

View File

@ -18,7 +18,7 @@ scrollbar {
scrollbar slider {
margin-top: 0px;
padding: 0px;
background-color: @scrollbar_bg_color;
background-color: @scrollbar_trough_bg_color;
border: 2px solid @border_dark;
box-shadow: none;
border-image: url("scrollbar/scrollbar_button.png");

View File

@ -10,7 +10,7 @@
*/
scrolledwindow {
padding: 0px;
padding: 1px;
background-color: @bg_color;
border: 2px solid @border_dark;
border-image: url("assets/frame_inset.png");
@ -50,7 +50,9 @@ frame > scrolledwindow {
margin: 0px; }
notebook stack scrolledwindow {
border: 2px solid @border_dark;
border-image: url("assets/frame_groove.png");
border-image-slice: 2 2 2 2;
border-left: 1px solid @border_shade;
border-top: 1px solid @border_shade;
border-right: 1px solid @border_bright;
border-bottom: 1px solid @border_dark;
box-shadow: inset 1px 1px white, inset -1px -1px @border_shade;
margin: 3px; }

View File

@ -448,9 +448,10 @@ grid viewport box box textview {
.dialog-vbox flowbox flowboxchild:focus {
outline-color: @selected_fg_color; }
/*.dialog-vbox > grid {
.dialog-vbox > grid {
border: 1px solid red;
border: 2px solid @border_dark;
border-image: url("assets/frame_inset.png");
border-image-slice: 2 2 2 2;
border-radius: 0px;
box-shadow: none; }*/
box-shadow: none; }

View File

@ -13,7 +13,7 @@
* The border image contains a 8px surrounding transparency with an additional non-transparent 2px for the border. This gives the illusion of a 2px border image instead of the full 10px. */
window decoration,
dialog > decoration {
padding: 2px; /* Padding is required so that there is some space between the window decoration border and any internal components. */
padding: 2px;
border: 10px solid @border_dark;
background-color: @bg_color;
border-image: url("assets/window_decoration.png");

View File

@ -7,7 +7,7 @@
/* Comment about Pop-overs: I couldn't get over how much they looked like Clippy in MS Office 97 so thats why the buttons are different */
/* Do not remove */
/* Do not remove
/* default color scheme */
@define-color bg_color #c0c0c0; /* Window Theme: buttonface */
@ -52,6 +52,7 @@
@define-color inactive_title_bg_color #808080; /* Windows Theme: inactivetitle */
@define-color inactive_title_text_color #c0c0c0; /* Windows Theme: inactivetitletext */
/* dark color scheme */
@define-color dark_bg_color @bg_color;
@define-color dark_fg_color @fg_color;
@ -128,7 +129,7 @@
#whiskermenu-button label {font-size: 11px;}
/* Whisker Menu side logo background color */
@define-color whisker_menu_logo #808080;
@define-color whisker_menu_logo #c0c0c0;
/* XFCE desktop icon colours*/
@define-color xfd_icon_backdrop #008081;