Skip to content

Commit

Permalink
Fixed #205
Browse files Browse the repository at this point in the history
  • Loading branch information
@vinceliuice
vinceliuice committed Jun 7, 2022
1 parent 689b6fb commit 94b555a
Show file tree
Hide file tree
Showing 49 changed files with 33,058 additions and 1,290 deletions.
46 changes: 24 additions & 22 deletions install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,7 @@ install() {
cp -r pad-osd.css "${themedir}/gnome-shell"
cp -r icons "${themedir}/gnome-shell"
cp -r common-assets "${themedir}/gnome-shell/assets"

if [[ "${GS_VERSION:-}" == 'new' ]]; then
cp -r "40.0/gnome-shell${ELSE_DARK}${theme}.css" "${themedir}/gnome-shell/gnome-shell.css"
else
cp -r "3.28/gnome-shell${ELSE_DARK}${theme}.css" "${themedir}/gnome-shell/gnome-shell.css"
fi
cp -r "${GS_VERSION}/gnome-shell${ELSE_DARK}${theme}.css" "${themedir}/gnome-shell/gnome-shell.css"

cd "${SRC_DIR}/gnome-shell/assets"
cp -r "calendar-arrow-left${ELSE_DARK}.svg" "${themedir}/gnome-shell/assets/calendar-arrow-left.svg"
Expand Down Expand Up @@ -196,8 +191,8 @@ install_gdm() {
local GDM_THEME_DIR="${1}/${2}${3}${4}"
local YARU_GDM_THEME_DIR="$SHELL_THEME_FOLDER/Yaru/${2}${3}${4}"

[[ ${color} == '-dark' ]] && local ELSE_DARK=${color}"
[[ ${color} == '-light' ]] && local ELSE_LIGHT=${color}"
[[ "${color}" == '-dark' ]] && local ELSE_DARK="${color}"
[[ "${color}" == '-light' ]] && local ELSE_LIGHT="${color}"

echo
echo "Installing ${2}${3}${4} gdm theme..."
Expand Down Expand Up @@ -245,12 +240,12 @@ install_gdm() {
rm -rf "$UBUNTU_YARU_THEME_FILE"
rm -rf "$YARU_GDM_THEME_DIR" && mkdir -p "$YARU_GDM_THEME_DIR"

mkdir -p "$YARU_GDM_THEME_DIR"/gnome-shell
mkdir -p "$YARU_GDM_THEME_DIR"/gnome-shell/Yaru
cp -r "$SRC_DIR"/gnome-shell/{icons,pad-osd.css} "$YARU_GDM_THEME_DIR"/gnome-shell
mkdir -p "$YARU_GDM_THEME_DIR"/gnome-shell
mkdir -p "$YARU_GDM_THEME_DIR"/gnome-shell/Yaru
cp -r "$SRC_DIR"/gnome-shell/{icons,pad-osd.css} "$YARU_GDM_THEME_DIR"/gnome-shell
cp -r "$SRC_DIR"/gnome-shell/gnome-shell"${ELSE_DARK}${theme}".css "$YARU_GDM_THEME_DIR"/gnome-shell/gdm3.css
cp -r "$SRC_DIR"/gnome-shell/gnome-shell"${ELSE_DARK}${theme}".css "$YARU_GDM_THEME_DIR"/gnome-shell/Yaru/gnome-shell.css
cp -r "$SRC_DIR"/gnome-shell/common-assets "$YARU_GDM_THEME_DIR"/gnome-shell/assets
cp -r "$SRC_DIR"/gnome-shell/common-assets "$YARU_GDM_THEME_DIR"/gnome-shell/assets
cp -r "$SRC_DIR"/gnome-shell/assets/calendar-arrow-left"${ELSE_DARK}".svg "$YARU_GDM_THEME_DIR"/gnome-shell/assets/calendar-arrow-left.svg
cp -r "$SRC_DIR"/gnome-shell/assets/calendar-arrow-right"${ELSE_DARK}".svg "$YARU_GDM_THEME_DIR"/gnome-shell/assets/calendar-arrow-right.svg
cp -r "$SRC_DIR"/gnome-shell/assets/checkbox-off"${ELSE_DARK}".svg "$YARU_GDM_THEME_DIR"/gnome-shell/assets/checkbox-off.svg
Expand Down Expand Up @@ -343,12 +338,16 @@ while [[ $# -gt 0 ]]; do
;;
-s|--gnome-shell)
case "${2}" in
new)
GS_VERSION=new
38)
GS_VERSION=3.28
shift 2
;;
old)
GS_VERSION=old
40)
GS_VERSION=40.0
shift 2
;;
42)
GS_VERSION=42.0
shift 2
;;
-*|--*)
Expand Down Expand Up @@ -434,15 +433,18 @@ done

