From 9fc4add879fed3af80f80c2674b4f0b202e930b9 Mon Sep 17 00:00:00 2001 From: aidan Date: Sun, 25 Aug 2019 11:24:46 -0500 Subject: [PATCH 1/8] XFCE4.14 updates Added theming for the new pathbar for Thunar. Added some minor theming for the new Color Profiles XFCE application. This also included an additional override in the Extra gtk.css file. Included the checkbutton widget selector to the focus state exclusion in the gtk3.24 gtk-widgets.css file (see line 47); and disabled the outline for focused checkbuttons. Opening a staging branch for testing. --- Extras/override/gtk.css | 27 ++--- Theme/Chicago95/gtk-3.24/apps/thunar.css | 120 +++++++++++++---------- Theme/Chicago95/gtk-3.24/apps/xfce.css | 111 +++++++++++---------- Theme/Chicago95/gtk-3.24/gtk-widgets.css | 92 ++++++++--------- 4 files changed, 186 insertions(+), 164 deletions(-) diff --git a/Extras/override/gtk.css b/Extras/override/gtk.css index f34af95..09236d6 100755 --- a/Extras/override/gtk.css +++ b/Extras/override/gtk.css @@ -1,36 +1,37 @@ /* Thunar */ .thunar paned scrolledwindow { - border-right: 1px solid @bg_bright; -} + border-right: 1px solid @bg_bright; } .xfce4-panel { - border-top: 1px solid @bg_bright; -} + border-top: 1px solid @bg_bright; } /* XFCE Panel bar */ .xfce4-panel { - border-right: 1px solid @bg_shade; - border-left: 1px solid @bg_bright; - border-top: 1px solid @bg_bright; -} + border-right: 1px solid @bg_shade; + border-left: 1px solid @bg_bright; + border-top: 1px solid @bg_bright; } /* This just keeps the power manager plugin icon to stay small. Only useful for XUbuntu 18.04; not required for 19.04.*/ #xfce4-power-manager-plugin { - padding: 6px 6px; } + padding: 6px 6px; } /* Force MATE panel tasklist margins */ #tasklist-button { - margin-left: 2px; - margin-right: 2px; -} + margin-left: 2px; + margin-right: 2px; } /* GNOME Disk utility */ /* This is a fix for the GNOME disk application grid style. */ .gnome-disk-utility-grid { -background-color: @bg_shade; + background-color: @bg_shade; color: @font_bright; border-radius: 0px; outline-color: white; } .gnome-disk-utility-grid:backdrop { background-color: @bg_shade; } + +/* XFCE APP: Color Profiles */ +/* Force a background colour since the color profile app overrides the GTK theme. */ +.color-profiles { + background-color: #c0c0c0; } diff --git a/Theme/Chicago95/gtk-3.24/apps/thunar.css b/Theme/Chicago95/gtk-3.24/apps/thunar.css index bcbe9be..70acbe6 100644 --- a/Theme/Chicago95/gtk-3.24/apps/thunar.css +++ b/Theme/Chicago95/gtk-3.24/apps/thunar.css @@ -1,62 +1,76 @@ .thunar statusbar frame { - padding: 0px; - margin-top: 2px; + padding: 0px; + margin-top: 2px; + border-left: 1px solid @bg_shade; + border-top: 1px solid @bg_shade; + border-bottom: 1px solid @bg_bright; + border-right: 1px solid @bg_bright; + box-shadow: none; } + +.thunar paned scrolledwindow { + border-right: 1px solid @bg_bright; } + .thunar paned .view:focus { + outline-color: white; } + +.thunar notebook tab { + padding: 0px; + min-width: 16px; + min-height: 16px; } + +.thunar #location-toolbar button { + border: 1px solid transparent; + box-shadow: none; } + .thunar #location-toolbar button:hover { + border-left: 1px solid @bg_bright; + border-top: 1px solid @bg_bright; + border-bottom: 1px solid @bg_shade; + border-right: 1px solid @bg_shade; + box-shadow: none; } + .thunar #location-toolbar button:active { + border-left: 1px solid @bg_dark; + border-top: 1px solid @bg_dark; + border-bottom: 1px solid @bg_bright; + border-right: 1px solid @bg_bright; + box-shadow: inset 1px 1px @bg_shade; } + .thunar #location-toolbar button:disabled { border-left: 1px solid @bg_shade; border-top: 1px solid @bg_shade; border-bottom: 1px solid @bg_bright; - border-right: 1px solid @bg_bright; - box-shadow: none; } - -.thunar paned scrolledwindow { border-right: 1px solid @bg_bright; } - .thunar paned .view:focus { - outline-color: white; } -.thunar notebook tab { - padding: 0px; - min-width: 16px; - min-height: 16px; } - -.thunar #location-toolbar button { -border: 1px solid transparent; -box-shadow: none; } - .thunar #location-toolbar button:hover { - border-left: 1px solid @bg_bright; - border-top: 1px solid @bg_bright; - border-bottom: 1px solid @bg_shade; - border-right: 1px solid @bg_shade; - box-shadow: none; } - .thunar #location-toolbar button:active { - border-left: 1px solid @bg_dark; - border-top: 1px solid @bg_dark; - border-bottom: 1px solid @bg_bright; - border-right: 1px solid @bg_bright; - box-shadow: inset 1px 1px @bg_shade; } - .thunar #location-toolbar button:disabled { - border-left: 1px solid @bg_shade; - border-top: 1px solid @bg_shade; - border-bottom: 1px solid @bg_bright; - border-right: 1px solid @bg_bright; } +.thunar #location-toolbar .path-bar-button { + border-left: 1px solid @bg_bright; + border-top: 1px solid @bg_bright; + border-bottom: 1px solid @bg_shade; + border-right: 1px solid @bg_shade; + box-shadow: none; } + .thunar #location-toolbar .path-bar-button:active, + .thunar #location-toolbar .path-bar-button:checked { + border-left: 1px solid @bg_dark; + border-top: 1px solid @bg_dark; + border-bottom: 1px solid @bg_bright; + border-right: 1px solid @bg_bright; + box-shadow: inset 1px 1px @bg_shade; } .thunar #main-menu { - border-top: 1px solid @bg_shade; - box-shadow: inset 0px 1px @bg_bright, inset -1px -1px @bg_shade; - border-bottom: 1px solid @bg_bright; - border-right: 1px solid @bg_bright; } - .thunar #main-menu spinner { - min-width: 8px; - min-height: 8px; - /*-gtk-icon-source: none;*/ - background: #000000; } + border-top: 1px solid @bg_shade; + box-shadow: inset 0px 1px @bg_bright, inset -1px -1px @bg_shade; + border-bottom: 1px solid @bg_bright; + border-right: 1px solid @bg_bright; } + .thunar #main-menu spinner { + min-width: 8px; + min-height: 8px; + /*-gtk-icon-source: none;*/ + background: #000000; } .thunar #main-menu > menuitem:not(#edit-menu):not(#file-menu):not(#view-menu):not(#go-menu):not(#help-menu) { - background-color: black; - border-left: 1px solid @bg_shade; - box-shadow: inset 1px 0px @bg_bright; - min-width: 21px; - min-height: 17px; - background-image: url("../assets/status_badge_msw.png"); - background-repeat: no-repeat; - background-position: center; - background-size: 21px 17px; - padding-left: 1.5em; - padding-right: 1.5em; } + background-color: black; + border-left: 1px solid @bg_shade; + box-shadow: inset 1px 0px @bg_bright; + min-width: 21px; + min-height: 17px; + background-image: url("../assets/status_badge_msw.png"); + background-repeat: no-repeat; + background-position: center; + background-size: 21px 17px; + padding-left: 1.5em; + padding-right: 1.5em; } diff --git a/Theme/Chicago95/gtk-3.24/apps/xfce.css b/Theme/Chicago95/gtk-3.24/apps/xfce.css index c78b433..0405a39 100644 --- a/Theme/Chicago95/gtk-3.24/apps/xfce.css +++ b/Theme/Chicago95/gtk-3.24/apps/xfce.css @@ -22,62 +22,69 @@ XfdesktopIconView.view { #xfce4-notification-plugin, #pulseaudio-button, #xfce4-power-manager-plugin { - padding: 0px; + padding: 0px; + border: transparent; + /*box-shadow: inset 0px 1px white;*/ + box-shadow: none; + color: @panel_fg_color; + background-color: transparent; } + .xfce4-panel .flat:not(.toggle):hover, + .xfce4-panel .flat:not(.toggle):active, + .xfce4-panel .flat:not(.toggle):checked, + #sn-button:hover, + #sn-button:active, + #sn-button:checked, + #xfce4-notification-plugin:hover, + #xfce4-notification-plugin:active, + #xfce4-notification-plugin:checked, + #pulseaudio-button:hover, + #pulseaudio-button:active, + #pulseaudio-button:checked, + #xfce4-power-manager-plugin:hover, + #xfce4-power-manager-plugin:active, + #xfce4-power-manager-plugin:checked { border: transparent; - /*box-shadow: inset 0px 1px white;*/ box-shadow: none; - color: @panel_fg_color; - background-color: transparent; } - .xfce4-panel .flat:not(.toggle):hover, - .xfce4-panel .flat:not(.toggle):active, - .xfce4-panel .flat:not(.toggle):checked, - #sn-button:hover, - #sn-button:active, - #sn-button:checked, - #xfce4-notification-plugin:hover, - #xfce4-notification-plugin:active, - #xfce4-notification-plugin:checked, - #pulseaudio-button:hover, - #pulseaudio-button:active, - #pulseaudio-button:checked, - #xfce4-power-manager-plugin:hover, - #xfce4-power-manager-plugin:active, - #xfce4-power-manager-plugin:checked { - border: transparent; - box-shadow: none; - color: @panel_fg_color_bright; - background-color: @selected_bg_color; } + color: @panel_fg_color_bright; + background-color: @selected_bg_color; } #clock-button { - border: 2px solid transparent; - box-shadow: inset 1px 1px @bg_shade, inset -1px -1px @bg_bright; - margin: 0px; - background-color: transparent; } + border: 2px solid transparent; + box-shadow: inset 1px 1px @bg_shade, inset -1px -1px @bg_bright; + margin: 0px; + background-color: transparent; } /* Tasklist */ .tasklist .toggle { - border: none; - box-shadow: none; - margin: 0px; - background-color: transparent; } - .tasklist .toggle box { - margin: 2px; - border-left: 1px solid @bg_bright; - border-top: 1px solid @bg_bright; - border-right: 1px solid @bg_dark; - border-bottom: 1px solid @bg_dark; - box-shadow: inset -1px -1px @bg_shade; } - .tasklist .toggle:checked box { - /*font-family: "NotoSans-Bold";*/ - font-weight: bold; - border-left: 1px solid @bg_dark; - border-top: 1px solid @bg_dark; - border-right: 1px solid @bg_bright; - border-bottom: 1px solid @bg_bright; - box-shadow: inset 1px 1px @bg_shade, inset -1px -1px @bg_color; - background-color: @border_bright; - 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%, @border_dark); - background-size: 2px 2px; - background-position: 0 0, 1px 1px; } - .tasklist .toggle label { - margin-right: 4px; } + border: none; + box-shadow: none; + margin: 0px; + background-color: transparent; } + .tasklist .toggle box { + margin: 2px; + border-left: 1px solid @bg_bright; + border-top: 1px solid @bg_bright; + border-right: 1px solid @bg_dark; + border-bottom: 1px solid @bg_dark; + box-shadow: inset -1px -1px @bg_shade; } + .tasklist .toggle:checked box { + /*font-family: "NotoSans-Bold";*/ + font-weight: bold; + border-left: 1px solid @bg_dark; + border-top: 1px solid @bg_dark; + border-right: 1px solid @bg_bright; + border-bottom: 1px solid @bg_bright; + box-shadow: inset 1px 1px @bg_shade, inset -1px -1px @bg_color; + background-color: @border_bright; + 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%, @border_dark); + background-size: 2px 2px; + background-position: 0 0, 1px 1px; } + .tasklist .toggle label { + margin-right: 4px; } + +/* XFCE APP: Color Profiles */ +.color-profiles { + padding: 4px } + .color-profiles .inline-toolbar { + border: 1px solid transparent; + box-shadow: none; } diff --git a/Theme/Chicago95/gtk-3.24/gtk-widgets.css b/Theme/Chicago95/gtk-3.24/gtk-widgets.css index b3bfc88..718a912 100644 --- a/Theme/Chicago95/gtk-3.24/gtk-widgets.css +++ b/Theme/Chicago95/gtk-3.24/gtk-widgets.css @@ -44,7 +44,7 @@ iconview:selected, -gtk-icon-effect: dim; } /* There appears to be a bug in gtk treeviews on :focus with outlines that will cause a momentary displacement of the UI. Keep the treeview exclusion! */ -:focus:not(treeview):not(view) { +:focus:not(treeview):not(view):not(checkbutton) { outline: 1px dotted @border_dark; -gtk-outline-radius: 0px; outline-offset: -4px; } @@ -554,8 +554,24 @@ button.osd { .stack-switcher > button.needs-attention:checked > image { background-image: none; } .inline-toolbar button, .inline-toolbar button:backdrop { + margin: 1px; border-radius: 0px; - border-width: 1px; } + border-left: 1px solid @bg_bright; + border-top: 1px solid @bg_bright; + border-bottom: 1px solid @bg_shade; + border-right: 1px solid @bg_shade; + box-shadow: none; } + .inline-toolbar button:active { + border-left: 1px solid @bg_dark; + border-top: 1px solid @bg_dark; + border-bottom: 1px solid @bg_bright; + border-right: 1px solid @bg_bright; + box-shadow: inset 1px 1px @bg_shade; } + .inline-toolbar button:disabled { + border-left: 1px solid @bg_shade; + border-top: 1px solid @bg_shade; + border-bottom: 1px solid @bg_bright; + border-right: 1px solid @bg_bright; } .primary-toolbar button { -gtk-icon-shadow: none; } @@ -631,85 +647,69 @@ button.color { /* disabling focus outline because it looks bad around the whole element... */ radiobutton:focus, checkbutton:focus { - outline: 0px -} + outline: 0px; + outline: none; } /* ...instead we are going to enable it around the label */ /* but outline doesen't work inside a label! so we use borders */ radiobutton label, checkbutton label{ - padding-left: 4px; - padding-right: 4px; - border: 1px dotted alpha(@border_dark,0); -} + padding-left: 4px; + padding-right: 4px; + border: 1px dotted alpha(@border_dark,0); } radiobutton:focus label, checkbutton:focus label{ - border: 1px dotted @border_dark; -} + border: 1px dotted @border_dark; } check, radio { - min-width: 16px; - min-height: 16px; -} + min-width: 16px; + min-height: 16px; } check:checked { - -gtk-icon-source: url("assets/checkbox-checked.png"); - -gtk-icon-transform: none; - background: none; -} + -gtk-icon-source: url("assets/checkbox-checked.png"); + -gtk-icon-transform: none; + background: none; } check:not(:checked) { - -gtk-icon-source: url("assets/checkbox-unchecked.png"); - -gtk-icon-transform: none; - background: none; -} + -gtk-icon-source: url("assets/checkbox-unchecked.png"); + -gtk-icon-transform: none; + background: none; } check:indeterminate { - -gtk-icon-source: url("assets/checkbox-mixed.png"); - background: none; -} + -gtk-icon-source: url("assets/checkbox-mixed.png"); + background: none; } check:disabled:checked { - -gtk-icon-source: url("assets/checkbox-checked-insensitive.png"); - background: none; -} + -gtk-icon-source: url("assets/checkbox-checked-insensitive.png"); + background: none; } check:disabled:not(checked) { - -gtk-icon-source: url("assets/checkbox-unchecked-insensitive.png"); - background: none; -} + -gtk-icon-source: url("assets/checkbox-unchecked-insensitive.png"); + background: none; } check:indeterminate:disabled { - -gtk-icon-source: url("assets/checkbox-mixed-insensitive.png"); - background: none; -} - + -gtk-icon-source: url("assets/checkbox-mixed-insensitive.png"); + background: none; } radio:checked { - -gtk-icon-source: url("assets/radio-selected.png"); -} + -gtk-icon-source: url("assets/radio-selected.png"); } radio:not(:checked) { - -gtk-icon-source: url("assets/radio-unselected.png"); -} + -gtk-icon-source: url("assets/radio-unselected.png"); } radio:indeterminate { - -gtk-icon-source: url("assets/radio-mixed.png"); -} + -gtk-icon-source: url("assets/radio-mixed.png"); } radio:disabled:checked { - -gtk-icon-source: url("assets/radio-selected-insensitive.png"); -} + -gtk-icon-source: url("assets/radio-selected-insensitive.png"); } radio:disabled:not(checked) { - -gtk-icon-source: url("assets/radio-unselected-insensitive.png"); -} + -gtk-icon-source: url("assets/radio-unselected-insensitive.png"); } radio:indeterminate:disabled { - -gtk-icon-source: url("assets/radio-mixed-insensitive.png"); -} + -gtk-icon-source: url("assets/radio-mixed-insensitive.png"); } /********* * Frames * From 655b9013c1ce5e7fac82f376ed3798d8e9472eb6 Mon Sep 17 00:00:00 2001 From: aidan Date: Sun, 25 Aug 2019 11:49:12 -0500 Subject: [PATCH 2/8] XFCE4.14 Updates Adding the radiobutton to the focus state exclusion as well as porting to the gtk3.0 version of the theme. This resolves the double outline border effect seen in the Firefox download dialog when selecting download location. --- Theme/Chicago95/gtk-3.0/gtk-widgets.css | 74 ++++++++++-------------- Theme/Chicago95/gtk-3.24/gtk-widgets.css | 2 +- 2 files changed, 30 insertions(+), 46 deletions(-) diff --git a/Theme/Chicago95/gtk-3.0/gtk-widgets.css b/Theme/Chicago95/gtk-3.0/gtk-widgets.css index b3bfc88..79de59b 100644 --- a/Theme/Chicago95/gtk-3.0/gtk-widgets.css +++ b/Theme/Chicago95/gtk-3.0/gtk-widgets.css @@ -44,7 +44,7 @@ iconview:selected, -gtk-icon-effect: dim; } /* There appears to be a bug in gtk treeviews on :focus with outlines that will cause a momentary displacement of the UI. Keep the treeview exclusion! */ -:focus:not(treeview):not(view) { +:focus:not(treeview):not(view):not(checkbutton):not(radiobutton) { outline: 1px dotted @border_dark; -gtk-outline-radius: 0px; outline-offset: -4px; } @@ -631,85 +631,69 @@ button.color { /* disabling focus outline because it looks bad around the whole element... */ radiobutton:focus, checkbutton:focus { - outline: 0px -} + outline: 0px; + outline: none; } /* ...instead we are going to enable it around the label */ /* but outline doesen't work inside a label! so we use borders */ radiobutton label, checkbutton label{ - padding-left: 4px; - padding-right: 4px; - border: 1px dotted alpha(@border_dark,0); -} + padding-left: 4px; + padding-right: 4px; + border: 1px dotted alpha(@border_dark,0); } radiobutton:focus label, checkbutton:focus label{ - border: 1px dotted @border_dark; -} + border: 1px dotted @border_dark; } check, radio { - min-width: 16px; - min-height: 16px; -} + min-width: 16px; + min-height: 16px; } check:checked { - -gtk-icon-source: url("assets/checkbox-checked.png"); - -gtk-icon-transform: none; - background: none; -} + -gtk-icon-source: url("assets/checkbox-checked.png"); + -gtk-icon-transform: none; + background: none; } check:not(:checked) { - -gtk-icon-source: url("assets/checkbox-unchecked.png"); - -gtk-icon-transform: none; - background: none; -} + -gtk-icon-source: url("assets/checkbox-unchecked.png"); + -gtk-icon-transform: none; + background: none; } check:indeterminate { - -gtk-icon-source: url("assets/checkbox-mixed.png"); - background: none; -} + -gtk-icon-source: url("assets/checkbox-mixed.png"); + background: none; } check:disabled:checked { - -gtk-icon-source: url("assets/checkbox-checked-insensitive.png"); - background: none; -} + -gtk-icon-source: url("assets/checkbox-checked-insensitive.png"); + background: none; } check:disabled:not(checked) { - -gtk-icon-source: url("assets/checkbox-unchecked-insensitive.png"); - background: none; -} + -gtk-icon-source: url("assets/checkbox-unchecked-insensitive.png"); + background: none; } check:indeterminate:disabled { - -gtk-icon-source: url("assets/checkbox-mixed-insensitive.png"); - background: none; -} - + -gtk-icon-source: url("assets/checkbox-mixed-insensitive.png"); + background: none; } radio:checked { - -gtk-icon-source: url("assets/radio-selected.png"); -} + -gtk-icon-source: url("assets/radio-selected.png"); } radio:not(:checked) { - -gtk-icon-source: url("assets/radio-unselected.png"); -} + -gtk-icon-source: url("assets/radio-unselected.png"); } radio:indeterminate { - -gtk-icon-source: url("assets/radio-mixed.png"); -} + -gtk-icon-source: url("assets/radio-mixed.png"); } radio:disabled:checked { - -gtk-icon-source: url("assets/radio-selected-insensitive.png"); -} + -gtk-icon-source: url("assets/radio-selected-insensitive.png"); } radio:disabled:not(checked) { - -gtk-icon-source: url("assets/radio-unselected-insensitive.png"); -} + -gtk-icon-source: url("assets/radio-unselected-insensitive.png"); } radio:indeterminate:disabled { - -gtk-icon-source: url("assets/radio-mixed-insensitive.png"); -} + -gtk-icon-source: url("assets/radio-mixed-insensitive.png"); } /********* * Frames * diff --git a/Theme/Chicago95/gtk-3.24/gtk-widgets.css b/Theme/Chicago95/gtk-3.24/gtk-widgets.css index 718a912..6aaf457 100644 --- a/Theme/Chicago95/gtk-3.24/gtk-widgets.css +++ b/Theme/Chicago95/gtk-3.24/gtk-widgets.css @@ -44,7 +44,7 @@ iconview:selected, -gtk-icon-effect: dim; } /* There appears to be a bug in gtk treeviews on :focus with outlines that will cause a momentary displacement of the UI. Keep the treeview exclusion! */ -:focus:not(treeview):not(view):not(checkbutton) { +:focus:not(treeview):not(view):not(checkbutton):not(radiobutton) { outline: 1px dotted @border_dark; -gtk-outline-radius: 0px; outline-offset: -4px; } From b4f70789fc130e00840560bdd419306bfbf2ab9f Mon Sep 17 00:00:00 2001 From: aidan Date: Sun, 25 Aug 2019 12:25:59 -0500 Subject: [PATCH 3/8] XFCE4.14 Updates Themed the workspace switer plugin. --- Theme/Chicago95/gtk-3.24/apps/xfce.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Theme/Chicago95/gtk-3.24/apps/xfce.css b/Theme/Chicago95/gtk-3.24/apps/xfce.css index 0405a39..1cc3cda 100644 --- a/Theme/Chicago95/gtk-3.24/apps/xfce.css +++ b/Theme/Chicago95/gtk-3.24/apps/xfce.css @@ -54,6 +54,14 @@ XfdesktopIconView.view { margin: 0px; background-color: transparent; } +wnck-pager { + color: white; } + wnck-pager:selected { + background-color: @selected_bg_color; } + wnck-pager:hover { + background-color: @bg_shade; + color: white; } + /* Tasklist */ .tasklist .toggle { border: none; From de8629f8cb2e6e6ab839082781c701b0e92afb48 Mon Sep 17 00:00:00 2001 From: aidan Date: Sun, 25 Aug 2019 12:36:29 -0500 Subject: [PATCH 4/8] Updates A fix for the panelbar power manager plugin icon. The icon should now be completely visible. --- Theme/Chicago95/gtk-3.0/apps/xfce.css | 3 +++ Theme/Chicago95/gtk-3.24/apps/xfce.css | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Theme/Chicago95/gtk-3.0/apps/xfce.css b/Theme/Chicago95/gtk-3.0/apps/xfce.css index bb17515..a2f8c19 100644 --- a/Theme/Chicago95/gtk-3.0/apps/xfce.css +++ b/Theme/Chicago95/gtk-3.0/apps/xfce.css @@ -52,3 +52,6 @@ XfceHeading { .xfce4-panel menu { -gtk-icon-effect: none; } + +#xfce4-power-manager-plugin { + margin-bottom: -2px; } diff --git a/Theme/Chicago95/gtk-3.24/apps/xfce.css b/Theme/Chicago95/gtk-3.24/apps/xfce.css index 1cc3cda..0c84733 100644 --- a/Theme/Chicago95/gtk-3.24/apps/xfce.css +++ b/Theme/Chicago95/gtk-3.24/apps/xfce.css @@ -47,6 +47,8 @@ XfdesktopIconView.view { box-shadow: none; color: @panel_fg_color_bright; background-color: @selected_bg_color; } + #xfce4-power-manager-plugin { + margin-bottom: -2px; } #clock-button { border: 2px solid transparent; From f33bb6536d81853d18b02322f897d802497d1297 Mon Sep 17 00:00:00 2001 From: aidan Date: Sun, 25 Aug 2019 14:11:41 -0500 Subject: [PATCH 5/8] Updates Fixed rubberband theme for GTK3 applications. --- Theme/Chicago95/gtk-3.0/gtk-widgets.css | 16 ++++++++-------- Theme/Chicago95/gtk-3.24/apps/thunar.css | 1 + Theme/Chicago95/gtk-3.24/gtk-widgets.css | 16 ++++++++-------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Theme/Chicago95/gtk-3.0/gtk-widgets.css b/Theme/Chicago95/gtk-3.0/gtk-widgets.css index 79de59b..8a427fd 100644 --- a/Theme/Chicago95/gtk-3.0/gtk-widgets.css +++ b/Theme/Chicago95/gtk-3.0/gtk-widgets.css @@ -2901,14 +2901,14 @@ button.appmenu { padding-top: 4px;*/ } -/* declaration of .view was causing problems with white background rubberband in nautilus, putting this here for now */ -flowbox rubberband, treeview.view rubberband, .content-view rubberband, -.rubberband, rubberband { - border: 1px solid @border_dark; - background-color: transparent; - /* box-shadow: inset 1px 1px 0px 0px @border_dark, - inset -1px -1px 0px 0px @border_dark; */ -} +.rubberband, +rubberband, +flowbox rubberband, +treeview.view rubberband, +.content-view rubberband { + border: 1px solid @selected_bg_color; + background: rgba(0,0,50.2,0.5); + border-radius: 0px; } /* Misc stuff */ diff --git a/Theme/Chicago95/gtk-3.24/apps/thunar.css b/Theme/Chicago95/gtk-3.24/apps/thunar.css index 70acbe6..99c6f64 100644 --- a/Theme/Chicago95/gtk-3.24/apps/thunar.css +++ b/Theme/Chicago95/gtk-3.24/apps/thunar.css @@ -74,3 +74,4 @@ background-size: 21px 17px; padding-left: 1.5em; padding-right: 1.5em; } + diff --git a/Theme/Chicago95/gtk-3.24/gtk-widgets.css b/Theme/Chicago95/gtk-3.24/gtk-widgets.css index 6aaf457..8ca9242 100644 --- a/Theme/Chicago95/gtk-3.24/gtk-widgets.css +++ b/Theme/Chicago95/gtk-3.24/gtk-widgets.css @@ -2917,14 +2917,14 @@ button.appmenu { padding-top: 4px;*/ } -/* declaration of .view was causing problems with white background rubberband in nautilus, putting this here for now */ -flowbox rubberband, treeview.view rubberband, .content-view rubberband, -.rubberband, rubberband { - border: 1px solid @border_dark; - background-color: transparent; - /* box-shadow: inset 1px 1px 0px 0px @border_dark, - inset -1px -1px 0px 0px @border_dark; */ -} +.rubberband, +rubberband, +flowbox rubberband, +treeview.view rubberband, +.content-view rubberband { + border: 1px solid @selected_bg_color; + background: rgba(0,0,50.2,0.5); + border-radius: 0px; } /* Misc stuff */ From d07560115e9e366e0676349554c3e63f15aa2af7 Mon Sep 17 00:00:00 2001 From: Braden Farmer Date: Sun, 25 Aug 2019 20:14:21 -0600 Subject: [PATCH 6/8] Add font config file for MS Sans Serif Bold --- Extras/99-ms-sans-serif-bold.conf | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Extras/99-ms-sans-serif-bold.conf diff --git a/Extras/99-ms-sans-serif-bold.conf b/Extras/99-ms-sans-serif-bold.conf new file mode 100644 index 0000000..83cec01 --- /dev/null +++ b/Extras/99-ms-sans-serif-bold.conf @@ -0,0 +1,21 @@ + + + + + + + + MS Sans Serif + + + + + + + Microsoft Sans Serif + bold + MS Sans Serif + false + + + From bfe697e95920ee319b57b4ed5b02abb3fa11c023 Mon Sep 17 00:00:00 2001 From: Braden Farmer Date: Sun, 25 Aug 2019 21:03:26 -0600 Subject: [PATCH 7/8] Update INSTALL.md Add instructions for configuring MS Sans Serif bold font --- INSTALL.md | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 2deabea..53522dd 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -380,23 +380,34 @@ In XFCE select Settings -> Mouse and Touchpad. Click on 'Icons' and select `Chic ### [ MS Sans Serif font ] -For an authentic Windows 95 feel, you can use the original MS Sans Serif font. To do this, you will need a copy of the C:\Windows\Fonts\micross.ttf file from any modern Windows computer (this font is titled "Microsoft Sans Serif Regular"). +For an authentic Windows 95 feel, you can use the original MS Sans Serif font. To do this, you will need a copy of both the "MS Sans Serif Regular" and "Microsoft Sans Serif Regular" fonts from the `C:\Windows\Fonts` directory of any modern Windows computer. (The filenames for these fonts are `sserife.fon` and `micross.ttf` respectively) + +After copying over the files to your Linux install, we now need to convert the `sserife.fon` file to a TrueType font using FontForge. (This step is optional; you can still use MS Sans Serif, but bold fonts will not be available) + +- Install FontForge with `sudo apt install fontforge` +- Open FontForge and open the `sserife.fon` file +- After the font is opened, go to File -> Generate Fonts... +- Below the new filename `MSSansSerif.ttf` there will be two dropdowns, make sure the left one is set to "No Outline Font", then set the right one to "(faked) MS Bitmap only sfnt (ttf)" +- Click the Generate button. You may now close FontForge and delete the original `sserife.fon` file + +We now need to install the MS Sans Serif fonts, as well as their font configuration files. #### Single-user install: #### -- Create a folder `ms_sans_serif` inside the `~/.fonts/truetype/` directory -- Copy `micross.ttf` to the newly-created folder -- Copy the file `Extras/99-ms-sans-serif.conf` to your home directory `~` and rename it `.fonts.conf` +- Run `mkdir -p ~/.fonts/truetype/ms_sans_serif/` +- Copy `micross.ttf` and `MSSansSerif.ttf` to `~/.fonts/truetype/ms_sans_serif/` +- Run `mkdir -p ~/.config/fontconfig/conf.d/` +- Copy `Extras/99-ms-sans-serif.conf` and `Extras/99-ms-sans-serif-bold.conf` to `~/.config/fontconfig/conf.d/` - Update the font cache by running `sudo fc-cache -f -v` #### System-wide install: #### -- Create a folder `ms_sans_serif` inside the `/usr/share/fonts/truetype/` directory -- Copy `micross.ttf` to the newly-created folder -- Copy the file `Extras/99-ms-sans-serif.conf` to `/etc/fonts/conf.d` +- Run `sudo mkdir -p /usr/share/fonts/truetype/ms_sans_serif` +- Copy `micross.ttf` to `/usr/share/fonts/truetype/ms_sans_serif` +- Copy `Extras/99-ms-sans-serif.conf` and `Extras/99-ms-sans-serif-bold.conf` to `/etc/fonts/conf.d` - Update the font cache by running `sudo fc-cache -f -v` To set the main font for the entire system, open the XFCE settings manager > Appearance > Fonts tab. Set the "Default font" to Microsoft Sans Serif, style Regular, size 8. -To set the title bar font, open the XFCE settings manager > Window Manager > Style tab. Set the "Title font" to Microsoft Sans Serif, style Regular, size 8. +To set the title bar font, open the XFCE settings manager > Window Manager > Style tab. Set the "Title font" to Microsoft Sans Serif, style Bold, size 8. Finally, set the font for the Orage panel clock by right-clicking the panel clock, selecting Properties, then next to Line 1, change the font to Microsoft Sans Serif, style Regular, size 8. Inside the Line 1 box, add two spaces before and after the value in the box, to apply some spacing. From adb55759469e38fb58eabdbf0997d76d57addf4d Mon Sep 17 00:00:00 2001 From: Braden Farmer Date: Mon, 26 Aug 2019 10:56:02 -0600 Subject: [PATCH 8/8] Small fix for previous PR --- INSTALL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index 53522dd..b459258 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -401,7 +401,7 @@ We now need to install the MS Sans Serif fonts, as well as their font configurat #### System-wide install: #### - Run `sudo mkdir -p /usr/share/fonts/truetype/ms_sans_serif` -- Copy `micross.ttf` to `/usr/share/fonts/truetype/ms_sans_serif` +- Copy `micross.ttf` and `MSSansSerif.ttf` to `/usr/share/fonts/truetype/ms_sans_serif` - Copy `Extras/99-ms-sans-serif.conf` and `Extras/99-ms-sans-serif-bold.conf` to `/etc/fonts/conf.d` - Update the font cache by running `sudo fc-cache -f -v`