Fixed ubuntu gdm theme issues
This commit is contained in:
parent
1e26b4cb39
commit
a9f967a561
38
install.sh
38
install.sh
@ -115,6 +115,7 @@ install() {
|
|||||||
mkdir -p ${THEME_DIR}/gnome-shell
|
mkdir -p ${THEME_DIR}/gnome-shell
|
||||||
cp -r ${SRC_DIR}/assets/gnome-shell/icons ${THEME_DIR}/gnome-shell
|
cp -r ${SRC_DIR}/assets/gnome-shell/icons ${THEME_DIR}/gnome-shell
|
||||||
cp -r ${SRC_DIR}/main/gnome-shell/pad-osd.css ${THEME_DIR}/gnome-shell
|
cp -r ${SRC_DIR}/main/gnome-shell/pad-osd.css ${THEME_DIR}/gnome-shell
|
||||||
|
cp -r ${SRC_DIR}/main/gnome-shell/gdm3${color}.css ${THEME_DIR}/gnome-shell/gdm3.css
|
||||||
cp -r ${SRC_DIR}/main/gnome-shell/gnome-shell${color}${opacity}${alt}.css ${THEME_DIR}/gnome-shell/gnome-shell.css
|
cp -r ${SRC_DIR}/main/gnome-shell/gnome-shell${color}${opacity}${alt}.css ${THEME_DIR}/gnome-shell/gnome-shell.css
|
||||||
cp -r ${SRC_DIR}/assets/gnome-shell/common-assets ${THEME_DIR}/gnome-shell/assets
|
cp -r ${SRC_DIR}/assets/gnome-shell/common-assets ${THEME_DIR}/gnome-shell/assets
|
||||||
cp -r ${SRC_DIR}/assets/gnome-shell/assets${color}/*.svg ${THEME_DIR}/gnome-shell/assets
|
cp -r ${SRC_DIR}/assets/gnome-shell/assets${color}/*.svg ${THEME_DIR}/gnome-shell/assets
|
||||||
@ -184,6 +185,9 @@ ETC_NEW_THEME_FILE="/etc/alternatives/gdm3-theme.gresource"
|
|||||||
UBUNTU_THEME_FILE="/usr/share/gnome-shell/theme/ubuntu.css"
|
UBUNTU_THEME_FILE="/usr/share/gnome-shell/theme/ubuntu.css"
|
||||||
UBUNTU_NEW_THEME_FILE="/usr/share/gnome-shell/theme/gnome-shell.css"
|
UBUNTU_NEW_THEME_FILE="/usr/share/gnome-shell/theme/gnome-shell.css"
|
||||||
UBUNTU_YARU_THEME_FILE="/usr/share/gnome-shell/theme/Yaru/gnome-shell-theme.gresource"
|
UBUNTU_YARU_THEME_FILE="/usr/share/gnome-shell/theme/Yaru/gnome-shell-theme.gresource"
|
||||||
|
UBUNTU_JSON_FILE="/usr/share/gnome-shell/modes/ubuntu.json"
|
||||||
|
YURA_JSON_FILE="/usr/share/gnome-shell/modes/yaru.json"
|
||||||
|
UBUNTU_MODES_FOLDER="/usr/share/gnome-shell/modes"
|
||||||
|
|
||||||
install_gdm() {
|
install_gdm() {
|
||||||
local GDM_THEME_DIR="${1}/${2}${3}"
|
local GDM_THEME_DIR="${1}/${2}${3}"
|
||||||
@ -223,16 +227,19 @@ install_gdm() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# > Ubuntu 20.04
|
# > Ubuntu 20.04
|
||||||
# if [[ -f "$UBUNTU_YARU_THEME_FILE" && -f "$GS_THEME_FILE.bak" ]]; then
|
if [[ -f "$UBUNTU_YARU_THEME_FILE" && -f "$GS_THEME_FILE.bak" ]]; then
|
||||||
# prompt -i "Installing Ubuntu GDM theme..."
|
prompt -i "Installing Ubuntu GDM theme..."
|
||||||
# cp -an "$UBUNTU_YARU_THEME_FILE" "$UBUNTU_YARU_THEME_FILE.bak"
|
cp -an "$UBUNTU_YARU_THEME_FILE" "$UBUNTU_YARU_THEME_FILE.bak"
|
||||||
# cp -af "$GS_THEME_FILE" "$UBUNTU_YARU_THEME_FILE"
|
cp -af "$GS_THEME_FILE" "$UBUNTU_YARU_THEME_FILE"
|
||||||
# # cp -an "$ETC_NEW_THEME_FILE" "$ETC_NEW_THEME_FILE.bak"
|
[[ -d "$UBUNTU_MODES_FOLDER" ]] && cp -an "$UBUNTU_MODES_FOLDER" "$UBUNTU_MODES_FOLDER"-bak
|
||||||
# # [[ -d "$SHELL_THEME_FOLDER/$THEME_NAME" ]] && rm -rf "$SHELL_THEME_FOLDER/$THEME_NAME" && mkdir -p "$SHELL_THEME_FOLDER/$THEME_NAME"
|
[[ -f "$UBUNTU_JSON_FILE" ]] && sed -i "s|Yaru/gnome-shell.css|gnome-shell.css|" "$UBUNTU_JSON_FILE"
|
||||||
# # cp -r "$GS_THEME_FILE" "$SHELL_THEME_FOLDER/$THEME_NAME"
|
[[ -f "$YURA_JSON_FILE" ]] && sed -i "s|Yaru/gnome-shell.css|gnome-shell.css|" "$YURA_JSON_FILE"
|
||||||
# # cd "$ETC_THEME_FOLDER"
|
# cp -an "$ETC_NEW_THEME_FILE" "$ETC_NEW_THEME_FILE.bak"
|
||||||
# # [[ -f "$ETC_NEW_THEME_FILE.bak" ]] && ln -sf "$SHELL_THEME_FOLDER/$THEME_NAME/gnome-shell-theme.gresource" gdm3-theme.gresource
|
# [[ -d "$SHELL_THEME_FOLDER/$THEME_NAME" ]] && rm -rf "$SHELL_THEME_FOLDER/$THEME_NAME" && mkdir -p "$SHELL_THEME_FOLDER/$THEME_NAME"
|
||||||
# fi
|
# cp -r "$GS_THEME_FILE" "$SHELL_THEME_FOLDER/$THEME_NAME"
|
||||||
|
# cd "$ETC_THEME_FOLDER"
|
||||||
|
# [[ -f "$ETC_NEW_THEME_FILE.bak" ]] && ln -sf "$SHELL_THEME_FOLDER/$THEME_NAME/gnome-shell-theme.gresource" gdm3-theme.gresource
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
remove_theme() {
|
remove_theme() {
|
||||||
@ -281,11 +288,12 @@ revert_gdm() {
|
|||||||
# mv "$ETC_NEW_THEME_FILE.bak" "$ETC_NEW_THEME_FILE"
|
# mv "$ETC_NEW_THEME_FILE.bak" "$ETC_NEW_THEME_FILE"
|
||||||
# [[ -d $SHELL_THEME_FOLDER/$THEME_NAME ]] && rm -rf $SHELL_THEME_FOLDER/$THEME_NAME
|
# [[ -d $SHELL_THEME_FOLDER/$THEME_NAME ]] && rm -rf $SHELL_THEME_FOLDER/$THEME_NAME
|
||||||
# fi
|
# fi
|
||||||
# if [[ -f "$UBUNTU_YARU_THEME_FILE.bak" ]]; then
|
if [[ -f "$UBUNTU_YARU_THEME_FILE.bak" ]]; then
|
||||||
# prompt -w "reverting Ubuntu GDM theme..."
|
prompt -w "reverting Ubuntu GDM theme..."
|
||||||
# rm -rf "$UBUNTU_YARU_THEME_FILE"
|
rm -rf "$UBUNTU_YARU_THEME_FILE"
|
||||||
# mv "$UBUNTU_YARU_THEME_FILE.bak" "$UBUNTU_YARU_THEME_FILE"
|
mv "$UBUNTU_YARU_THEME_FILE.bak" "$UBUNTU_YARU_THEME_FILE"
|
||||||
# fi
|
[[ -d "$UBUNTU_MODES_FOLDER"-bak ]] && rm -rf "$UBUNTU_MODES_FOLDER" && mv "$UBUNTU_MODES_FOLDER"-bak "$UBUNTU_MODES_FOLDER"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
install_dialog() {
|
install_dialog() {
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
#! /usr/bin/env bash
|
#! /usr/bin/env bash
|
||||||
|
|
||||||
|
# Check command availability
|
||||||
|
function has_command() {
|
||||||
|
command -v $1 > /dev/null
|
||||||
|
}
|
||||||
|
|
||||||
if [ ! "$(which sassc 2> /dev/null)" ]; then
|
if [ ! "$(which sassc 2> /dev/null)" ]; then
|
||||||
echo sassc needs to be installed to generate the css.
|
echo sassc needs to be installed to generate the css.
|
||||||
if has_command zypper; then
|
if has_command zypper; then
|
||||||
@ -48,6 +53,9 @@ for color in "${_COLOR_VARIANTS[@]}"; do
|
|||||||
echo "==> Generating the gnome-shell${color}${trans}${alt}.css..."
|
echo "==> Generating the gnome-shell${color}${trans}${alt}.css..."
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
|
sassc $SASSC_OPT src/main/gnome-shell/gdm3${color}.{scss,css}
|
||||||
|
echo "==> Generating the gdm3${color}.css..."
|
||||||
done
|
done
|
||||||
|
|
||||||
sassc $SASSC_OPT src/other/dash-to-dock/stylesheet.{scss,css}
|
sassc $SASSC_OPT src/other/dash-to-dock/stylesheet.{scss,css}
|
||||||
|
3887
src/main/gnome-shell/gdm3-dark.css
Normal file
3887
src/main/gnome-shell/gdm3-dark.css
Normal file
File diff suppressed because it is too large
Load Diff
9
src/main/gnome-shell/gdm3-dark.scss
Normal file
9
src/main/gnome-shell/gdm3-dark.scss
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
$variant: 'dark';
|
||||||
|
$laptop: 'true';
|
||||||
|
$trans: 'true';
|
||||||
|
$black: 'false';
|
||||||
|
|
||||||
|
@import '../../sass/colors';
|
||||||
|
@import '../../sass/variables';
|
||||||
|
@import '../../sass/gnome-shell/drawing';
|
||||||
|
@import '../../sass/gnome-shell/common';
|
3887
src/main/gnome-shell/gdm3-light.css
Normal file
3887
src/main/gnome-shell/gdm3-light.css
Normal file
File diff suppressed because it is too large
Load Diff
9
src/main/gnome-shell/gdm3-light.scss
Normal file
9
src/main/gnome-shell/gdm3-light.scss
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
$variant: 'light';
|
||||||
|
$laptop: 'true';
|
||||||
|
$trans: 'true';
|
||||||
|
$black: 'false';
|
||||||
|
|
||||||
|
@import '../../sass/colors';
|
||||||
|
@import '../../sass/variables';
|
||||||
|
@import '../../sass/gnome-shell/drawing';
|
||||||
|
@import '../../sass/gnome-shell/common';
|
Loading…
x
Reference in New Issue
Block a user