From a2df07a209075ed689767323694ac09d2b87701a Mon Sep 17 00:00:00 2001 From: EMH-Mark-I Date: Wed, 15 Apr 2020 22:54:08 -0500 Subject: [PATCH] =?UTF-8?q?Theme=20updates=20Updated=20filechooser=20scrol?= =?UTF-8?q?led=20window=20to=20meet=20consistency=20with=20rest=20of=20the?= =?UTF-8?q?me.=20Updated=20whisker=20menu=20panel=20button=20to=20a=20bord?= =?UTF-8?q?er=20image.=20Updated=20dialogue=20button=20min-height=20min=20?= =?UTF-8?q?width=20so=20label=20is=20centred.=20Updated=20frames=20Updated?= =?UTF-8?q?=20notebook=20padding.=20Updated=20paned=20separators=20to=20sh?= =?UTF-8?q?are=20the=20same=20separator=20used=20in=20menus.=20Updated=20s?= =?UTF-8?q?crolledwindows=20to=20meet=20consistency=20with=20rest=20of=20t?= =?UTF-8?q?heme.=20Updated=20treeviews=20to=20better=20accurately=20emulat?= =?UTF-8?q?e=20Windows=2095.=20Updated=20viewports.=20Updated=20the=20sett?= =?UTF-8?q?ings.ini=20file=20to=20enable=20menu=20images=20(also=20to=20en?= =?UTF-8?q?able=20mnemonics,=20but=20that=20GTK=20disables=20those=20now?= =?UTF-8?q?=20so=20what=E2=80=99s=20the=20point=3F)=20Removed=20paned=20se?= =?UTF-8?q?parators=20which=20were=20recently=20added=20for=20testing=20?= =?UTF-8?q?=E2=80=93=20not=20needed.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Theme/Chicago95/gtk-3.0/apps/filechooser.css | 32 +++++++----------- Theme/Chicago95/gtk-3.0/apps/whiskermenu.css | 15 +++----- .../gtk-3.0/assets/paned_separator_h.png | Bin 177 -> 0 bytes .../gtk-3.0/assets/paned_separator_v.png | Bin 209 -> 0 bytes Theme/Chicago95/gtk-3.0/gtk-buttons.css | 2 ++ Theme/Chicago95/gtk-3.0/gtk-frames.css | 16 +++++---- Theme/Chicago95/gtk-3.0/gtk-notebooks.css | 2 +- Theme/Chicago95/gtk-3.0/gtk-paned.css | 21 ++++++------ .../Chicago95/gtk-3.0/gtk-scrolledwindows.css | 11 +++--- Theme/Chicago95/gtk-3.0/gtk-treeviews.css | 6 ++++ Theme/Chicago95/gtk-3.0/gtk-viewports.css | 9 +++++ Theme/Chicago95/gtk-3.0/settings.ini | 3 +- Theme/Chicago95/gtk-3.24/apps/filechooser.css | 32 +++++++----------- Theme/Chicago95/gtk-3.24/apps/whiskermenu.css | 15 +++----- .../gtk-3.24/assets/paned_separator_h.png | Bin 177 -> 0 bytes .../gtk-3.24/assets/paned_separator_v.png | Bin 209 -> 0 bytes Theme/Chicago95/gtk-3.24/gtk-buttons.css | 2 ++ Theme/Chicago95/gtk-3.24/gtk-frames.css | 16 +++++---- Theme/Chicago95/gtk-3.24/gtk-notebooks.css | 2 +- Theme/Chicago95/gtk-3.24/gtk-paned.css | 21 ++++++------ .../gtk-3.24/gtk-scrolledwindows.css | 11 +++--- Theme/Chicago95/gtk-3.24/gtk-treeviews.css | 6 ++++ Theme/Chicago95/gtk-3.24/gtk-viewports.css | 9 +++++ Theme/Chicago95/gtk-3.24/settings.ini | 3 +- 24 files changed, 128 insertions(+), 106 deletions(-) delete mode 100644 Theme/Chicago95/gtk-3.0/assets/paned_separator_h.png delete mode 100644 Theme/Chicago95/gtk-3.0/assets/paned_separator_v.png delete mode 100644 Theme/Chicago95/gtk-3.24/assets/paned_separator_h.png delete mode 100644 Theme/Chicago95/gtk-3.24/assets/paned_separator_v.png diff --git a/Theme/Chicago95/gtk-3.0/apps/filechooser.css b/Theme/Chicago95/gtk-3.0/apps/filechooser.css index 71ea0e0..e19cbd7 100644 --- a/Theme/Chicago95/gtk-3.0/apps/filechooser.css +++ b/Theme/Chicago95/gtk-3.0/apps/filechooser.css @@ -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; }*/ diff --git a/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css b/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css index 5db162a..9a5bd24 100644 --- a/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css +++ b/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css @@ -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 { diff --git a/Theme/Chicago95/gtk-3.0/assets/paned_separator_h.png b/Theme/Chicago95/gtk-3.0/assets/paned_separator_h.png deleted file mode 100644 index cf4c24ca143b83bcb49630eb52cf90dd16135967..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-p!3HE3_0PEv;v{*yyDx`7I;J! zGcf2WgD_*oQu{KXAbW|YuPgf#7FK3st#v22R|19XJY5_^G|nd{NccRk7r78Tk2CVq z!Dezopr0BT7#?EnA( diff --git a/Theme/Chicago95/gtk-3.0/assets/paned_separator_v.png b/Theme/Chicago95/gtk-3.0/assets/paned_separator_v.png deleted file mode 100644 index bf62649c67e68973b13f0b018cdce8240c6741ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^Y(T8Q0U`}8Ig>#GN#5=*4F5rJ!QSPQfg+p*9+AZi z40_5S%viD1z6>bHUgGKN%Kn6fm05$^ds@z3pirEri(`n!`MVPx`5Fv3SdJfS|7=ph z`G-Y6_wuT}GbQdydv7|;BC%vuOi4CVO6Y8FV`U~|XO~|><^G{(vz}SnH|E6t4%n=_ xJ}T~;K>JKz8CC_QsyQ7W82k4BdCc3#yvufH?I&idqd=P&JYD@<);T3K0RXeDLTdm3 diff --git a/Theme/Chicago95/gtk-3.0/gtk-buttons.css b/Theme/Chicago95/gtk-3.0/gtk-buttons.css index 8fcc14a..dae93ae 100644 --- a/Theme/Chicago95/gtk-3.0/gtk-buttons.css +++ b/Theme/Chicago95/gtk-3.0/gtk-buttons.css @@ -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"); diff --git a/Theme/Chicago95/gtk-3.0/gtk-frames.css b/Theme/Chicago95/gtk-3.0/gtk-frames.css index 991ebc8..c2fcf96 100644 --- a/Theme/Chicago95/gtk-3.0/gtk-frames.css +++ b/Theme/Chicago95/gtk-3.0/gtk-frames.css @@ -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; } diff --git a/Theme/Chicago95/gtk-3.0/gtk-notebooks.css b/Theme/Chicago95/gtk-3.0/gtk-notebooks.css index a9e0589..cf6776b 100644 --- a/Theme/Chicago95/gtk-3.0/gtk-notebooks.css +++ b/Theme/Chicago95/gtk-3.0/gtk-notebooks.css @@ -10,7 +10,7 @@ */ notebook { - padding: 1px; } + padding: 0px; } notebook > stack:not(:only-child) { margin: 0px; border: 1px solid @border_dark; diff --git a/Theme/Chicago95/gtk-3.0/gtk-paned.css b/Theme/Chicago95/gtk-3.0/gtk-paned.css index cae9729..3a131a4 100644 --- a/Theme/Chicago95/gtk-3.0/gtk-paned.css +++ b/Theme/Chicago95/gtk-3.0/gtk-paned.css @@ -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; } + diff --git a/Theme/Chicago95/gtk-3.0/gtk-scrolledwindows.css b/Theme/Chicago95/gtk-3.0/gtk-scrolledwindows.css index 4b98ea5..48b3573 100644 --- a/Theme/Chicago95/gtk-3.0/gtk-scrolledwindows.css +++ b/Theme/Chicago95/gtk-3.0/gtk-scrolledwindows.css @@ -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; diff --git a/Theme/Chicago95/gtk-3.0/gtk-treeviews.css b/Theme/Chicago95/gtk-3.0/gtk-treeviews.css index 7eb08f7..76b2824 100644 --- a/Theme/Chicago95/gtk-3.0/gtk-treeviews.css +++ b/Theme/Chicago95/gtk-3.0/gtk-treeviews.css @@ -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; } diff --git a/Theme/Chicago95/gtk-3.0/gtk-viewports.css b/Theme/Chicago95/gtk-3.0/gtk-viewports.css index 87df19e..c4786d1 100644 --- a/Theme/Chicago95/gtk-3.0/gtk-viewports.css +++ b/Theme/Chicago95/gtk-3.0/gtk-viewports.css @@ -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; diff --git a/Theme/Chicago95/gtk-3.0/settings.ini b/Theme/Chicago95/gtk-3.0/settings.ini index 9aa01e5..4dcf736 100755 --- a/Theme/Chicago95/gtk-3.0/settings.ini +++ b/Theme/Chicago95/gtk-3.0/settings.ini @@ -1,3 +1,4 @@ [Settings] -gtk-auto-mnemonics = 1 +gtk-auto-mnemonics = 0 gtk-visible-focus = automatic +gtk-menu-images = true diff --git a/Theme/Chicago95/gtk-3.24/apps/filechooser.css b/Theme/Chicago95/gtk-3.24/apps/filechooser.css index 71ea0e0..e19cbd7 100644 --- a/Theme/Chicago95/gtk-3.24/apps/filechooser.css +++ b/Theme/Chicago95/gtk-3.24/apps/filechooser.css @@ -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; }*/ diff --git a/Theme/Chicago95/gtk-3.24/apps/whiskermenu.css b/Theme/Chicago95/gtk-3.24/apps/whiskermenu.css index 6e90bb9..acf3010 100644 --- a/Theme/Chicago95/gtk-3.24/apps/whiskermenu.css +++ b/Theme/Chicago95/gtk-3.24/apps/whiskermenu.css @@ -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 { diff --git a/Theme/Chicago95/gtk-3.24/assets/paned_separator_h.png b/Theme/Chicago95/gtk-3.24/assets/paned_separator_h.png deleted file mode 100644 index cf4c24ca143b83bcb49630eb52cf90dd16135967..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-p!3HE3_0PEv;v{*yyDx`7I;J! zGcf2WgD_*oQu{KXAbW|YuPgf#7FK3st#v22R|19XJY5_^G|nd{NccRk7r78Tk2CVq z!Dezopr0BT7#?EnA( diff --git a/Theme/Chicago95/gtk-3.24/assets/paned_separator_v.png b/Theme/Chicago95/gtk-3.24/assets/paned_separator_v.png deleted file mode 100644 index bf62649c67e68973b13f0b018cdce8240c6741ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^Y(T8Q0U`}8Ig>#GN#5=*4F5rJ!QSPQfg+p*9+AZi z40_5S%viD1z6>bHUgGKN%Kn6fm05$^ds@z3pirEri(`n!`MVPx`5Fv3SdJfS|7=ph z`G-Y6_wuT}GbQdydv7|;BC%vuOi4CVO6Y8FV`U~|XO~|><^G{(vz}SnH|E6t4%n=_ xJ}T~;K>JKz8CC_QsyQ7W82k4BdCc3#yvufH?I&idqd=P&JYD@<);T3K0RXeDLTdm3 diff --git a/Theme/Chicago95/gtk-3.24/gtk-buttons.css b/Theme/Chicago95/gtk-3.24/gtk-buttons.css index 8fcc14a..dae93ae 100644 --- a/Theme/Chicago95/gtk-3.24/gtk-buttons.css +++ b/Theme/Chicago95/gtk-3.24/gtk-buttons.css @@ -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"); diff --git a/Theme/Chicago95/gtk-3.24/gtk-frames.css b/Theme/Chicago95/gtk-3.24/gtk-frames.css index 991ebc8..c2fcf96 100644 --- a/Theme/Chicago95/gtk-3.24/gtk-frames.css +++ b/Theme/Chicago95/gtk-3.24/gtk-frames.css @@ -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; } diff --git a/Theme/Chicago95/gtk-3.24/gtk-notebooks.css b/Theme/Chicago95/gtk-3.24/gtk-notebooks.css index a9e0589..cf6776b 100644 --- a/Theme/Chicago95/gtk-3.24/gtk-notebooks.css +++ b/Theme/Chicago95/gtk-3.24/gtk-notebooks.css @@ -10,7 +10,7 @@ */ notebook { - padding: 1px; } + padding: 0px; } notebook > stack:not(:only-child) { margin: 0px; border: 1px solid @border_dark; diff --git a/Theme/Chicago95/gtk-3.24/gtk-paned.css b/Theme/Chicago95/gtk-3.24/gtk-paned.css index cae9729..3a131a4 100644 --- a/Theme/Chicago95/gtk-3.24/gtk-paned.css +++ b/Theme/Chicago95/gtk-3.24/gtk-paned.css @@ -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; } + diff --git a/Theme/Chicago95/gtk-3.24/gtk-scrolledwindows.css b/Theme/Chicago95/gtk-3.24/gtk-scrolledwindows.css index 4b98ea5..48b3573 100644 --- a/Theme/Chicago95/gtk-3.24/gtk-scrolledwindows.css +++ b/Theme/Chicago95/gtk-3.24/gtk-scrolledwindows.css @@ -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; diff --git a/Theme/Chicago95/gtk-3.24/gtk-treeviews.css b/Theme/Chicago95/gtk-3.24/gtk-treeviews.css index 7eb08f7..76b2824 100644 --- a/Theme/Chicago95/gtk-3.24/gtk-treeviews.css +++ b/Theme/Chicago95/gtk-3.24/gtk-treeviews.css @@ -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; } diff --git a/Theme/Chicago95/gtk-3.24/gtk-viewports.css b/Theme/Chicago95/gtk-3.24/gtk-viewports.css index 87df19e..c4786d1 100644 --- a/Theme/Chicago95/gtk-3.24/gtk-viewports.css +++ b/Theme/Chicago95/gtk-3.24/gtk-viewports.css @@ -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; diff --git a/Theme/Chicago95/gtk-3.24/settings.ini b/Theme/Chicago95/gtk-3.24/settings.ini index 9aa01e5..4dcf736 100755 --- a/Theme/Chicago95/gtk-3.24/settings.ini +++ b/Theme/Chicago95/gtk-3.24/settings.ini @@ -1,3 +1,4 @@ [Settings] -gtk-auto-mnemonics = 1 +gtk-auto-mnemonics = 0 gtk-visible-focus = automatic +gtk-menu-images = true