24052020 release

Cinnamox-Aubergine/README.md

@@ -12,10 +12,6 @@ The Cinnamon themes in both [Cinnamox-gtk-theme](https://github.com/smurphos/cin
 
 GTK2, GTK3, GTK3.20 and Metacity themes in both [Cinnamox-gtk-theme](https://github.com/smurphos/cinnamox-gtk-theme) & [Oomox-gtk-theme](https://github.com/themix-project/oomox-gtk-theme) are authored by [@actionless and contributors](https://github.com/themix-project/oomox-gtk-theme/graphs/contributors).
 
-Menu in screenshots is the excellent [Cinnamenu](https://cinnamon-spices.linuxmint.com/applets/view/282).
-
-Icons in screenshots are from [ePapirus](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/tree/master/ePapirus).
-
 [Licensed under GPL-3.0](https://github.com/smurphos/cinnamox-gtk-theme/blob/master/LICENSE)
 
 ## Installation
@@ -34,23 +30,35 @@ To allow the GTK2, GTK3 and Metacity1 themes to apply to GUI apps running as roo
 
 ### Cinnamon Theme Font-Size
 
-The theme includes an interactive bash script that allows end users to adjust the base font-size of the Cinnamon Theme. This can be useful for users running Cinnamon on realtively high resolution displays with relatively small screen dimensions where the hard-coded theme default font-sizes are too small.
+For Cinnamon version 4.6.x and later the Cinnamon theme's font characteristics van be set via changing the default font in Font Selection settings module available from the menu.
+
+For users of older Cinnamon versions the theme includes an interactive bash script that allows end users to adjust the base font-size in the Cinnamon theme. This can be useful for users running Cinnamon on relatively high resolution displays with relatively small screen dimensions where the hard-coded theme default font-sizes are too small.
+
+To access the tool open a terminal window (Ctrl-Alt-T) and use the following command to make the script executable and launch it. 
+
+`chmod +x ~/.themes/Cinnamox-Aubergine/scripts/cinnamox_fontsize.sh && ~/.themes/Cinnamox-Aubergine/scripts/cinnamox_fontsize.sh`
+
+If you are not happy with the end result simply run `~/.themes/Cinnamox-Aubergine/scripts/cinnamox_fontsize.sh` again to chose another option including the default
+
+### Titlebar Button-Size
+
+The theme includes an interactive bash script that allows end users to adjust the size of the Titlebar buttons. Please note this only affects Windows with a traditional titlebar. It has no affect on on Widows using Client Side Decorations.
 
 To access the tool open a terminal window (Ctrl-Alt-T) and use the following command to make the script executable and launch it. 
 
-`chmod +x ~/.themes/Cinnamox-Aubergine/cinnamon/cinnamox_fontsize.sh && ~/.themes/Cinnamox-Aubergine/cinnamon/cinnamox_fontsize.sh`
+`chmod +x ~/.themes/Cinnamox-Aubergine/scripts/cinnamox_titlebar_button_size.sh && ~/.themes/Cinnamox-Aubergine/scripts/cinnamox_titlebar_button_size.sh`
 
-If you are not happy with the end result simply run `~/.themes/Cinnamox-Aubergine/cinnamon/cinnamox_fontsize.sh` again to chose another option including the default
+If you are not happy with the end result simply run `~/.themes/Cinnamox-Aubergine/scripts/cinnamox_titlebar_button_size.sh` again to chose another option including the default
 
 ### Cinnamon Theme Transparency
 
 The theme includes an interactive bash script that allows end users to adjust the transparency of the Cinnamon Theme. The default is no transparency.
 
 To access the tool open a terminal window (Ctrl-Alt-T) and use the following command to make the script executable and launch it. 
 
-`chmod +x ~/.themes/Cinnamox-Aubergine/cinnamon/cinnamox_transparency.sh && ~/.themes/Cinnamox-Aubergine/cinnamon/cinnamox_transparency.sh`
+`chmod +x ~/.themes/Cinnamox-Aubergine/scripts/cinnamox_transparency.sh && ~/.themes/Cinnamox-Aubergine/scripts/cinnamox_transparency.sh`
 
-If you are not happy with the end result simply run `~/.themes/Cinnamox-Aubergine/cinnamon/cinnamox_transparency.sh` again to chose another option including the default.
+If you are not happy with the end result simply run `~/.themes/Cinnamox-Aubergine/scripts/cinnamox_transparency.sh` again to chose another option including the default.
 
 If you would like to control transparency of application windows then please check out my [opacify windows script](https://github.com/smurphos/nemo_actions_and_cinnamon_scripts#opacify-windows)
 
@@ -62,38 +70,36 @@ If you prefer the old styling a helper script is included to facilitate a switch
 
 To access the tool open a terminal window (Ctrl-Alt-T) and use the following command to make the script executable and launch it. 
 
-`chmod +x ~/.themes/Cinnamox-Aubergine/cinnamon/cinnamox_toggle_cinnamon.sh && ~/.themes/Cinnamox-Aubergine/cinnamon/cinnamox_toggle_cinnamon.sh`
+`chmod +x ~/.themes/Cinnamox-Aubergine/scripts/cinnamox_toggle_cinnamon.sh && ~/.themes/Cinnamox-Aubergine/scripts/cinnamox_toggle_cinnamon.sh`
 
-To revert to the new styling simply run `~/.themes/Cinnamox-Aubergine/cinnamon/cinnamox_toggle_cinnamon.sh` again.
+To revert to the new styling simply run `~/.themes/Cinnamox-Aubergine/scripts/cinnamox_toggle_cinnamon.sh` again.
 
 ### GTK2 HIDPI support
 
 If you need HIDPI Support in GTK2 the theme includes a HIDPI version of the gtkrc theme file and a helper script to toggle between the regular and HIDPI version.
 
 To run the script open a terminal window (Ctrl-Alt-T) and use the following command to make the script executable and launch it. 
 
-`chmod +x ~/.themes/Cinnamox-Aubergine/gtk-2.0/cinnamox_toggle_GTK2_HIDPI.sh && ~/.themes/Cinnamox-Aubergine/gtk-2.0/cinnamox_toggle_GTK2_HIDPI.sh`
+`chmod +x ~/.themes/Cinnamox-Aubergine/scripts/cinnamox_toggle_GTK2_HIDPI.sh && ~/.themes/Cinnamox-Aubergine/scripts/cinnamox_toggle_GTK2_HIDPI.sh`
 
-After the first run you can toggle between the two using `~/.themes/Cinnamox-Aubergine/gtk-2.0/cinnamox_toggle_GTK2_HIDPI.sh`
+After the first run you can toggle between the two using `~/.themes/Cinnamox-Aubergine/scripts/cinnamox_toggle_GTK2_HIDPI.sh`
 
 ### qt5ct support
 
 If you need support for qt5ct configuration the theme includes a premade qt5ct.conf file and a helper script to install it to the correct location `~/.config/qt5ct/colors`
 
 To run the script open a terminal window (Ctrl-Alt-T) and use the following command to make the script executable and launch it. 
 
-`chmod +x ~/.themes/Cinnamox-Aubergine/qt5ct/cinnamox_enable_qt5ct.sh && ~/.themes/Cinnamox-Aubergine/qt5ct/cinnamox_enable_qt5ct.sh`
+`chmod +x ~/.themes/Cinnamox-Aubergine/scripts/cinnamox_enable_qt5ct.sh && ~/.themes/Cinnamox-Aubergine/scripts/cinnamox_enable_qt5ct.sh`
 
 ## Compatibility
 
-This theme is compatible with Cinnamon versions `3.2.x`, `3.4.x`, `3.6.x`, `3.8.x`, `4.0.x` & `4.2.x`
+This theme is compatible with Cinnamon versions `3.2.x`, `3.4.x`, `3.6.x`, `3.8.x`, `4.0.x`, `4.2.x`, `4.4.x` & `4.6.x`
 
 The GTK3 themes require GTK `3.18.x` or `3.20.x`+
 
 The GTK2 theme requires the package `gtk2-engines-murrine` or `gtk-engine-murrine` to be installed. The former is a default package in Linux Mint.
 
-Tested on Linux Mint `18.2`, `18.3`, `19`, `19.1` & `19.2` 64bit with Cinnamon `3.4.x`, `3.6.x`, `3.8.x`, `4.0.x` & `4.2.x`; Also tested on Manjaro `17.0.6` 64Bit with Cinnamon `3.6.x`, `3.8.x` & `4.0.x`
-
 ### Firefox fix
 
 If you have problems seeing text on input fields in Firefox with any particular theme this problem can be solved by adding a `~/.mozilla/firefox/********.default/user.js` file to your Firefox default profile including the line `user_pref("widget.content.gtk-theme-override", "Adwaita");` and restarting Firefox.
@@ -102,7 +108,7 @@ This forces firefox to use the GTK default Adwaita theme for rendering all websi
 
 The theme includes a helper script that creates the file with this content in the correct location. To access the tool open a terminal window and use the following command to make the script executable and launch it.
 
-`chmod +x ~/.themes/Cinnamox-Aubergine/cinnamox_firefox_fix.sh && ~/.themes/Cinnamox-Aubergine/cinnamox_firefox_fix.sh`
+`chmod +x ~/.themes/Cinnamox-Aubergine/scripts/cinnamox_firefox_fix.sh && ~/.themes/Cinnamox-Aubergine/scripts/cinnamox_firefox_fix.sh`
 
 ## Make your own theme using Cinnamox / Oomox
 

Cinnamox-Aubergine/cinnamon/cinnamon.css

@@ -1,6 +1,6 @@
 /* Cinnamox-Aubergine */
 /* Transparency: None */
-/* Standard font size (10pt) */
+/* System controlled */
 /* Cinnamox-Aubergine features a deep purple colour scheme and light text. Cinnamon, Metacity, GTK2, GTK3.18 and GTK3.20+ themes are included along with several interactive bash scripts to allow end-users to tweak theme characteristics. */
 /* -------------------------------------------------------------------------- */
 /* This cinnamon theme has been built from an scss template. */
@@ -170,10 +170,6 @@
   background-color: rgba(82, 17, 71, 0.5);
   border: 2px solid #ce4827; }
 
-stage {
-  font-family: roboto, Ubuntu, Noto Sans, sans, sans-serif;
-  font-size: 10pt; }
-
 .cinnamon-link {
   color: #f2a9ec;
   font-style: italic; }
@@ -857,7 +853,9 @@ StScrollView StScrollBar {
 .calendar-week-number {
   color: #f2d9f0;
   font-weight: bold;
-  padding-top: 0.6em; }
+  font-size: 0.8em;
+  height: 1.8em;
+  margin-top: 0.4em; }
 
 .calendar-day:ltr {
   color: #f2d9f0;
@@ -1342,3 +1340,4 @@ StScrollView StScrollBar {
   border-bottom-width: 0;
   border-right-width: 0;
   border-radius: 10px 0 0 0; }
+stage {}

Cinnamox-Aubergine/cinnamon/cinnamon_old.css

@@ -1,6 +1,6 @@
 /* Cinnamox-Aubergine */
 /* Transparency: None */
-/* Standard font size (10pt) */
+/* System controlled */
 /* Cinnamox-Aubergine features a deep purple colour scheme and light text. Cinnamon, Metacity, GTK2, GTK3.18 and GTK3.20+ themes are included along with several interactive bash scripts to allow end-users to tweak theme characteristics. */
 /* -------------------------------------------------------------------------- */
 /* This cinnamon theme has been built from an scss template. */
@@ -237,10 +237,6 @@
   background-color: rgba(82, 17, 71, 0.5);
   border: 2px solid #ce4827; }
 
-stage {
-  font-family: roboto, Ubuntu, Noto Sans, sans, sans-serif;
-  font-size: 10pt; }
-
 .cinnamon-link {
   color: #f2a9ec;
   font-style: italic; }
@@ -899,7 +895,9 @@ StScrollView StScrollBar {
 .calendar-week-number {
   color: #f2d9f0;
   font-weight: bold;
-  padding-top: 0.6em; }
+  font-size: 0.8em;
+  height: 1.8em;
+  margin-top: 0.4em; }
 
 .calendar-day:ltr {
   color: #f2d9f0;
@@ -1384,3 +1382,4 @@ StScrollView StScrollBar {
   border-bottom-width: 0;
   border-right-width: 0;
   border-radius: 10px 0 0 0; }
+stage {}

Cinnamox-Aubergine/gtk-3.20/thumbnail.png

@@ -0,0 +1 @@
+../gtk-3.0/thumbnail.png