Commit 89c9f3ea authored by vinceliuice's avatar vinceliuice 🎧

Fixed issues, add manjaro/ubuntu color versions

parent 67043f5a

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -13,6 +13,7 @@ fi
SRC_DIR=$(cd $(dirname $0) && pwd)
THEME_NAME=Qogir
THEME_VARIANTS=('' '-manjaro' '-ubuntu')
WIN_VARIANTS=('' '-win')
COLOR_VARIANTS=('' '-light' '-dark')
......@@ -30,13 +31,14 @@ usage() {
install() {
local dest=${1}
local name=${2}
local win=${3}
local color=${4}
local theme=${3}
local win=${4}
local color=${5}
[[ ${color} == '-dark' ]] && local ELSE_DARK=${color}
[[ ${color} == '-light' ]] && local ELSE_LIGHT=${color}
local THEME_DIR=${dest}/${name}${win}${color}
local THEME_DIR=${dest}/${name}${theme}${win}${color}
[[ -d ${THEME_DIR} ]] && rm -rf ${THEME_DIR}
......@@ -48,40 +50,41 @@ install() {
echo "[Desktop Entry]" >> ${THEME_DIR}/index.theme
echo "Type=X-GNOME-Metatheme" >> ${THEME_DIR}/index.theme
echo "Name=${name}${win}${color}" >> ${THEME_DIR}/index.theme
echo "Name=${name}${theme}${win}${color}" >> ${THEME_DIR}/index.theme
echo "Comment=An Clean Gtk+ theme based on Flat Design" >> ${THEME_DIR}/index.theme
echo "Encoding=UTF-8" >> ${THEME_DIR}/index.theme
echo "" >> ${THEME_DIR}/index.theme
echo "[X-GNOME-Metatheme]" >> ${THEME_DIR}/index.theme
echo "GtkTheme=${name}${win}${color}" >> ${THEME_DIR}/index.theme
echo "MetacityTheme=${name}${win}${color}" >> ${THEME_DIR}/index.theme
echo "IconTheme=Adwaita" >> ${THEME_DIR}/index.theme
echo "GtkTheme=${name}${theme}${win}${color}" >> ${THEME_DIR}/index.theme
echo "MetacityTheme=${name}${theme}${win}${color}" >> ${THEME_DIR}/index.theme
echo "IconTheme=${name}${theme}${ELSE_DARK}" >> ${THEME_DIR}/index.theme
echo "CursorTheme=Adwaita" >> ${THEME_DIR}/index.theme
echo "ButtonLayout=menu:minimize,maximize,close" >> ${THEME_DIR}/index.theme
mkdir -p ${THEME_DIR}/gtk-2.0
cp -ur ${SRC_DIR}/src/gtk-2.0/{apps.rc,panel.rc,main.rc,xfce-notify.rc} ${THEME_DIR}/gtk-2.0
cp -ur ${SRC_DIR}/src/gtk-2.0/assets${ELSE_DARK} ${THEME_DIR}/gtk-2.0/assets
cp -ur ${SRC_DIR}/src/gtk-2.0/gtkrc${color} ${THEME_DIR}/gtk-2.0/gtkrc
cp -ur ${SRC_DIR}/src/gtk-2.0/assets/assets${theme}${ELSE_DARK} ${THEME_DIR}/gtk-2.0/assets
cp -ur ${SRC_DIR}/src/gtk-2.0/theme${theme}/gtkrc${color} ${THEME_DIR}/gtk-2.0/gtkrc
cp -ur ${SRC_DIR}/src/gtk-2.0/menubar-toolbar${color}.rc ${THEME_DIR}/gtk-2.0/menubar-toolbar.rc
mkdir -p ${THEME_DIR}/gtk-3.0
cp -ur ${SRC_DIR}/src/gtk-3.0/assets ${THEME_DIR}/gtk-3.0
cp -ur ${SRC_DIR}/src/gtk-3.0/gtk${win}${color}.css ${THEME_DIR}/gtk-3.0/gtk.css
cp -ur ${SRC_DIR}/src/gtk-3.0/assets/assets${theme} ${THEME_DIR}/gtk-3.0/assets
cp -ur ${SRC_DIR}/src/gtk-3.0/assets/assets-common/*.png ${THEME_DIR}/gtk-3.0/assets
cp -ur ${SRC_DIR}/src/gtk-3.0/theme${theme}/gtk${win}${color}.css ${THEME_DIR}/gtk-3.0/gtk.css
[[ ${color} != '-dark' ]] && \
cp -ur ${SRC_DIR}/src/gtk-3.0/gtk${win}-dark.css ${THEME_DIR}/gtk-3.0/gtk-dark.css
cp -ur ${SRC_DIR}/src/gtk-3.0/thumbnail${ELSE_DARK}.png ${THEME_DIR}/gtk-3.0/thumbnail.png
cp -ur ${SRC_DIR}/src/gtk-3.0/theme${theme}/gtk${win}-dark.css ${THEME_DIR}/gtk-3.0/gtk-dark.css
cp -ur ${SRC_DIR}/src/gtk-3.0/assets/thumbnail${theme}${ELSE_DARK}.png ${THEME_DIR}/gtk-3.0/thumbnail.png
mkdir -p ${THEME_DIR}/gnome-shell
cp -ur ${SRC_DIR}/src/gnome-shell/common-assets ${THEME_DIR}/gnome-shell
cp -ur ${SRC_DIR}/src/gnome-shell/assets${ELSE_DARK} ${THEME_DIR}/gnome-shell/assets
cp -ur ${SRC_DIR}/src/gnome-shell/gnome-shell${color}.css ${THEME_DIR}/gnome-shell/gnome-shell.css
cp -ur ${SRC_DIR}/src/gnome-shell/assets${theme}/common-assets ${THEME_DIR}/gnome-shell
cp -ur ${SRC_DIR}/src/gnome-shell/assets${theme}/assets${ELSE_DARK} ${THEME_DIR}/gnome-shell/assets
cp -ur ${SRC_DIR}/src/gnome-shell/theme${theme}/gnome-shell${color}.css ${THEME_DIR}/gnome-shell/gnome-shell.css
mkdir -p ${THEME_DIR}/cinnamon
cp -ur ${SRC_DIR}/src/cinnamon/common-assets ${THEME_DIR}/cinnamon
cp -ur ${SRC_DIR}/src/cinnamon/assets${ELSE_DARK} ${THEME_DIR}/cinnamon/assets
cp -ur ${SRC_DIR}/src/cinnamon/cinnamon${ELSE_DARK}.css ${THEME_DIR}/cinnamon/cinnamon.css
cp -ur ${SRC_DIR}/src/cinnamon/thumbnail${ELSE_DARK}.png ${THEME_DIR}/cinnamon/thumbnail.png
cp -ur ${SRC_DIR}/src/cinnamon/assets${theme}/common-assets ${THEME_DIR}/cinnamon
cp -ur ${SRC_DIR}/src/cinnamon/assets${theme}/assets${ELSE_DARK} ${THEME_DIR}/cinnamon/assets
cp -ur ${SRC_DIR}/src/cinnamon/theme${theme}/cinnamon${ELSE_DARK}.css ${THEME_DIR}/cinnamon/cinnamon.css
cp -ur ${SRC_DIR}/src/cinnamon/thumbnail${theme}${ELSE_DARK}.png ${THEME_DIR}/cinnamon/thumbnail.png
mkdir -p ${THEME_DIR}/metacity-1
cp -ur ${SRC_DIR}/src/metacity-1/assets${ELSE_LIGHT}${win}/*.png ${THEME_DIR}/metacity-1
......@@ -175,9 +178,11 @@ parse_sass() {
}
install_theme() {
for win in "${wins[@]:-${WIN_VARIANTS[@]}}"; do
for color in "${colors[@]:-${COLOR_VARIANTS[@]}}"; do
install "${dest:-${DEST_DIR}}" "${name:-${THEME_NAME}}" "${win}" "${color}"
for theme in "${themes[@]:-${THEME_VARIANTS[@]}}"; do
for win in "${wins[@]:-${WIN_VARIANTS[@]}}"; do
for color in "${colors[@]:-${COLOR_VARIANTS[@]}}"; do
install "${dest:-${DEST_DIR}}" "${name:-${THEME_NAME}}" "${theme}" "${win}" "${color}"
done
done
done
}
......
......@@ -17,17 +17,26 @@ if [ ! -z "${WIN_VARIANTS:-}" ]; then
IFS=', ' read -r -a _WIN_VARIANTS <<< "${WIN_VARIANTS:-}"
fi
_THEME_VARIANTS=('' '-manjaro' '-ubuntu')
if [ ! -z "${THEME_VARIANTS:-}" ]; then
IFS=', ' read -r -a _THEME_VARIANTS <<< "${THEME_VARIANTS:-}"
fi
for theme in "${_THEME_VARIANTS[@]}"; do
for win in "${_WIN_VARIANTS[@]}"; do
for color in "${_COLOR_VARIANTS[@]}"; do
sassc $SASSC_OPT src/gtk-3.0/gtk${win}${color}.{scss,css}
echo "==> Generating the gtk${win}${color}.css..."
sassc $SASSC_OPT src/gtk-3.0/theme${theme}/gtk${win}${color}.{scss,css}
echo "==> Generating the gtk${theme}${win}${color}.css..."
done
done
done
for theme in "${_THEME_VARIANTS[@]}"; do
for color in "${_COLOR_VARIANTS[@]}"; do
sassc $SASSC_OPT src/gnome-shell/gnome-shell${color}.{scss,css}
echo "==> Generating the gnome-shell${color}.css..."
sassc $SASSC_OPT src/cinnamon/cinnamon${color}.{scss,css}
echo "==> Generating the cinnamon${color}.css..."
sassc $SASSC_OPT src/gnome-shell/theme${theme}/gnome-shell${color}.{scss,css}
echo "==> Generating the gnome-shell${theme}${color}.css..."
sassc $SASSC_OPT src/cinnamon/theme${theme}/cinnamon${color}.{scss,css}
echo "==> Generating the cinnamon${theme}${color}.css..."
done
done
......@@ -16,6 +16,9 @@ $sec_fg_color: rgba($fg_color, 0.6);
$selected_fg_color: #ffffff;
$selected_bg_color: #5294e2;
@if $theme == 'manjaro' { $selected_bg_color: #2eb398; }
@if $theme == 'ubuntu' { $selected_bg_color: #fb8441; }
$alt_selected_bg_color: lighten($selected_bg_color, 5%);
$sec_selected_bg_color: darken($selected_bg_color, 10%);
$alt_selected_fg_color: rgba($selected_fg_color, 0.75);
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="checkbox-checked-focused.svg"
inkscape:export-filename="/home/steffen/.local/share/themes/neu2/gtk-3.0/assets/dark/checkbox-unchecked.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4">
<linearGradient
id="selected_bg_color"
osb:paint="solid">
<stop
style="stop-color:#2eb398;stop-opacity:1;"
offset="0"
id="stop4159" />
</linearGradient>
<linearGradient
id="linearGradient3768-6">
<stop
style="stop-color:#0f0f0f;stop-opacity:1;"
offset="0"
id="stop3770-6" />
<stop
id="stop3778-2"
offset="0.078125"
style="stop-color:#171717;stop-opacity:1;" />
<stop
style="stop-color:#171717;stop-opacity:1;"
offset="0.97355771"
id="stop3774-0" />
<stop
style="stop-color:#1b1b1b;stop-opacity:1;"
offset="1"
id="stop3776-1" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#selected_bg_color"
id="linearGradient4161"
x1="25"
y1="31.362191"
x2="25"
y2="45.362191"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.313709"
inkscape:cx="-8.8873943"