From b65dab5bcc144dd9356485140a77a83cc900ea92 Mon Sep 17 00:00:00 2001 From: EMH-Mark-I Date: Sat, 23 Mar 2019 14:24:14 -0500 Subject: [PATCH] Minor update This patch includes some adjustments for the whisker menu where opacity settings were not working. Panelbar tray icons where panelbar opacity settings were not working. Update to the README to remove the link to my Ubuntu 16.04 LTS theme. I'll still keep the theme, I just don't support it much anymore. Update to the INSTALL guide where there was some spelling mistakes. --- INSTALL.md | 4 +-- README.md | 4 +-- Theme/Chicago95/gtk-3.0/apps/whiskermenu.css | 38 +++++++++++--------- Theme/Chicago95/gtk-3.0/apps/xfce.css | 15 ++++---- 4 files changed, 32 insertions(+), 29 deletions(-) mode change 100755 => 100644 Theme/Chicago95/gtk-3.0/apps/whiskermenu.css mode change 100755 => 100644 Theme/Chicago95/gtk-3.0/apps/xfce.css diff --git a/INSTALL.md b/INSTALL.md index e9dc778..0a8b333 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -194,7 +194,7 @@ After installing qt5ct you will have to configure an environment variable so tha - Open a text editor as root or sudo elevation and navigate to `/etc/X11/Xsession.d/56xubuntu-session` (Note: 56xubuntu-session may be a different name if you are on a different distribution.) - There will be a line with the following "# QT5 apps to use GTK style" and below that the variable `export QT_QPA_PLATFORMTHEME=gtk2` - Change the variable to `export QT_QPA_PLATFORMTHEME=qt5ct` -- Saved changes made the log out and log back into your system. +- Save changes made, then log out and log back into your system. Once you are logged back into your desktop you can access Qt5 Settings. @@ -290,4 +290,4 @@ Name=Chicago95 Chime Comment=The Windows 95 startup sound Exec=sh -c 'play /home/$HOME/.themes/Chicago95/misc/Microsoft\ Windows\ 95\ Startup\ Sound.ogg' OnlyShowIn=LXDE -``` \ No newline at end of file +``` diff --git a/README.md b/README.md index c2c2d27..fdd6ffe 100644 --- a/README.md +++ b/README.md @@ -21,9 +21,7 @@ GTK+ 3.22 Xfce 4.12 -(A Window compositor is preferred.) [See here if you don't use a compositor.](https://github.com/EMH-Mark-I/Chicago95-Custom-XFCE4) - -(Preferred Linux distribution is Xubuntu 17.10 or 18.04) [See here for the 16.04 LTS version of the theme.](https://github.com/EMH-Mark-I/Chicago95-Custom-XUbuntu-16.04-) +A Window compositor ## Install the system theme [Click here](INSTALL.md) for install steps. diff --git a/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css b/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css old mode 100755 new mode 100644 index b75e49c..7210d13 --- a/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css +++ b/Theme/Chicago95/gtk-3.0/apps/whiskermenu.css @@ -6,26 +6,27 @@ the whisker menu without having to correct their pointer location. */ #whiskermenu-button { border: none; box-shadow: none; - margin: 0px; } + margin: 0px; + background-color: transparent; } #whiskermenu-button box { padding: 2px; margin: 1px; - border-top: 1px solid #FFFFFF; - border-bottom: 1px solid #000000; - border-left: 1px solid #FFFFFF; - border-right: 1px solid #000000; - box-shadow: inset -1px -1px #808080; - background-color: #c0c0c0; } + border-top: 1px solid @bg_bright; + border-bottom: 1px solid @bg_dark; + border-left: 1px solid @bg_bright; + border-right: 1px solid @bg_dark; + box-shadow: inset -1px -1px @bg_shade; + background-color: @bg_color; } #whiskermenu-button:active box, #whiskermenu-button:checked box { padding-left: 3px; padding-right: 1px; margin: 1px; - border-bottom: 1px solid #FFF; - border-right: 1px solid #FFF; - border-top: 1px solid #000000; - border-left: 1px solid #000000; - box-shadow: inset -1px -1px #c0c0c0, - inset 1px 1px #808080; + border-bottom: 1px solid @bg_bright; + border-right: 1px solid @bg_bright; + border-top: 1px solid @bg_dark; + border-left: 1px solid @bg_dark; + box-shadow: inset -1px -1px @bg_color, + inset 1px 1px @bg_shade; border-radius: 0px; } #whiskermenu-button image { margin-right: -4px; @@ -52,23 +53,28 @@ the whisker menu without having to correct their pointer location. */ padding-left: 5px; padding-right: 5px; padding-top: 2px; - padding-bottom: 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;} + box-shadow: none; + background-color: transparent; } #whiskermenu-window separator { margin: 5px; } #whiskermenu-window frame > box > box > scrolledwindow { padding: 5px; border: 1px solid; - background-color: @bg_color; + background-color: transparent; border-color: @bg_shade @bg_bright @bg_bright @bg_shade; box-shadow: inset 1px 1px @bg_bright, inset -1px -1px @bg_shade; } + #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;} diff --git a/Theme/Chicago95/gtk-3.0/apps/xfce.css b/Theme/Chicago95/gtk-3.0/apps/xfce.css old mode 100755 new mode 100644 index d9569ce..61deba4 --- a/Theme/Chicago95/gtk-3.0/apps/xfce.css +++ b/Theme/Chicago95/gtk-3.0/apps/xfce.css @@ -10,7 +10,7 @@ XfceHeading { } .xfce4-panel { - background-color: #c0c0c0; + background-color: @bg_color; color: @panel_fg_color; border: 0px; box-shadow: 0 0 0; @@ -22,19 +22,18 @@ XfceHeading { border-radius: 0; border: 1px solid transparent; color: @panel_fg_color; + background-color: transparent; box-shadow: 0 0 0; } .xfce4-panel button:hover { padding: 2px; margin: 2px; - border-top: 1px solid #c0c0c0; - border-bottom: 1px solid #000000; - border-left: 1px solid #c0c0c0; - border-right: 1px solid #000000; - box-shadow: inset 1px 1px #FFFFFF, - inset -1px -1px #808080; - background-color: #c0c0c0; + border-radius: 0; + border: 1px solid transparent; + color: @panel_fg_color; + background-color: @selected_bg_color; + box-shadow: 0 0 0; } .xfce4-panel button:active,