if [ -z "$GS_VERSION" ]; then
if [[ "$(command -v gnome-shell)" ]]; then
gnome-shell --version
SHELL_VERSION="$(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f -1)"
if [[ "${SHELL_VERSION:-}" -ge "40" ]]; then
GS_VERSION="new"
if [[ "${SHELL_VERSION:-}" -ge "42" ]]; then
GS_VERSION="42.0"
elif [[ "${SHELL_VERSION:-}" -ge "40" ]]; then
GS_VERSION="40.0"
else
GS_VERSION="old"
GS_VERSION="3.28"
fi
else
echo "'gnome-shell' not found, using styles for last gnome-shell version available."
GS_VERSION="new"
else
echo "'gnome-shell' not found, using styles for last gnome-shell version available."
GS_VERSION="42.0"
fi
fi

Expand Down
2 changes: 2 additions & 0 deletions parse-sass.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ for color in "${_ECOLOR_VARIANTS[@]}"; do
echo "==> Generating the 3.28 gnome-shell${color}${theme}.css..."
sassc $SASSC_OPT src/gnome-shell/40.0/gnome-shell${color}${theme}.{scss,css}
echo "==> Generating the 40.0 gnome-shell${color}${theme}.css..."
sassc $SASSC_OPT src/gnome-shell/42.0/gnome-shell${color}${theme}.{scss,css}
echo "==> Generating the 42.0 gnome-shell${color}${theme}.css..."
done
done

Expand Down
85 changes: 59 additions & 26 deletions src/gnome-shell/40.0/gnome-shell-aliz.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ stage {
}

