Skip to content

Commit

Permalink
Merge pull request #19 from smurphos/nextupdate
Browse files Browse the repository at this point in the history
20180827 release candidate
  • Loading branch information
smurphos committed Aug 27, 2018
2 parents 8e08fb6 + 57a1532 commit 903344e
Show file tree
Hide file tree
Showing 139 changed files with 708 additions and 28,418 deletions.
20 changes: 12 additions & 8 deletions Cinnamox-Aubergine/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@ Cinnamox-Aubergine features a deep purple colour scheme and light text. Cinnamon

Build tools are at [Cinnamox-gtk-theme](https://github.com/smurphos/cinnamox-gtk-theme).

[Cinnamox-gtk-theme](https://github.com/smurphos/cinnamox-gtk-theme) is a fork of [Oomox-gtk-theme](https://github.com/actionless/oomox-gtk-theme).
[Cinnamox-gtk-theme](https://github.com/smurphos/cinnamox-gtk-theme) is a fork of [Oomox-gtk-theme](https://github.com/themix-project/oomox-gtk-theme).

The Cinnamon themes in both [Cinnamox-gtk-theme](https://github.com/smurphos/cinnamox-gtk-theme) & [Oomox-gtk-theme](https://github.com/actionless/oomox-gtk-theme) are authored by [@smurphos](https://github.com/smurphos).
The Cinnamon 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 [@smurphos](https://github.com/smurphos).

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/actionless/oomox-gtk-theme) are authored by [@Actionless and others](https://github.com/smurphos/cinnamox-gtk-theme/blob/master/CREDITS) with contributions from [@smurphos](https://github.com/smurphos)
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 [CinnVIIStarkMenu](https://cinnamon-spices.linuxmint.com/applets/view/281).

Icons in screenshots are from [Vibrancy Colours](http://www.ravefinity.com/p/vibrancy-colors-gtk-icon-theme.html).

[Licensed under GPL-3.0](https://github.com/smurphos/cinnamox-gtk-theme/blob/master/LICENSE)

## Installation

Install via Cinnamon's Themes module in Cinnamon settings or download from [Cinnamon Spices](https://cinnamon-spices.linuxmint.com/themes) and unzip into your `~/.themes` directory.
Expand Down Expand Up @@ -62,25 +64,27 @@ To run the script open a terminal window (Ctrl-Alt-T) and use the following comm

This theme is compatible with Cinnamon versions `3.2.x`, `3.4.x`, `3.6.x` & `3.8.x`

The GTK3 themes require GTK `3.18.x`, `3.20.x` or `3.22.x`
The GTK3 themes require GTK `3.18.x` or `3.22.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` 64bit with Cinnamon `3.4.x`, `3.6.x`, Manjaro `17.0.6` 64Bit with Cinnamon `3.6.x` and Ubuntu `17.10` with Cinnamon nightly builds.
Tested on Linux Mint `18.2`, `18.3` & `19` 64bit with Cinnamon `3.4.x`, `3.6.x` & `3.8.x`; Also tested ion Manjaro `17.0.6` 64Bit with Cinnamon `3.6.x` & `3.8.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 userContent.css file to your Firefox default profile including the line `input, textarea { color: #222; background: #eee; }`
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.

This forces firefox to use the GTK default Adwaita theme for rendering all website content.

The theme includes a helper script that creates the userContent.css 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.
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/cinnamon/cinnamox_firefox_fix.sh`

## Make your own theme using Cinnamox / Oomox

The repository at [Cinnamox_theme_master](https://github.com/smurphos/cinnamox_theme_master) includes instructions to utilise the tools provided to make your own unique Cinnamox based theme.

The [Oomox app](https://github.com/actionless/oomox) is a GUI app to design and build themes using the [Oomox-gtk-theme](https://github.com/actionless/oomox-gtk-theme). From [version 1.60+](https://github.com/actionless/oomox/releases/) this app included a Cinnamon theme based on Cinnamox and has an option to export a Cinnamon theme.
The [Oomox app](https://github.com/themix-project/oomox) is a GUI app to design and build themes using the [Oomox-gtk-theme](https://github.com/themix-project/oomox-gtk-theme). From [version 1.60+](https://github.com/themix-project/oomox/releases) this app included a Cinnamon theme based on Cinnamox and has an option to export a Cinnamon theme.

## Changelog & Previous Releases

Expand Down
14 changes: 4 additions & 10 deletions Cinnamox-Aubergine/cinnamon/cinnamon.css
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,8 @@

.menu-applications-inner-box StScrollView, .starkmenu-favorites-box .menu-context-menu, .menu-context-menu {
padding: 8px;
margin: 8px 0;
border-radius: 10px;
border: 1px solid rgba(242, 217, 240, 0.22); }
.menu-applications-inner-box StScrollView StIcon:ltr, .menu-context-menu StIcon:ltr {
padding-right: 4px; }
.menu-applications-inner-box StScrollView StIcon:rtl, .menu-context-menu StIcon:rtl {
padding-left: 4px; }

.panel-top .window-list-item-box:active, .panel-top .window-list-item-box:checked, .panel-top .window-list-item-box:focus {
color: #000000; }
Expand Down Expand Up @@ -325,14 +320,14 @@ StScrollView StScrollBar {
.popup-sub-menu {
border: 1px solid rgba(242, 217, 240, 0.22);
border-radius: 10px;
padding: 8px;
margin: 8px 0; }
padding: 8px; }

.popup-menu-content {
padding: 0; }

.popup-menu-item {
color: #f2d9f0; }
color: #f2d9f0;
spacing: .5em; }
.popup-menu-item:active {
background-color: #E95420;
border-radius: 10px;
Expand All @@ -355,8 +350,7 @@ StScrollView StScrollBar {
font-size: 1em; }

.popup-menu-icon {
icon-size: 1.14em;
padding: 0px 4px; }
icon-size: 1.14em; }

.popup-alternating-menu-item:alternate {
font-weight: bold; }
Expand Down
48 changes: 22 additions & 26 deletions Cinnamox-Aubergine/cinnamox_firefox_fix.sh
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
#!/bin/bash
#Description: Helper file to write userContent.css to /$HOME/.mozilla/firefox/usersprofile.default folder in order to fix issues with text visibility in input fields with some themes
cd ~/.mozilla/firefox/
if [[ $(grep '\[Profile[^0]\]' profiles.ini) ]]; then
PROFPATH=$(grep -E '^\[Profile|^Path|^Default' profiles.ini | grep -1 '^Default=1' | grep '^Path' | cut -c6-);
#Description: Helper file to write user.js to /$HOME/.mozilla/firefox/usersprofile.default folder in order to fix issues with text visibility in input fields with some themes
if find "$HOME"/.mozilla/firefox/ -maxdepth 1 -type d -name '*.default' | head -1; then
TARGETPATH=$(find "$HOME"/.mozilla/firefox/ -maxdepth 1 -type d -name '*.default' | head -1)
TARGETFILE="$TARGETPATH/user.js"
TARGETSTRING="user_pref(\"widget.content.gtk-theme-override\", \"Adwaita\");"
if [ ! -f "$TARGETFILE" ]; then
touch "$TARGETFILE"
echo "creating file $TARGETFILE"
echo ""
fi
if ! grep -q "widget.content.gtk-theme-override" "$TARGETFILE"; then
echo "$TARGETSTRING" >> "$TARGETFILE"
echo "writing string '$TARGETSTRING' to $TARGETFILE"
echo ""
echo "please restart Firefox for fix to take effect"
else
echo "$TARGETFILE already contains a widget.content.gtk-theme-override"
fi
else
PROFPATH=$(grep 'Path=' profiles.ini | sed 's/^Path=//');
echo "could not locate your .default firefox profile"
fi
TARGETPATH="$HOME/.mozilla/firefox/$PROFPATH/chrome";
TARGETFILE="$HOME/.mozilla/firefox/$PROFPATH/chrome/userContent.css";
TARGETSTRING="input, textarea { color: #222; background: #eee; }";
if [ ! -d "$TARGETPATH" ]; then
mkdir "$TARGETPATH";
echo "creating folder $TARGETPATH";
echo "";
fi
if [ ! -f "$TARGETFILE" ]; then
touch "$TARGETFILE";
echo "creating file $TARGETFILE";
echo "";
fi
echo "$TARGETSTRING" >> "$TARGETFILE";
echo "writing string '$TARGETSTRING' to $TARGETFILE";
echo "";
echo "please restart Firefox for fix to take effect";
echo "";
read -p "Press enter to exit the script.";
cd;
exit;
echo ""
read -rp "Press enter to exit the script."
exit
Loading

0 comments on commit 903344e

Please sign in to comment.