Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
vinceliuice committed Jul 6, 2021
1 parent e8d30e2 commit 4863550
Show file tree
Hide file tree
Showing 17 changed files with 40 additions and 42 deletions.
44 changes: 37 additions & 7 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -104,33 +104,55 @@ install() {
cp -ur ${SRC_DIR}/src/gnome-shell/assets${ELSE_DARK} ${THEME_DIR}/gnome-shell/assets
cp -ur ${SRC_DIR}/src/gnome-shell/common-assets/*.svg ${THEME_DIR}/gnome-shell/assets

if [[ "${theme}" != '' ]]; then
if [[ "${GS_VERSION:-}" == 'new' ]]; then
sassc $SASSC_OPT ${SRC_DIR}/src/gnome-shell/shell-40-0/gnome-shell${color}${size}.scss ${THEME_DIR}/gnome-shell/gnome-shell.css
else
sassc $SASSC_OPT ${SRC_DIR}/src/gnome-shell/shell-3-36/gnome-shell${color}${size}.scss ${THEME_DIR}/gnome-shell/gnome-shell.css
fi
else
if [[ "${GS_VERSION:-}" == 'new' ]]; then
cp -ur ${SRC_DIR}/src/gnome-shell/shell-40-0/gnome-shell${color}${size}.css ${THEME_DIR}/gnome-shell/gnome-shell.css
else
cp -ur ${SRC_DIR}/src/gnome-shell/shell-3-36/gnome-shell${color}${size}.css ${THEME_DIR}/gnome-shell/gnome-shell.css
fi
fi

mkdir -p ${THEME_DIR}/gtk-2.0
cp -ur ${SRC_DIR}/src/gtk-2.0/{apps.rc,hacks.rc,panel.rc} ${THEME_DIR}/gtk-2.0
cp -ur ${SRC_DIR}/src/gtk-2.0/main.rc${theme} ${THEME_DIR}/gtk-2.0/main.rc
cp -ur ${SRC_DIR}/src/gtk-2.0/assets${ELSE_DARK} ${THEME_DIR}/gtk-2.0/assets
[[ ${theme} != '' && ${color} == '-dark' ]] && \
cp -r ${SRC_DIR}/src/gtk-2.0/assets-theme-dark/*.png ${THEME_DIR}/gtk-2.0/assets
cp -ur ${SRC_DIR}/src/gtk-2.0/assets-theme-dark/*.png ${THEME_DIR}/gtk-2.0/assets
cp -ur ${SRC_DIR}/src/gtk-2.0/gtkrc${theme}${color} ${THEME_DIR}/gtk-2.0/gtkrc

mkdir -p ${THEME_DIR}/gtk-3.0
cp -ur ${SRC_DIR}/src/gtk/assets ${THEME_DIR}/gtk-3.0
cp -ur ${SRC_DIR}/src/gtk/common-assets ${THEME_DIR}/gtk-3.0
cp -ur ${SRC_DIR}/src/gtk/3.0/gtk${color}${size}.css ${THEME_DIR}/gtk-3.0/gtk.css
[[ ${color} != '-dark' ]] && \
cp -ur ${SRC_DIR}/src/gtk/3.0/gtk-dark${size}.css ${THEME_DIR}/gtk-3.0/gtk-dark.css

if [[ "${theme}" != '' ]]; then
sassc $SASSC_OPT ${SRC_DIR}/src/gtk/3.0/gtk${color}${size}.scss ${THEME_DIR}/gtk-3.0/gtk.css
[[ ${color} != '-dark' ]] && \
sassc $SASSC_OPT ${SRC_DIR}/src/gtk/3.0/gtk-dark${size}.scss ${THEME_DIR}/gtk-3.0/gtk-dark.css
else
cp -ur ${SRC_DIR}/src/gtk/3.0/gtk${color}${size}.css ${THEME_DIR}/gtk-3.0/gtk.css
[[ ${color} != '-dark' ]] && \
cp -ur ${SRC_DIR}/src/gtk/3.0/gtk-dark${size}.css ${THEME_DIR}/gtk-3.0/gtk-dark.css
fi

mkdir -p ${THEME_DIR}/gtk-4.0
cp -ur ${SRC_DIR}/src/gtk/assets ${THEME_DIR}/gtk-4.0
cp -ur ${SRC_DIR}/src/gtk/common-assets ${THEME_DIR}/gtk-4.0
cp -ur ${SRC_DIR}/src/gtk/4.0/gtk${color}${size}.css ${THEME_DIR}/gtk-4.0/gtk.css
[[ ${color} != '-dark' ]] && \
cp -ur ${SRC_DIR}/src/gtk/4.0/gtk-dark${size}.css ${THEME_DIR}/gtk-4.0/gtk-dark.css

if [[ "${theme}" != '' ]]; then
sassc $SASSC_OPT ${SRC_DIR}/src/gtk/4.0/gtk${color}${size}.scss ${THEME_DIR}/gtk-4.0/gtk.css
[[ ${color} != '-dark' ]] && \
sassc $SASSC_OPT ${SRC_DIR}/src/gtk/4.0/gtk-dark${size}.scss ${THEME_DIR}/gtk-4.0/gtk-dark.css
else
cp -ur ${SRC_DIR}/src/gtk/4.0/gtk${color}${size}.css ${THEME_DIR}/gtk-4.0/gtk.css
[[ ${color} != '-dark' ]] && \
cp -ur ${SRC_DIR}/src/gtk/4.0/gtk-dark${size}.css ${THEME_DIR}/gtk-4.0/gtk-dark.css
fi

mkdir -p ${THEME_DIR}/metacity-1
cp -ur ${SRC_DIR}/src/metacity-1/assets/*.png ${THEME_DIR}/metacity-1
Expand All @@ -147,6 +169,7 @@ install() {
cp -ur ${SRC_DIR}/src/xfwm4/{*.svg,themerc} ${THEME_DIR}/xfwm4
cp -ur ${SRC_DIR}/src/xfwm4/assets${ELSE_LIGHT} ${THEME_DIR}/xfwm4/assets

if [[ "${theme}" == '' ]]; then
mkdir -p ${THEME_DIR}/cinnamon
cp -ur ${SRC_DIR}/src/cinnamon/cinnamon${ELSE_DARK}.css ${THEME_DIR}/cinnamon/cinnamon.css
cp -ur ${SRC_DIR}/src/cinnamon/assets/common-assets ${THEME_DIR}/cinnamon/assets
Expand All @@ -155,6 +178,7 @@ install() {
cp -ur ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/misc/*.svg ${THEME_DIR}/cinnamon/assets/misc
cp -ur ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/switch/*.svg ${THEME_DIR}/cinnamon/assets/switch
cp -ur ${SRC_DIR}/src/cinnamon/thumbnail${ELSE_DARK}.png ${THEME_DIR}/cinnamon/thumbnail.png
fi

mkdir -p ${THEME_DIR}/plank
cp -ur ${SRC_DIR}/src/plank/dock${ELSE_LIGHT}.theme ${THEME_DIR}/plank/dock.theme
Expand Down Expand Up @@ -374,6 +398,12 @@ while [[ $# -gt 0 ]]; do
esac
done

cp -rf ${SRC_DIR}/src/_sass/_tweaks.scss ${SRC_DIR}/src/_sass/_tweaks-temp.scss

if [[ "${theme}" != '' ]]; then
sed -i "/\$color:/s/default/${theme}/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss
fi

if [[ "${ordinary:-}" != 'true' ]]; then
install_theme
fi
Expand Down
1 change: 1 addition & 0 deletions src/_sass/_colors.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// When color definition differs for dark and light variant,
// it gets @if ed depending on $variant

@import 'tweaks-temp';
@import 'color-palette';

@function gtkalpha($c, $a) {
Expand Down
1 change: 1 addition & 0 deletions src/_sass/_tweaks-temp.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$color: 'blue';
1 change: 1 addition & 0 deletions src/_sass/_tweaks.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$color: 'default';
1 change: 0 additions & 1 deletion src/gtk/3.0/gtk-compact.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ $variant: 'light';
$titlebar: 'dark';
$compact: 'true';
$radius: 'circle';
$color: 'default';

@import '../../_sass/variables';
@import '../../_sass/colors';
Expand Down
1 change: 0 additions & 1 deletion src/gtk/3.0/gtk-dark-compact.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ $variant: 'dark';
$titlebar: 'dark';
$compact: 'true';
$radius: 'circle';
$color: 'default';

@import '../../_sass/variables';
@import '../../_sass/colors';
Expand Down
1 change: 0 additions & 1 deletion src/gtk/3.0/gtk-dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ $variant: 'dark';
$titlebar: 'dark';
$compact: 'false';
$radius: 'circle';
$color: 'default';

@import '../../_sass/variables';
@import '../../_sass/colors';
Expand Down
12 changes: 0 additions & 12 deletions src/gtk/3.0/gtk-indigo-light-compact.scss

This file was deleted.

1 change: 0 additions & 1 deletion src/gtk/3.0/gtk-light-compact.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ $variant: 'light';
$titlebar: 'light';
$compact: 'true';
$radius: 'circle';
$color: 'default';

@import '../../_sass/variables';
@import '../../_sass/colors';
Expand Down
1 change: 0 additions & 1 deletion src/gtk/3.0/gtk-light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ $variant: 'light';
$titlebar: 'light';
$compact: 'false';
$radius: 'circle';
$color: 'default';

@import '../../_sass/variables';
@import '../../_sass/colors';
Expand Down
1 change: 0 additions & 1 deletion src/gtk/4.0/gtk-compact.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ $variant: 'light';
$titlebar: 'dark';
$compact: 'true';
$radius: 'circle';
$color: 'default';

@import '../../_sass/variables';
@import '../../_sass/colors';
Expand Down
1 change: 0 additions & 1 deletion src/gtk/4.0/gtk-dark-compact.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ $variant: 'dark';
$titlebar: 'dark';
$compact: 'true';
$radius: 'circle';
$color: 'default';

@import '../../_sass/variables';
@import '../../_sass/colors';
Expand Down
1 change: 0 additions & 1 deletion src/gtk/4.0/gtk-dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ $variant: 'dark';
$titlebar: 'dark';
$compact: 'false';
$radius: 'circle';
$color: 'default';

@import '../../_sass/variables';
@import '../../_sass/colors';
Expand Down
12 changes: 0 additions & 12 deletions src/gtk/4.0/gtk-indigo-light-compact.scss

This file was deleted.

1 change: 0 additions & 1 deletion src/gtk/4.0/gtk-light-compact.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ $variant: 'light';
$titlebar: 'light';
$compact: 'true';
$radius: 'circle';
$color: 'default';

@import '../../_sass/variables';
@import '../../_sass/colors';
Expand Down
1 change: 0 additions & 1 deletion src/gtk/4.0/gtk-light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ $variant: 'light';
$titlebar: 'light';
$compact: 'false';
$radius: 'circle';
$color: 'default';

@import '../../_sass/variables';
@import '../../_sass/colors';
Expand Down
1 change: 0 additions & 1 deletion src/gtk/4.0/gtk.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ $variant: 'light';
$titlebar: 'dark';
$compact: 'false';
$radius: 'circle';
$color: 'default';

@import '../../_sass/variables';
@import '../../_sass/colors';
Expand Down

0 comments on commit 4863550

Please sign in to comment.