.button:insensitive {
color: #969696;
color: #b2b2b2;
border-color: #e2e2e2;
background-color: #f9f9f9;
box-shadow: none;
Expand Down Expand Up @@ -125,7 +125,7 @@ stage {
}

.popup-menu .button:insensitive {
color: #969696;
color: #b2b2b2;
border-color: transparent;
background-color: rgba(54, 54, 54, 0.01);
box-shadow: none;
Expand Down Expand Up @@ -154,10 +154,11 @@ stage {
border-width: 1px;
border-left-width: 0;
border-bottom-width: 0;
margin: 0;
}

.modal-dialog .modal-dialog-linked-button:insensitive, .hotplug-notification-item:insensitive, .notification-banner .notification-button:insensitive {
color: #969696;
color: #b2b2b2;
border-color: #e2e2e2;
background-color: #f9f9f9;
box-shadow: none;
Expand Down Expand Up @@ -204,7 +205,7 @@ stage {
}

.popup-menu-content, .candidate-popup-content {
background-color: #ffffff;
background-color: #ffffff !important;
border-radius: 3px;
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.15);
border: solid #cfcfcf;
Expand Down Expand Up @@ -247,7 +248,7 @@ StEntry:focus {
}

StEntry:insensitive {
color: #969696;
color: #b2b2b2;
border-color: #f9f9f9;
box-shadow: none;
}
Expand Down Expand Up @@ -423,7 +424,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
}

.popup-menu .search-entry StLabel.hint-text {
color: #969696;
color: #b2b2b2;
}

.popup-menu-content, .candidate-popup-content {
Expand Down Expand Up @@ -812,7 +813,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
}

.calendar .calendar-nonwork-day {
color: #969696;
color: #b2b2b2;
}

.calendar .calendar-today {
Expand Down Expand Up @@ -1075,16 +1076,38 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
/* Message List */
.message-list {
width: 31.5em;
padding: 0 12px;
padding: 0;
border: none;
}

.message-list:ltr {
margin-left: 0;
margin-right: 0;
padding-right: 0;
border-right-width: 0;
}

.message-list:rtl {
margin-right: 0;
margin-left: 0;
padding-left: 0;
border-left-width: 0;
}

.message-list .message-list-placeholder {
spacing: 12px;
}

.message-list .message-list-placeholder > StIcon {
icon-size: 3.27em;
margin-bottom: 12px;
-st-icon-style: symbolic;
}

.message-list-sections {
spacing: 6px;
margin: 0 16px;
margin: 0 12px 0 16px;
padding-bottom: 6px;
}

.message-list-section,
Expand Down Expand Up @@ -1138,11 +1161,15 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
}

.message .message-icon-bin {
padding: 18px 0 18px 12px;
padding: 18px;
}

.message .message-icon-bin:ltr {
padding-right: 6px;
}

.message .message-icon-bin:rtl {
padding: 18px 12px 18px 0;
padding-left: 6px;
}

.message .message-icon-bin > StIcon {
Expand All @@ -1156,12 +1183,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
}

.message .message-content {
padding: 14px;
spacing: 4px;
padding: 9px;
margin-bottom: 8px;
}

.message .message-title {
font-weight: bold;
padding-top: 0.57em;
}

.message .message-secondary-bin {
Expand All @@ -1185,7 +1214,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

.message .message-close-button {
color: #555555;
border-radius: 100px;
border-radius: 1000px;
width: 24px;
height: 24px;
padding: 0;
Expand All @@ -1211,34 +1240,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

/* Media Controls */
.message-media-control {
padding: 12px 1.64em;
color: #101010;
padding: 0 18px;
margin: 20px 0;
border-radius: 1000px;
color: #555555;
border: none;
}

.message-media-control:hover {
background-color: #fafafa;
background-color: rgba(54, 54, 54, 0.1);
color: #363636;
}

.message-media-control:active {
background-color: #e8e8e8;
background-color: rgba(54, 54, 54, 0.2);
color: #363636;
}

.message-media-control:insensitive {
color: black;
color: #bdbdbd;
}

.message-media-control:last-child:ltr {
border-radius: 0 5px 5px 0;
margin-right: 12px;
}

.message-media-control:last-child:rtl {
border-radius: 5px 0 0 5px;
margin-left: 12px;
}

.media-message-cover-icon {
icon-size: 2.18em !important;
icon-size: 3.27em !important;
border-radius: 3px;
}

Expand All @@ -1248,6 +1280,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
border: 1px solid transparent;
border-radius: 3px;
icon-size: 2.18em !important;
padding: 12px;
}

.candidate-popup-content {
Expand Down Expand Up @@ -1669,7 +1702,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
}

.no-networks-label {
color: #969696;
color: #b2b2b2;
}

.no-networks-box {
Expand Down Expand Up @@ -2875,7 +2908,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

.login-dialog .modal-dialog-button:insensitive,
.unlock-dialog .modal-dialog-button:insensitive {
color: #969696;
color: #b2b2b2;
border-color: #e2e2e2;
background-color: #f9f9f9;
box-shadow: none;
Expand Down Expand Up @@ -2924,7 +2957,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

.login-dialog .modal-dialog-button:default:insensitive,
.unlock-dialog .modal-dialog-button:default:insensitive {
color: #969696;
color: #b2b2b2;
border-color: #e2e2e2;
background-color: #f9f9f9;
box-shadow: none;
Expand Down Expand Up @@ -3440,7 +3473,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
}

.openweather-provider:insensitive {
color: #969696;
color: #b2b2b2;
border-color: #e2e2e2;
background-color: #f9f9f9;
box-shadow: none;
Expand All @@ -3461,7 +3494,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

.openweather-current-databox-captions {
background: none;
color: #969696;
color: #b2b2b2;
}

.openweather-forecast-icon, .openweather-forecast-summary {
Expand Down
Loading

0 comments on commit 94b555a

Please sign in to comment.