Theme updates

Updated filechooser scrolled window to meet consistency with rest of theme.
Updated whisker menu panel button to a border image.
Updated dialogue button min-height min width so label is centred.
Updated frames
Updated notebook padding.
Updated paned separators to share the same separator used in menus.
Updated scrolledwindows to meet consistency with rest of theme.
Updated treeviews to better accurately emulate Windows 95.
Updated viewports.
Updated the settings.ini file to enable menu images (also to enable mnemonics, but that GTK disables those now so what’s the point?)
Removed paned separators which were recently added for testing – not needed.
This commit is contained in:
EMH-Mark-I 2020-04-15 22:54:08 -05:00
parent 87f6c3abba
commit a2df07a209
24 changed files with 128 additions and 106 deletions

View File

@ -1,13 +1,12 @@
/* File Chooser */
/* Commented out below. There appears to be a bug in gtk treeviews with outlines that causes a momentary displacement of the UI. Here be dragons!*/
/*filechooser treeview:focus {
outline: 1px solid @bg_dark;
outline-offset: -4px;
-gtk-outline-radius: 0px; }*/
filechooser treeview:selected {
outline: 1px dotted @bg_bright;
outline: 1px dotted @border_bright;
outline-offset: -4px;
-gtk-outline-radius: 0px }
/*
@ -23,32 +22,27 @@ filechooser placessidebar viewport {
border: 1px solid @bg_shade;
box-shadow: none; }*/
filechooser scrolledwindow {
border: 1px solid @bg_shade;
box-shadow: none;
padding: 0px; }
/* Adjust stack buttons*/
filechooser revealer > box > stack {
border-left: 1px solid @bg_shade;
border-top: 1px solid @bg_shade;
border-right: 1px solid @bg_bright;
border-bottom: 1px solid @bg_bright;
box-shadow: inset 1px 1px @bg_bright, inset -1px -1px @bg_shade;
border-left: 1px solid @border_shade;
border-top: 1px solid @border_shade;
border-right: 1px solid @border_bright;
border-bottom: 1px solid @border_bright;
box-shadow: inset 1px 1px @border_bright, inset -1px -1px @border_shade;
padding: 0px;}
filechooser revealer > box > stack button,
/* filechooser revealer > box > stack button,
filechooser revealer > box > stack button:backdrop {
border-left: 1px solid @bg_bright;
border-top: 1px solid @bg_bright;
border-right: 1px solid @bg_shade;
border-bottom: 1px solid @bg_shade;
border-left: 1px solid @border_bright;
border-top: 1px solid @border_bright;
border-right: 1px solid @border_shade;
border-bottom: 1px solid @border_shade;
box-shadow: none;
margin: 1px;
padding: 2px;
min-width: 20px;
min-height: 16px; }
filechooser revealer > box > stack button:focus {
outline: 1px dotted @bg_dark;
outline: 1px dotted @border_dark;
outline-offset: -4px;
-gtk-outline-radius: 0px }
filechooser revealer > box > stack button image {
@ -58,4 +52,4 @@ filechooser revealer > box > stack {
padding-right: 1px; }
filechooser revealer > box > stack button label {
padding-left: 0px;
padding-right: 0px; }
padding-right: 0px; }*/

View File

@ -15,11 +15,9 @@ the whisker menu without having to correct their pointer location. */
#applicationmenu-button box {
padding: 2px;
margin: 1px;
border-top: 1px solid @border_bright;
border-bottom: 1px solid @border_dark;
border-left: 1px solid @border_bright;
border-right: 1px solid @border_dark;
box-shadow: inset -1px -1px @border_shade, inset 1px 1px @border_light;
border: 2px solid @border_color;
border-image: url("../buttons/dialog_button_normal.png");
border-image-slice: 2 2 2 2;
background-color: @bg_color; }
#whiskermenu-button:active box,
#whiskermenu-button:checked box,
@ -28,11 +26,8 @@ the whisker menu without having to correct their pointer location. */
padding-left: 3px;
padding-right: 1px;
margin: 1px;
border-bottom: 1px solid @border_bright;
border-right: 1px solid @border_bright;
border-top: 1px solid @border_dark;
border-left: 1px solid @border_dark;
box-shadow: inset -1px -1px @border_color, inset 1px 1px @border_shade;
border-image: url("../buttons/button_pressed.png");
border-image-slice: 2 2 2 2;
border-radius: 0px; }
#whiskermenu-button image,
#applicationmenu-button image {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 209 B

View File

@ -52,6 +52,8 @@ button.sidebar-button {
/* Dialogue buttons. */
/* We're using border images here since dialog button borders are 3px on Windows 95 with individual colour properties.*/
.dialog-action-area button {
min-height: 16px;
min-width: 16px;
box-shadow: none;
border: 3px solid @border_dark;
border-image: url("buttons/dialog_button_normal.png");

View File

@ -82,13 +82,15 @@ statusbar {
margin-bottom: -1px; }
scrolledwindow.frame {
padding: 1px;
background-color: white;
border-left: 1px solid @border_dark;
border-top: 1px solid @border_dark;
border-right: 1px solid @border_bright;
border-bottom: 1px solid @border_bright;
box-shadow: inset -1px -1px @border_color, inset 1px 1px @border_shade;
padding: 0px;
padding-right: 1px;
background-color: @base_color;
border: 2px solid @border_dark;
border-image: url("assets/frame_inset.png");
border-image-slice: 2 2 2 2;
border-radius: 0px;
background-color: @theme_bg_color;
box-shadow: none;
margin: 0px; }

View File

@ -10,7 +10,7 @@
*/
notebook {
padding: 1px; }
padding: 0px; }
notebook > stack:not(:only-child) {
margin: 0px;
border: 1px solid @border_dark;

View File

@ -8,20 +8,21 @@ paned {
/* GTK has the panes flipped. the .horizontal is ACTUALLY a vertical.*/
paned.horizontal > separator {
min-width: 5px;
border: 2px solid transparent;
min-width: 4px;
border: none;
background-color: transparent;
box-shadow: none;
background-image: url("/home/aidan/.themes/Chicago95/gtk-3.24/assets/paned_separator_v.png");
background-image: url("assets/handle-v.png");
background-repeat: no-repeat;
background-position: 0px 50%;
background-size: 6px 32px; }
background-position: 1px 50%;
background-size: 2px 48px; }
paned.vertical > separator {
min-height: 5px;
border: 2px solid transparent;
min-height: 4px;
border: none;
background-color: transparent;
box-shadow: none;
background-image: url("/home/aidan/.themes/Chicago95/gtk-3.24/assets/paned_separator_h.png");
background-image: url("assets/handle-h.png");
background-repeat: no-repeat;
background-position: 50% 0px;
background-size: 32px 6px; }
background-position: 50% 1px;
background-size: 48px 2px; }

View File

@ -12,11 +12,12 @@
scrolledwindow {
padding: 1px;
background-color: @bg_color;
border-left: 1px solid @border_dark;
border-top: 1px solid @border_dark;
border-right: 1px solid @border_bright;
border-bottom: 1px solid @border_bright;
box-shadow: inset -1px -1px @border_color, inset 1px 1px @border_shade;
border: 2px solid @border_dark;
border-image: url("assets/frame_inset.png");
border-image-slice: 2 2 2 2;
border-radius: 0px;
background-color: @theme_bg_color;
box-shadow: none;
margin: 0px; }
scrolledwindow viewport list row {
border: none;

View File

@ -45,7 +45,13 @@ treeview entry {
/* This creates the treeview border path for expanded items. */
treeview.view {
padding: 0px;
padding-left: 1px;
border-left-color: @border_shade;
border-top-color: @border_shade; }
treeview.view:selected {
border-left-color: @border_bright; }
/* Hey Windows95 didn't have arrows in the headerbar either! */
treeview.view image {
color: transparent; }

View File

@ -48,6 +48,15 @@ view,
view:selected:focus {
background-color: @theme_selected_bg_color;
color: @font_bright; }
.view header button {
padding: 0px;
min-height: 16px;
min-width: 16px; }
.view header button label {
padding: 0px;
padding-left: 5px;
padding-right: 5px;
margin-bottom: -3px; }
box.view {
background-color: @bg_color;

View File

@ -1,3 +1,4 @@
[Settings]
gtk-auto-mnemonics = 1
gtk-auto-mnemonics = 0
gtk-visible-focus = automatic
gtk-menu-images = true

View File

@ -1,13 +1,12 @@
/* File Chooser */
/* Commented out below. There appears to be a bug in gtk treeviews with outlines that causes a momentary displacement of the UI. Here be dragons!*/
/*filechooser treeview:focus {
outline: 1px solid @bg_dark;
outline-offset: -4px;
-gtk-outline-radius: 0px; }*/
filechooser treeview:selected {
outline: 1px dotted @bg_bright;
outline: 1px dotted @border_bright;
outline-offset: -4px;
-gtk-outline-radius: 0px }
/*
@ -23,32 +22,27 @@ filechooser placessidebar viewport {
border: 1px solid @bg_shade;
box-shadow: none; }*/
filechooser scrolledwindow {
border: 1px solid @bg_shade;
box-shadow: none;
padding: 0px; }
/* Adjust stack buttons*/
filechooser revealer > box > stack {
border-left: 1px solid @bg_shade;
border-top: 1px solid @bg_shade;
border-right: 1px solid @bg_bright;
border-bottom: 1px solid @bg_bright;
box-shadow: inset 1px 1px @bg_bright, inset -1px -1px @bg_shade;
border-left: 1px solid @border_shade;
border-top: 1px solid @border_shade;
border-right: 1px solid @border_bright;
border-bottom: 1px solid @border_bright;
box-shadow: inset 1px 1px @border_bright, inset -1px -1px @border_shade;
padding: 0px;}
filechooser revealer > box > stack button,
/* filechooser revealer > box > stack button,
filechooser revealer > box > stack button:backdrop {
border-left: 1px solid @bg_bright;
border-top: 1px solid @bg_bright;
border-right: 1px solid @bg_shade;
border-bottom: 1px solid @bg_shade;
border-left: 1px solid @border_bright;
border-top: 1px solid @border_bright;
border-right: 1px solid @border_shade;
border-bottom: 1px solid @border_shade;
box-shadow: none;
margin: 1px;
padding: 2px;
min-width: 20px;
min-height: 16px; }
filechooser revealer > box > stack button:focus {
outline: 1px dotted @bg_dark;
outline: 1px dotted @border_dark;
outline-offset: -4px;
-gtk-outline-radius: 0px }
filechooser revealer > box > stack button image {
@ -58,4 +52,4 @@ filechooser revealer > box > stack {
padding-right: 1px; }
filechooser revealer > box > stack button label {
padding-left: 0px;
padding-right: 0px; }
padding-right: 0px; }*/

View File

@ -15,11 +15,9 @@ the whisker menu without having to correct their pointer location. */
#applicationmenu-button box {
padding: 2px;
margin: 1px;
border-top: 1px solid @border_bright;
border-bottom: 1px solid @border_dark;
border-left: 1px solid @border_bright;
border-right: 1px solid @border_dark;
box-shadow: inset -1px -1px @border_shade, inset 1px 1px @border_light;
border: 2px solid @border_color;
border-image: url("../buttons/dialog_button_normal.png");
border-image-slice: 2 2 2 2;
background-color: @bg_color; }
#whiskermenu-button:active box,
#whiskermenu-button:checked box,
@ -28,11 +26,8 @@ the whisker menu without having to correct their pointer location. */
padding-left: 3px;
padding-right: 1px;
margin: 1px;
border-bottom: 1px solid @border_bright;
border-right: 1px solid @border_bright;
border-top: 1px solid @border_dark;
border-left: 1px solid @border_dark;
box-shadow: inset -1px -1px @border_color, inset 1px 1px @border_shade;
border-image: url("../buttons/button_pressed.png");
border-image-slice: 2 2 2 2;
border-radius: 0px; }
#whiskermenu-button image,
#applicationmenu-button image {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 209 B

View File

@ -52,6 +52,8 @@ button.sidebar-button {
/* Dialogue buttons. */
/* We're using border images here since dialog button borders are 3px on Windows 95 with individual colour properties.*/
.dialog-action-area button {
min-height: 16px;
min-width: 16px;
box-shadow: none;
border: 3px solid @border_dark;
border-image: url("buttons/dialog_button_normal.png");

View File

@ -82,13 +82,15 @@ statusbar {
margin-bottom: -1px; }
scrolledwindow.frame {
padding: 1px;
background-color: white;
border-left: 1px solid @border_dark;
border-top: 1px solid @border_dark;
border-right: 1px solid @border_bright;
border-bottom: 1px solid @border_bright;
box-shadow: inset -1px -1px @border_color, inset 1px 1px @border_shade;
padding: 0px;
padding-right: 1px;
background-color: @base_color;
border: 2px solid @border_dark;
border-image: url("assets/frame_inset.png");
border-image-slice: 2 2 2 2;
border-radius: 0px;
background-color: @theme_bg_color;
box-shadow: none;
margin: 0px; }

View File

@ -10,7 +10,7 @@
*/
notebook {
padding: 1px; }
padding: 0px; }
notebook > stack:not(:only-child) {
margin: 0px;
border: 1px solid @border_dark;

View File

@ -8,20 +8,21 @@ paned {
/* GTK has the panes flipped. the .horizontal is ACTUALLY a vertical.*/
paned.horizontal > separator {
min-width: 5px;
border: 2px solid transparent;
min-width: 4px;
border: none;
background-color: transparent;
box-shadow: none;
background-image: url("/home/aidan/.themes/Chicago95/gtk-3.24/assets/paned_separator_v.png");
background-image: url("assets/handle-v.png");
background-repeat: no-repeat;
background-position: 0px 50%;
background-size: 6px 32px; }
background-position: 1px 50%;
background-size: 2px 48px; }
paned.vertical > separator {
min-height: 5px;
border: 2px solid transparent;
min-height: 4px;
border: none;
background-color: transparent;
box-shadow: none;
background-image: url("/home/aidan/.themes/Chicago95/gtk-3.24/assets/paned_separator_h.png");
background-image: url("assets/handle-h.png");
background-repeat: no-repeat;
background-position: 50% 0px;
background-size: 32px 6px; }
background-position: 50% 1px;
background-size: 48px 2px; }

View File

@ -12,11 +12,12 @@
scrolledwindow {
padding: 1px;
background-color: @bg_color;
border-left: 1px solid @border_dark;
border-top: 1px solid @border_dark;
border-right: 1px solid @border_bright;
border-bottom: 1px solid @border_bright;
box-shadow: inset -1px -1px @border_color, inset 1px 1px @border_shade;
border: 2px solid @border_dark;
border-image: url("assets/frame_inset.png");
border-image-slice: 2 2 2 2;
border-radius: 0px;
background-color: @theme_bg_color;
box-shadow: none;
margin: 0px; }
scrolledwindow viewport list row {
border: none;

View File

@ -45,7 +45,13 @@ treeview entry {
/* This creates the treeview border path for expanded items. */
treeview.view {
padding: 0px;
padding-left: 1px;
border-left-color: @border_shade;
border-top-color: @border_shade; }
treeview.view:selected {
border-left-color: @border_bright; }
/* Hey Windows95 didn't have arrows in the headerbar either! */
treeview.view image {
color: transparent; }

View File

@ -48,6 +48,15 @@ view,
view:selected:focus {
background-color: @theme_selected_bg_color;
color: @font_bright; }
.view header button {
padding: 0px;
min-height: 16px;
min-width: 16px; }
.view header button label {
padding: 0px;
padding-left: 5px;
padding-right: 5px;
margin-bottom: -3px; }
box.view {
background-color: @bg_color;

View File

@ -1,3 +1,4 @@
[Settings]
gtk-auto-mnemonics = 1
gtk-auto-mnemonics = 0
gtk-visible-focus = automatic
gtk-menu-images = true