diff --git a/install.sh b/install.sh index c3290de..b37d7f8 100755 --- a/install.sh +++ b/install.sh @@ -70,14 +70,12 @@ install() { echo "ButtonLayout=close,minimize,maximize:menu" >> ${THEME_DIR}/index.theme mkdir -p ${THEME_DIR}/gnome-shell + cp -ur ${SRC_DIR}/assets/gnome-shell/source-assets/* ${THEME_DIR}/gnome-shell cp -ur ${SRC_DIR}/main/gnome-shell/gnome-shell${color}${opacity}.css ${THEME_DIR}/gnome-shell/gnome-shell.css cp -ur ${SRC_DIR}/assets/gnome-shell/common-assets ${THEME_DIR}/gnome-shell/assets cp -ur ${SRC_DIR}/assets/gnome-shell/assets${color}/*.svg ${THEME_DIR}/gnome-shell/assets cp -ur ${SRC_DIR}/assets/gnome-shell/activities/activities${icon}.svg ${THEME_DIR}/gnome-shell/assets/activities.svg cd ${THEME_DIR}/gnome-shell - ln -s assets/no-events.svg no-events.svg - ln -s assets/process-working.svg process-working.svg - ln -s assets/no-notifications.svg no-notifications.svg mkdir -p ${THEME_DIR}/gtk-2.0 cp -ur ${SRC_DIR}/main/gtk-2.0/gtkrc${color} ${THEME_DIR}/gtk-2.0/gtkrc diff --git a/src/assets/gnome-shell/assets-dark/key-hide.svg b/src/assets/gnome-shell/assets-dark/key-hide.svg deleted file mode 100644 index a43b9d2..0000000 --- a/src/assets/gnome-shell/assets-dark/key-hide.svg +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - - - - diff --git a/src/assets/gnome-shell/assets-dark/key-layout.svg b/src/assets/gnome-shell/assets-dark/key-layout.svg deleted file mode 100644 index 3a6cce7..0000000 --- a/src/assets/gnome-shell/assets-dark/key-layout.svg +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - - - - diff --git a/src/assets/gnome-shell/assets-dark/key-shift.svg b/src/assets/gnome-shell/assets-dark/key-shift.svg deleted file mode 100644 index 5423b97..0000000 --- a/src/assets/gnome-shell/assets-dark/key-shift.svg +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - - - diff --git a/src/assets/gnome-shell/assets-dark/no-events.svg b/src/assets/gnome-shell/assets-dark/no-events.svg deleted file mode 100644 index c877cec..0000000 --- a/src/assets/gnome-shell/assets-dark/no-events.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/gnome-shell/assets-dark/no-notifications.svg b/src/assets/gnome-shell/assets-dark/no-notifications.svg deleted file mode 100644 index ae09f92..0000000 --- a/src/assets/gnome-shell/assets-dark/no-notifications.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/gnome-shell/assets-light/key-hide.svg b/src/assets/gnome-shell/assets-light/key-hide.svg deleted file mode 100644 index 94e8bac..0000000 --- a/src/assets/gnome-shell/assets-light/key-hide.svg +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - - - - diff --git a/src/assets/gnome-shell/assets-light/key-layout.svg b/src/assets/gnome-shell/assets-light/key-layout.svg deleted file mode 100644 index 8fade4e..0000000 --- a/src/assets/gnome-shell/assets-light/key-layout.svg +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - - - - diff --git a/src/assets/gnome-shell/assets-light/key-shift.svg b/src/assets/gnome-shell/assets-light/key-shift.svg deleted file mode 100644 index 03b1863..0000000 --- a/src/assets/gnome-shell/assets-light/key-shift.svg +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - - - diff --git a/src/assets/gnome-shell/assets-light/no-events.svg b/src/assets/gnome-shell/assets-light/no-events.svg deleted file mode 100644 index 67dc59f..0000000 --- a/src/assets/gnome-shell/assets-light/no-events.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/gnome-shell/assets-light/no-notifications.svg b/src/assets/gnome-shell/assets-light/no-notifications.svg deleted file mode 100644 index 8a936cf..0000000 --- a/src/assets/gnome-shell/assets-light/no-notifications.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/gnome-shell/common-assets/background.jpg b/src/assets/gnome-shell/common-assets/background.jpg index 822fd22..24bd1e8 100644 Binary files a/src/assets/gnome-shell/common-assets/background.jpg and b/src/assets/gnome-shell/common-assets/background.jpg differ diff --git a/src/assets/gnome-shell/common-assets/dash/bottom-running1-focused.svg b/src/assets/gnome-shell/common-assets/dash/bottom-running1-focused.svg deleted file mode 100644 index 946377b..0000000 --- a/src/assets/gnome-shell/common-assets/dash/bottom-running1-focused.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/bottom-running1.svg b/src/assets/gnome-shell/common-assets/dash/bottom-running1.svg deleted file mode 100644 index 9a9e8c0..0000000 --- a/src/assets/gnome-shell/common-assets/dash/bottom-running1.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/gnome-shell/common-assets/dash/bottom-running2-focused.svg b/src/assets/gnome-shell/common-assets/dash/bottom-running2-focused.svg deleted file mode 100644 index ca14764..0000000 --- a/src/assets/gnome-shell/common-assets/dash/bottom-running2-focused.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/bottom-running2.svg b/src/assets/gnome-shell/common-assets/dash/bottom-running2.svg deleted file mode 100644 index 54041ce..0000000 --- a/src/assets/gnome-shell/common-assets/dash/bottom-running2.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/bottom-running3-focused.svg b/src/assets/gnome-shell/common-assets/dash/bottom-running3-focused.svg deleted file mode 100644 index f1ad685..0000000 --- a/src/assets/gnome-shell/common-assets/dash/bottom-running3-focused.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/bottom-running3.svg b/src/assets/gnome-shell/common-assets/dash/bottom-running3.svg deleted file mode 100644 index c850e86..0000000 --- a/src/assets/gnome-shell/common-assets/dash/bottom-running3.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/bottom-running4-focused.svg b/src/assets/gnome-shell/common-assets/dash/bottom-running4-focused.svg deleted file mode 100644 index effe540..0000000 --- a/src/assets/gnome-shell/common-assets/dash/bottom-running4-focused.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/bottom-running4.svg b/src/assets/gnome-shell/common-assets/dash/bottom-running4.svg deleted file mode 100644 index 0eafc7d..0000000 --- a/src/assets/gnome-shell/common-assets/dash/bottom-running4.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/left-running1-focused.svg b/src/assets/gnome-shell/common-assets/dash/left-running1-focused.svg deleted file mode 100644 index 1522329..0000000 --- a/src/assets/gnome-shell/common-assets/dash/left-running1-focused.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/left-running1.svg b/src/assets/gnome-shell/common-assets/dash/left-running1.svg deleted file mode 100644 index 72bd0a1..0000000 --- a/src/assets/gnome-shell/common-assets/dash/left-running1.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/gnome-shell/common-assets/dash/left-running2-focused.svg b/src/assets/gnome-shell/common-assets/dash/left-running2-focused.svg deleted file mode 100644 index fe9417e..0000000 --- a/src/assets/gnome-shell/common-assets/dash/left-running2-focused.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/left-running2.svg b/src/assets/gnome-shell/common-assets/dash/left-running2.svg deleted file mode 100644 index ed9b1b4..0000000 --- a/src/assets/gnome-shell/common-assets/dash/left-running2.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/left-running3-focused.svg b/src/assets/gnome-shell/common-assets/dash/left-running3-focused.svg deleted file mode 100644 index 49938d1..0000000 --- a/src/assets/gnome-shell/common-assets/dash/left-running3-focused.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/left-running3.svg b/src/assets/gnome-shell/common-assets/dash/left-running3.svg deleted file mode 100644 index b008c03..0000000 --- a/src/assets/gnome-shell/common-assets/dash/left-running3.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/left-running4-focused.svg b/src/assets/gnome-shell/common-assets/dash/left-running4-focused.svg deleted file mode 100644 index 02cc53c..0000000 --- a/src/assets/gnome-shell/common-assets/dash/left-running4-focused.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/left-running4.svg b/src/assets/gnome-shell/common-assets/dash/left-running4.svg deleted file mode 100644 index 888ac85..0000000 --- a/src/assets/gnome-shell/common-assets/dash/left-running4.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/right-running1-focused.svg b/src/assets/gnome-shell/common-assets/dash/right-running1-focused.svg deleted file mode 100644 index 75f507b..0000000 --- a/src/assets/gnome-shell/common-assets/dash/right-running1-focused.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/right-running1.svg b/src/assets/gnome-shell/common-assets/dash/right-running1.svg deleted file mode 100644 index 1e13a2c..0000000 --- a/src/assets/gnome-shell/common-assets/dash/right-running1.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/gnome-shell/common-assets/dash/right-running2-focused.svg b/src/assets/gnome-shell/common-assets/dash/right-running2-focused.svg deleted file mode 100644 index a8f336b..0000000 --- a/src/assets/gnome-shell/common-assets/dash/right-running2-focused.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/right-running2.svg b/src/assets/gnome-shell/common-assets/dash/right-running2.svg deleted file mode 100644 index adc5030..0000000 --- a/src/assets/gnome-shell/common-assets/dash/right-running2.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/right-running3-focused.svg b/src/assets/gnome-shell/common-assets/dash/right-running3-focused.svg deleted file mode 100644 index faca48c..0000000 --- a/src/assets/gnome-shell/common-assets/dash/right-running3-focused.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/right-running3.svg b/src/assets/gnome-shell/common-assets/dash/right-running3.svg deleted file mode 100644 index 222536c..0000000 --- a/src/assets/gnome-shell/common-assets/dash/right-running3.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/right-running4-focused.svg b/src/assets/gnome-shell/common-assets/dash/right-running4-focused.svg deleted file mode 100644 index bf2aa78..0000000 --- a/src/assets/gnome-shell/common-assets/dash/right-running4-focused.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/right-running4.svg b/src/assets/gnome-shell/common-assets/dash/right-running4.svg deleted file mode 100644 index bfab8da..0000000 --- a/src/assets/gnome-shell/common-assets/dash/right-running4.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/top-running1-focused.svg b/src/assets/gnome-shell/common-assets/dash/top-running1-focused.svg deleted file mode 100644 index ad29a45..0000000 --- a/src/assets/gnome-shell/common-assets/dash/top-running1-focused.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/top-running1.svg b/src/assets/gnome-shell/common-assets/dash/top-running1.svg deleted file mode 100644 index 0012bb3..0000000 --- a/src/assets/gnome-shell/common-assets/dash/top-running1.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/gnome-shell/common-assets/dash/top-running2-focused.svg b/src/assets/gnome-shell/common-assets/dash/top-running2-focused.svg deleted file mode 100644 index 8c25295..0000000 --- a/src/assets/gnome-shell/common-assets/dash/top-running2-focused.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/top-running2.svg b/src/assets/gnome-shell/common-assets/dash/top-running2.svg deleted file mode 100644 index ecab821..0000000 --- a/src/assets/gnome-shell/common-assets/dash/top-running2.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/top-running3-focused.svg b/src/assets/gnome-shell/common-assets/dash/top-running3-focused.svg deleted file mode 100644 index bf2cfe4..0000000 --- a/src/assets/gnome-shell/common-assets/dash/top-running3-focused.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/top-running3.svg b/src/assets/gnome-shell/common-assets/dash/top-running3.svg deleted file mode 100644 index 878d4ed..0000000 --- a/src/assets/gnome-shell/common-assets/dash/top-running3.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/top-running4-focused.svg b/src/assets/gnome-shell/common-assets/dash/top-running4-focused.svg deleted file mode 100644 index d68932f..0000000 --- a/src/assets/gnome-shell/common-assets/dash/top-running4-focused.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/assets/gnome-shell/common-assets/dash/top-running4.svg b/src/assets/gnome-shell/common-assets/dash/top-running4.svg deleted file mode 100644 index 4bacdc0..0000000 --- a/src/assets/gnome-shell/common-assets/dash/top-running4.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/gnome-shell/common-assets/key-enter.svg b/src/assets/gnome-shell/common-assets/key-enter.svg deleted file mode 100644 index f6b9be3..0000000 --- a/src/assets/gnome-shell/common-assets/key-enter.svg +++ /dev/null @@ -1,6 +0,0 @@ - - Gnome Symbolic Icon Theme - - - - diff --git a/src/assets/gnome-shell/common-assets/key-shift-latched-uppercase.svg b/src/assets/gnome-shell/common-assets/key-shift-latched-uppercase.svg deleted file mode 100644 index bf493b7..0000000 --- a/src/assets/gnome-shell/common-assets/key-shift-latched-uppercase.svg +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - - - - diff --git a/src/assets/gnome-shell/common-assets/key-shift-uppercase.svg b/src/assets/gnome-shell/common-assets/key-shift-uppercase.svg deleted file mode 100644 index 683a03a..0000000 --- a/src/assets/gnome-shell/common-assets/key-shift-uppercase.svg +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - - - diff --git a/src/assets/gnome-shell/common-assets/process-working.svg b/src/assets/gnome-shell/common-assets/process-working.svg deleted file mode 100644 index 0f311b0..0000000 --- a/src/assets/gnome-shell/common-assets/process-working.svg +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/gnome-shell/source-assets/color-pick.svg b/src/assets/gnome-shell/source-assets/color-pick.svg new file mode 100644 index 0000000..d9af690 --- /dev/null +++ b/src/assets/gnome-shell/source-assets/color-pick.svg @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/assets/gnome-shell/source-assets/dash-placeholder.svg b/src/assets/gnome-shell/source-assets/dash-placeholder.svg new file mode 100644 index 0000000..cbae148 --- /dev/null +++ b/src/assets/gnome-shell/source-assets/dash-placeholder.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/gnome-shell/source-assets/eye-not-looking-symbolic.svg b/src/assets/gnome-shell/source-assets/eye-not-looking-symbolic.svg new file mode 100644 index 0000000..a168c87 --- /dev/null +++ b/src/assets/gnome-shell/source-assets/eye-not-looking-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/gnome-shell/source-assets/eye-open-negative-filled-symbolic.svg b/src/assets/gnome-shell/source-assets/eye-open-negative-filled-symbolic.svg new file mode 100644 index 0000000..1e5351c --- /dev/null +++ b/src/assets/gnome-shell/source-assets/eye-open-negative-filled-symbolic.svg @@ -0,0 +1,27 @@ + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + diff --git a/src/assets/gnome-shell/source-assets/keyboard-caps-lock-filled-symbolic.svg b/src/assets/gnome-shell/source-assets/keyboard-caps-lock-filled-symbolic.svg new file mode 100644 index 0000000..45985b7 --- /dev/null +++ b/src/assets/gnome-shell/source-assets/keyboard-caps-lock-filled-symbolic.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/gnome-shell/source-assets/keyboard-enter-symbolic.svg b/src/assets/gnome-shell/source-assets/keyboard-enter-symbolic.svg new file mode 100644 index 0000000..de68b71 --- /dev/null +++ b/src/assets/gnome-shell/source-assets/keyboard-enter-symbolic.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/gnome-shell/source-assets/keyboard-hide-symbolic.svg b/src/assets/gnome-shell/source-assets/keyboard-hide-symbolic.svg new file mode 100644 index 0000000..4212707 --- /dev/null +++ b/src/assets/gnome-shell/source-assets/keyboard-hide-symbolic.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/gnome-shell/source-assets/keyboard-layout-filled-symbolic.svg b/src/assets/gnome-shell/source-assets/keyboard-layout-filled-symbolic.svg new file mode 100644 index 0000000..7c9b955 --- /dev/null +++ b/src/assets/gnome-shell/source-assets/keyboard-layout-filled-symbolic.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/gnome-shell/source-assets/keyboard-shift-filled-symbolic.svg b/src/assets/gnome-shell/source-assets/keyboard-shift-filled-symbolic.svg new file mode 100644 index 0000000..04069e8 --- /dev/null +++ b/src/assets/gnome-shell/source-assets/keyboard-shift-filled-symbolic.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/gnome-shell/source-assets/message-indicator-symbolic.svg b/src/assets/gnome-shell/source-assets/message-indicator-symbolic.svg new file mode 100644 index 0000000..257a984 --- /dev/null +++ b/src/assets/gnome-shell/source-assets/message-indicator-symbolic.svg @@ -0,0 +1,40 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/assets/gnome-shell/source-assets/no-events.svg b/src/assets/gnome-shell/source-assets/no-events.svg new file mode 100644 index 0000000..8ab08a9 --- /dev/null +++ b/src/assets/gnome-shell/source-assets/no-events.svg @@ -0,0 +1,119 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/gnome-shell/source-assets/no-notifications.svg b/src/assets/gnome-shell/source-assets/no-notifications.svg new file mode 100644 index 0000000..862e2d1 --- /dev/null +++ b/src/assets/gnome-shell/source-assets/no-notifications.svg @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/gnome-shell/source-assets/pointer-double-click-symbolic.svg b/src/assets/gnome-shell/source-assets/pointer-double-click-symbolic.svg new file mode 100644 index 0000000..5267834 --- /dev/null +++ b/src/assets/gnome-shell/source-assets/pointer-double-click-symbolic.svg @@ -0,0 +1,28 @@ + + + + + + + + + diff --git a/src/assets/gnome-shell/source-assets/pointer-drag-symbolic.svg b/src/assets/gnome-shell/source-assets/pointer-drag-symbolic.svg new file mode 100644 index 0000000..be37e6f --- /dev/null +++ b/src/assets/gnome-shell/source-assets/pointer-drag-symbolic.svg @@ -0,0 +1,20 @@ + + + + + + diff --git a/src/assets/gnome-shell/source-assets/pointer-primary-click-symbolic.svg b/src/assets/gnome-shell/source-assets/pointer-primary-click-symbolic.svg new file mode 100644 index 0000000..f447991 --- /dev/null +++ b/src/assets/gnome-shell/source-assets/pointer-primary-click-symbolic.svg @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/src/assets/gnome-shell/source-assets/pointer-secondary-click-symbolic.svg b/src/assets/gnome-shell/source-assets/pointer-secondary-click-symbolic.svg new file mode 100644 index 0000000..b72e178 --- /dev/null +++ b/src/assets/gnome-shell/source-assets/pointer-secondary-click-symbolic.svg @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/src/assets/gnome-shell/source-assets/process-working.svg b/src/assets/gnome-shell/source-assets/process-working.svg new file mode 100644 index 0000000..920a67d --- /dev/null +++ b/src/assets/gnome-shell/source-assets/process-working.svg @@ -0,0 +1,3084 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css index 91b689a..73fb249 100644 --- a/src/main/gnome-shell/gnome-shell-dark-solid.css +++ b/src/main/gnome-shell/gnome-shell-dark-solid.css @@ -93,8 +93,8 @@ StEntry { selected-color: rgba(255, 255, 255, 0.85); font-size: 11.25pt; font-weight: 400; - background-color: #212121; - border-radius: 6px; + background-color: rgba(255, 255, 255, 0.1); + border-radius: 10px; box-shadow: inset 0 0 0 2px transparent; } @@ -2808,8 +2808,19 @@ StWidget.focused .app-well-app-running-dot { #keyboard { background-color: rgba(0, 0, 0, 0.25); + box-shadow: none; } +#keyboard .page-indicator { + padding: 6px; +} + +#keyboard .page-indicator .page-indicator-icon { + width: 8px; + height: 8px; +} + +.key-container, .keyboard-layout { padding: 4px; spacing: 4px; @@ -2828,12 +2839,12 @@ StWidget.focused .app-well-app-running-dot { } .keyboard-key:focus, .keyboard-key:hover { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #0860f2; } .keyboard-key:checked, .keyboard-key:active { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #0754d4; } @@ -2843,58 +2854,38 @@ StWidget.focused .app-well-app-running-dot { border-color: rgba(0, 0, 0, 0.3); } -.keyboard-key.default-key { - background-size: 20px; -} - .keyboard-key.default-key, .keyboard-key.enter-key, .keyboard-key.shift-key-lowercase, .keyboard-key.shift-key-uppercase, .keyboard-key.hide-key, .keyboard-key.layout-key { background-color: #242424; box-shadow: 0 1px rgba(0, 0, 0, 0.2); } .keyboard-key.default-key:focus, .keyboard-key.default-key:hover, .keyboard-key.enter-key:focus, .keyboard-key.enter-key:hover, .keyboard-key.shift-key-lowercase:focus, .keyboard-key.shift-key-lowercase:hover, .keyboard-key.shift-key-uppercase:focus, .keyboard-key.shift-key-uppercase:hover, .keyboard-key.hide-key:focus, .keyboard-key.hide-key:hover, .keyboard-key.layout-key:focus, .keyboard-key.layout-key:hover { - color: white; + color: #dedede; background-color: #555555; } .keyboard-key.default-key:checked, .keyboard-key.default-key:active, .keyboard-key.enter-key:checked, .keyboard-key.enter-key:active, .keyboard-key.shift-key-lowercase:checked, .keyboard-key.shift-key-lowercase:active, .keyboard-key.shift-key-uppercase:checked, .keyboard-key.shift-key-uppercase:active, .keyboard-key.hide-key:checked, .keyboard-key.hide-key:active, .keyboard-key.layout-key:checked, .keyboard-key.layout-key:active { - color: white; + color: #dedede; background-color: #464646; } .keyboard-key.enter-key { + color: white; background-color: #0860f2; - background-image: url("assets/key-enter.svg"); } .keyboard-key.enter-key:focus, .keyboard-key.enter-key:hover { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #1c6ff7; } .keyboard-key.enter-key:checked, .keyboard-key.enter-key:active { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #064cc1; } -.keyboard-key.shift-key-lowercase { - background-image: url("assets/key-shift.svg"); -} - -.keyboard-key.shift-key-uppercase { - background-image: url("assets/key-shift-uppercase.svg"); -} - -.keyboard-key.shift-key-uppercase:latched { - background-image: url("assets/key-shift-latched-uppercase.svg"); -} - -.keyboard-key.hide-key { - background-image: url("assets/key-hide.svg"); -} - -.keyboard-key.layout-key { - background-image: url("assets/key-layout.svg"); +.keyboard-key StIcon { + icon-size: 1.125em; } .keyboard-subkeys { @@ -2981,7 +2972,7 @@ StWidget.focused .app-well-app-running-dot { background-size: contain; border: none; color: rgba(255, 255, 255, 0.85); - border-radius: 6px; + border-radius: 9999px; } .framed-user-icon:hover { @@ -3003,11 +2994,12 @@ StWidget.focused .app-well-app-running-dot { selection-background-color: rgba(255, 255, 255, 0.1); selected-background-color: rgba(255, 255, 255, 0.1); selected-color: #0860f2; - padding: 3px 8px; + padding: 4px 8px; min-height: 20px; - background-color: #212121; - border-radius: 6px; + background-color: rgba(0, 0, 0, 0.1); + border-radius: 10px; box-shadow: inset 0 0 0 2px transparent; + border-radius: 9999px; } .login-dialog StEntry:focus { @@ -3024,7 +3016,7 @@ StWidget.focused .app-well-app-running-dot { .login-dialog .modal-dialog-button { padding: 0 16px; - color: #afafaf; + color: white; background-color: transparent; border-color: transparent; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05); @@ -3033,8 +3025,8 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:hover, .login-dialog .modal-dialog-button:focus { - color: #dedede; - background-color: rgba(255, 255, 255, 0.06); + color: white; + background-color: rgba(255, 255, 255, 0.15); border-color: transparent; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05); text-shadow: none; @@ -3042,8 +3034,8 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:active { - color: #dedede; - background-color: rgba(255, 255, 255, 0.1); + color: white; + background-color: rgba(255, 255, 255, 0.3); border-color: transparent; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05); text-shadow: none; @@ -3051,7 +3043,7 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:insensitive { - color: rgba(222, 222, 222, 0.35); + color: rgba(255, 255, 255, 0.35); background-color: transparent; border-color: transparent; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05); @@ -3060,7 +3052,7 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:default { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #3484e2; border: 1px solid rgba(0, 0, 0, 0.15); text-shadow: none; @@ -3068,7 +3060,7 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus { - color: rgba(255, 255, 255, 0.85); + color: white; border-color: rgba(0, 0, 0, 0.15); background-color: #418ce4; text-shadow: none; @@ -3224,6 +3216,21 @@ StWidget.focused .app-well-app-running-dot { background-color: rgba(255, 255, 255, 0.85); } +.user-icon { + background-size: contain; + color: rgba(255, 255, 255, 0.85); + border-radius: 9999px; +} + +.user-icon:hover { + color: white; +} + +.user-icon StIcon { + background-color: rgba(255, 255, 255, 0.05); + border-radius: 9999px; +} + .user-widget-label { color: rgba(255, 255, 255, 0.85); } @@ -3343,7 +3350,7 @@ StWidget.focused .app-well-app-running-dot { } #lockDialogGroup { - background: #333333 url("assets/background.jpg"); + background: url("assets/background.jpg"); background-size: cover; } @@ -3354,6 +3361,7 @@ StWidget.focused .app-well-app-running-dot { border: none; border-radius: 6px; box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15); + color: #dedede; } #LookingGlassDialog > #Toolbar { @@ -3690,8 +3698,8 @@ StWidget.focused .app-well-app-running-dot { color: #dedede; selection-background-color: #0860f2; selected-color: white; - background-color: #212121; - border-radius: 6px; + background-color: rgba(255, 255, 255, 0.1); + border-radius: 10px; box-shadow: inset 0 0 0 2px transparent; } @@ -3707,68 +3715,3 @@ StWidget.focused .app-well-app-running-dot { .popup-menu .search-entry:hover .search-entry-icon, .popup-menu .search-entry:focus .search-entry-icon { color: #dedede; } - -/* shortcuts panel button window count indicators */ -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/right-running1.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/left-running1.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/top-running1.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/bottom-running1.svg"); -} - -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/right-running2.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/left-running2.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/top-running2.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/bottom-running2.svg"); -} - -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/right-running3.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/left-running3.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/top-running3.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/bottom-running3.svg"); -} - -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/right-running4.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/left-running4.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/top-running4.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/bottom-running4.svg"); -} diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css index 2a66537..90b96b5 100644 --- a/src/main/gnome-shell/gnome-shell-dark.css +++ b/src/main/gnome-shell/gnome-shell-dark.css @@ -93,8 +93,8 @@ StEntry { selected-color: rgba(255, 255, 255, 0.85); font-size: 11.25pt; font-weight: 400; - background-color: #212121; - border-radius: 6px; + background-color: rgba(255, 255, 255, 0.1); + border-radius: 10px; box-shadow: inset 0 0 0 2px transparent; } @@ -2808,8 +2808,19 @@ StWidget.focused .app-well-app-running-dot { #keyboard { background-color: rgba(0, 0, 0, 0.25); + box-shadow: none; } +#keyboard .page-indicator { + padding: 6px; +} + +#keyboard .page-indicator .page-indicator-icon { + width: 8px; + height: 8px; +} + +.key-container, .keyboard-layout { padding: 4px; spacing: 4px; @@ -2828,12 +2839,12 @@ StWidget.focused .app-well-app-running-dot { } .keyboard-key:focus, .keyboard-key:hover { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #0860f2; } .keyboard-key:checked, .keyboard-key:active { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #0754d4; } @@ -2843,58 +2854,38 @@ StWidget.focused .app-well-app-running-dot { border-color: rgba(0, 0, 0, 0.3); } -.keyboard-key.default-key { - background-size: 20px; -} - .keyboard-key.default-key, .keyboard-key.enter-key, .keyboard-key.shift-key-lowercase, .keyboard-key.shift-key-uppercase, .keyboard-key.hide-key, .keyboard-key.layout-key { background-color: #242424; box-shadow: 0 1px rgba(0, 0, 0, 0.2); } .keyboard-key.default-key:focus, .keyboard-key.default-key:hover, .keyboard-key.enter-key:focus, .keyboard-key.enter-key:hover, .keyboard-key.shift-key-lowercase:focus, .keyboard-key.shift-key-lowercase:hover, .keyboard-key.shift-key-uppercase:focus, .keyboard-key.shift-key-uppercase:hover, .keyboard-key.hide-key:focus, .keyboard-key.hide-key:hover, .keyboard-key.layout-key:focus, .keyboard-key.layout-key:hover { - color: white; + color: #dedede; background-color: #555555; } .keyboard-key.default-key:checked, .keyboard-key.default-key:active, .keyboard-key.enter-key:checked, .keyboard-key.enter-key:active, .keyboard-key.shift-key-lowercase:checked, .keyboard-key.shift-key-lowercase:active, .keyboard-key.shift-key-uppercase:checked, .keyboard-key.shift-key-uppercase:active, .keyboard-key.hide-key:checked, .keyboard-key.hide-key:active, .keyboard-key.layout-key:checked, .keyboard-key.layout-key:active { - color: white; + color: #dedede; background-color: #464646; } .keyboard-key.enter-key { + color: white; background-color: #0860f2; - background-image: url("assets/key-enter.svg"); } .keyboard-key.enter-key:focus, .keyboard-key.enter-key:hover { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #1c6ff7; } .keyboard-key.enter-key:checked, .keyboard-key.enter-key:active { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #064cc1; } -.keyboard-key.shift-key-lowercase { - background-image: url("assets/key-shift.svg"); -} - -.keyboard-key.shift-key-uppercase { - background-image: url("assets/key-shift-uppercase.svg"); -} - -.keyboard-key.shift-key-uppercase:latched { - background-image: url("assets/key-shift-latched-uppercase.svg"); -} - -.keyboard-key.hide-key { - background-image: url("assets/key-hide.svg"); -} - -.keyboard-key.layout-key { - background-image: url("assets/key-layout.svg"); +.keyboard-key StIcon { + icon-size: 1.125em; } .keyboard-subkeys { @@ -2981,7 +2972,7 @@ StWidget.focused .app-well-app-running-dot { background-size: contain; border: none; color: rgba(255, 255, 255, 0.85); - border-radius: 6px; + border-radius: 9999px; } .framed-user-icon:hover { @@ -3003,11 +2994,12 @@ StWidget.focused .app-well-app-running-dot { selection-background-color: rgba(255, 255, 255, 0.1); selected-background-color: rgba(255, 255, 255, 0.1); selected-color: #0860f2; - padding: 3px 8px; + padding: 4px 8px; min-height: 20px; - background-color: #212121; - border-radius: 6px; + background-color: rgba(0, 0, 0, 0.1); + border-radius: 10px; box-shadow: inset 0 0 0 2px transparent; + border-radius: 9999px; } .login-dialog StEntry:focus { @@ -3024,7 +3016,7 @@ StWidget.focused .app-well-app-running-dot { .login-dialog .modal-dialog-button { padding: 0 16px; - color: #afafaf; + color: white; background-color: transparent; border-color: transparent; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05); @@ -3033,8 +3025,8 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:hover, .login-dialog .modal-dialog-button:focus { - color: #dedede; - background-color: rgba(255, 255, 255, 0.06); + color: white; + background-color: rgba(255, 255, 255, 0.15); border-color: transparent; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05); text-shadow: none; @@ -3042,8 +3034,8 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:active { - color: #dedede; - background-color: rgba(255, 255, 255, 0.1); + color: white; + background-color: rgba(255, 255, 255, 0.3); border-color: transparent; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05); text-shadow: none; @@ -3051,7 +3043,7 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:insensitive { - color: rgba(222, 222, 222, 0.35); + color: rgba(255, 255, 255, 0.35); background-color: transparent; border-color: transparent; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05); @@ -3060,7 +3052,7 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:default { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #3484e2; border: 1px solid rgba(0, 0, 0, 0.15); text-shadow: none; @@ -3068,7 +3060,7 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus { - color: rgba(255, 255, 255, 0.85); + color: white; border-color: rgba(0, 0, 0, 0.15); background-color: #418ce4; text-shadow: none; @@ -3224,6 +3216,21 @@ StWidget.focused .app-well-app-running-dot { background-color: rgba(255, 255, 255, 0.85); } +.user-icon { + background-size: contain; + color: rgba(255, 255, 255, 0.85); + border-radius: 9999px; +} + +.user-icon:hover { + color: white; +} + +.user-icon StIcon { + background-color: rgba(255, 255, 255, 0.05); + border-radius: 9999px; +} + .user-widget-label { color: rgba(255, 255, 255, 0.85); } @@ -3343,7 +3350,7 @@ StWidget.focused .app-well-app-running-dot { } #lockDialogGroup { - background: #333333 url("assets/background.jpg"); + background: url("assets/background.jpg"); background-size: cover; } @@ -3354,6 +3361,7 @@ StWidget.focused .app-well-app-running-dot { border: none; border-radius: 6px; box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15); + color: #dedede; } #LookingGlassDialog > #Toolbar { @@ -3690,8 +3698,8 @@ StWidget.focused .app-well-app-running-dot { color: #dedede; selection-background-color: #0860f2; selected-color: white; - background-color: #212121; - border-radius: 6px; + background-color: rgba(255, 255, 255, 0.1); + border-radius: 10px; box-shadow: inset 0 0 0 2px transparent; } @@ -3707,68 +3715,3 @@ StWidget.focused .app-well-app-running-dot { .popup-menu .search-entry:hover .search-entry-icon, .popup-menu .search-entry:focus .search-entry-icon { color: #dedede; } - -/* shortcuts panel button window count indicators */ -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/right-running1.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/left-running1.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/top-running1.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/bottom-running1.svg"); -} - -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/right-running2.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/left-running2.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/top-running2.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/bottom-running2.svg"); -} - -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/right-running3.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/left-running3.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/top-running3.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/bottom-running3.svg"); -} - -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/right-running4.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/left-running4.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/top-running4.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/bottom-running4.svg"); -} diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css index 50bab69..cb676e9 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid.css +++ b/src/main/gnome-shell/gnome-shell-light-solid.css @@ -93,8 +93,8 @@ StEntry { selected-color: rgba(255, 255, 255, 0.85); font-size: 11.25pt; font-weight: 400; - background-color: #fafafa; - border-radius: 6px; + background-color: rgba(0, 0, 0, 0.1); + border-radius: 10px; box-shadow: inset 0 0 0 2px transparent; } @@ -2808,8 +2808,19 @@ StWidget.focused .app-well-app-running-dot { #keyboard { background-color: rgba(0, 0, 0, 0.25); + box-shadow: none; } +#keyboard .page-indicator { + padding: 6px; +} + +#keyboard .page-indicator .page-indicator-icon { + width: 8px; + height: 8px; +} + +.key-container, .keyboard-layout { padding: 4px; spacing: 4px; @@ -2828,12 +2839,12 @@ StWidget.focused .app-well-app-running-dot { } .keyboard-key:focus, .keyboard-key:hover { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #0860f2; } .keyboard-key:checked, .keyboard-key:active { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #0754d4; } @@ -2843,58 +2854,38 @@ StWidget.focused .app-well-app-running-dot { border-color: rgba(0, 0, 0, 0.3); } -.keyboard-key.default-key { - background-size: 20px; -} - .keyboard-key.default-key, .keyboard-key.enter-key, .keyboard-key.shift-key-lowercase, .keyboard-key.shift-key-uppercase, .keyboard-key.hide-key, .keyboard-key.layout-key { background-color: #E0E0E0; box-shadow: 0 1px rgba(0, 0, 0, 0.2); } .keyboard-key.default-key:focus, .keyboard-key.default-key:hover, .keyboard-key.enter-key:focus, .keyboard-key.enter-key:hover, .keyboard-key.shift-key-lowercase:focus, .keyboard-key.shift-key-lowercase:hover, .keyboard-key.shift-key-uppercase:focus, .keyboard-key.shift-key-uppercase:hover, .keyboard-key.hide-key:focus, .keyboard-key.hide-key:hover, .keyboard-key.layout-key:focus, .keyboard-key.layout-key:hover { - color: white; + color: #242424; background-color: #FAFAFA; } .keyboard-key.default-key:checked, .keyboard-key.default-key:active, .keyboard-key.enter-key:checked, .keyboard-key.enter-key:active, .keyboard-key.shift-key-lowercase:checked, .keyboard-key.shift-key-lowercase:active, .keyboard-key.shift-key-uppercase:checked, .keyboard-key.shift-key-uppercase:active, .keyboard-key.hide-key:checked, .keyboard-key.hide-key:active, .keyboard-key.layout-key:checked, .keyboard-key.layout-key:active { - color: white; + color: #242424; background-color: #ebebeb; } .keyboard-key.enter-key { + color: white; background-color: #0860f2; - background-image: url("assets/key-enter.svg"); } .keyboard-key.enter-key:focus, .keyboard-key.enter-key:hover { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #1c6ff7; } .keyboard-key.enter-key:checked, .keyboard-key.enter-key:active { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #064cc1; } -.keyboard-key.shift-key-lowercase { - background-image: url("assets/key-shift.svg"); -} - -.keyboard-key.shift-key-uppercase { - background-image: url("assets/key-shift-uppercase.svg"); -} - -.keyboard-key.shift-key-uppercase:latched { - background-image: url("assets/key-shift-latched-uppercase.svg"); -} - -.keyboard-key.hide-key { - background-image: url("assets/key-hide.svg"); -} - -.keyboard-key.layout-key { - background-image: url("assets/key-layout.svg"); +.keyboard-key StIcon { + icon-size: 1.125em; } .keyboard-subkeys { @@ -2981,7 +2972,7 @@ StWidget.focused .app-well-app-running-dot { background-size: contain; border: none; color: rgba(255, 255, 255, 0.85); - border-radius: 6px; + border-radius: 9999px; } .framed-user-icon:hover { @@ -3003,11 +2994,12 @@ StWidget.focused .app-well-app-running-dot { selection-background-color: rgba(0, 0, 0, 0.2); selected-background-color: rgba(0, 0, 0, 0.2); selected-color: #0860f2; - padding: 3px 8px; + padding: 4px 8px; min-height: 20px; - background-color: #fafafa; - border-radius: 6px; + background-color: rgba(255, 255, 255, 0.1); + border-radius: 10px; box-shadow: inset 0 0 0 2px transparent; + border-radius: 9999px; } .login-dialog StEntry:focus { @@ -3024,7 +3016,7 @@ StWidget.focused .app-well-app-running-dot { .login-dialog .modal-dialog-button { padding: 0 16px; - color: #424242; + color: white; background-color: transparent; border-color: transparent; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05); @@ -3033,8 +3025,8 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:hover, .login-dialog .modal-dialog-button:focus { - color: #242424; - background-color: rgba(0, 0, 0, 0.12); + color: white; + background-color: rgba(255, 255, 255, 0.15); border-color: transparent; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05); text-shadow: none; @@ -3042,8 +3034,8 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:active { - color: #242424; - background-color: rgba(0, 0, 0, 0.2); + color: white; + background-color: rgba(255, 255, 255, 0.3); border-color: transparent; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05); text-shadow: none; @@ -3051,7 +3043,7 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:insensitive { - color: rgba(36, 36, 36, 0.45); + color: rgba(255, 255, 255, 0.35); background-color: transparent; border-color: transparent; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05); @@ -3060,7 +3052,7 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:default { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #3484e2; border: 1px solid rgba(0, 0, 0, 0.12); text-shadow: none; @@ -3068,7 +3060,7 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus { - color: rgba(255, 255, 255, 0.85); + color: white; border-color: rgba(0, 0, 0, 0.12); background-color: #277ce0; text-shadow: none; @@ -3224,6 +3216,21 @@ StWidget.focused .app-well-app-running-dot { background-color: rgba(255, 255, 255, 0.85); } +.user-icon { + background-size: contain; + color: rgba(255, 255, 255, 0.85); + border-radius: 9999px; +} + +.user-icon:hover { + color: white; +} + +.user-icon StIcon { + background-color: rgba(255, 255, 255, 0.05); + border-radius: 9999px; +} + .user-widget-label { color: rgba(255, 255, 255, 0.85); } @@ -3343,7 +3350,7 @@ StWidget.focused .app-well-app-running-dot { } #lockDialogGroup { - background: #333333 url("assets/background.jpg"); + background: url("assets/background.jpg"); background-size: cover; } @@ -3354,6 +3361,7 @@ StWidget.focused .app-well-app-running-dot { border: none; border-radius: 6px; box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15); + color: #242424; } #LookingGlassDialog > #Toolbar { @@ -3690,8 +3698,8 @@ StWidget.focused .app-well-app-running-dot { color: #242424; selection-background-color: #0860f2; selected-color: white; - background-color: #fafafa; - border-radius: 6px; + background-color: rgba(0, 0, 0, 0.1); + border-radius: 10px; box-shadow: inset 0 0 0 2px transparent; } @@ -3707,68 +3715,3 @@ StWidget.focused .app-well-app-running-dot { .popup-menu .search-entry:hover .search-entry-icon, .popup-menu .search-entry:focus .search-entry-icon { color: #242424; } - -/* shortcuts panel button window count indicators */ -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/right-running1.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/left-running1.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/top-running1.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/bottom-running1.svg"); -} - -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/right-running2.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/left-running2.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/top-running2.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/bottom-running2.svg"); -} - -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/right-running3.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/left-running3.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/top-running3.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/bottom-running3.svg"); -} - -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/right-running4.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/left-running4.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/top-running4.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/bottom-running4.svg"); -} diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css index 00a3a57..62aa90c 100644 --- a/src/main/gnome-shell/gnome-shell-light.css +++ b/src/main/gnome-shell/gnome-shell-light.css @@ -93,8 +93,8 @@ StEntry { selected-color: rgba(255, 255, 255, 0.85); font-size: 11.25pt; font-weight: 400; - background-color: #fafafa; - border-radius: 6px; + background-color: rgba(0, 0, 0, 0.1); + border-radius: 10px; box-shadow: inset 0 0 0 2px transparent; } @@ -2808,8 +2808,19 @@ StWidget.focused .app-well-app-running-dot { #keyboard { background-color: rgba(0, 0, 0, 0.25); + box-shadow: none; } +#keyboard .page-indicator { + padding: 6px; +} + +#keyboard .page-indicator .page-indicator-icon { + width: 8px; + height: 8px; +} + +.key-container, .keyboard-layout { padding: 4px; spacing: 4px; @@ -2828,12 +2839,12 @@ StWidget.focused .app-well-app-running-dot { } .keyboard-key:focus, .keyboard-key:hover { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #0860f2; } .keyboard-key:checked, .keyboard-key:active { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #0754d4; } @@ -2843,58 +2854,38 @@ StWidget.focused .app-well-app-running-dot { border-color: rgba(0, 0, 0, 0.3); } -.keyboard-key.default-key { - background-size: 20px; -} - .keyboard-key.default-key, .keyboard-key.enter-key, .keyboard-key.shift-key-lowercase, .keyboard-key.shift-key-uppercase, .keyboard-key.hide-key, .keyboard-key.layout-key { background-color: #E0E0E0; box-shadow: 0 1px rgba(0, 0, 0, 0.2); } .keyboard-key.default-key:focus, .keyboard-key.default-key:hover, .keyboard-key.enter-key:focus, .keyboard-key.enter-key:hover, .keyboard-key.shift-key-lowercase:focus, .keyboard-key.shift-key-lowercase:hover, .keyboard-key.shift-key-uppercase:focus, .keyboard-key.shift-key-uppercase:hover, .keyboard-key.hide-key:focus, .keyboard-key.hide-key:hover, .keyboard-key.layout-key:focus, .keyboard-key.layout-key:hover { - color: white; + color: #242424; background-color: #FAFAFA; } .keyboard-key.default-key:checked, .keyboard-key.default-key:active, .keyboard-key.enter-key:checked, .keyboard-key.enter-key:active, .keyboard-key.shift-key-lowercase:checked, .keyboard-key.shift-key-lowercase:active, .keyboard-key.shift-key-uppercase:checked, .keyboard-key.shift-key-uppercase:active, .keyboard-key.hide-key:checked, .keyboard-key.hide-key:active, .keyboard-key.layout-key:checked, .keyboard-key.layout-key:active { - color: white; + color: #242424; background-color: #ebebeb; } .keyboard-key.enter-key { + color: white; background-color: #0860f2; - background-image: url("assets/key-enter.svg"); } .keyboard-key.enter-key:focus, .keyboard-key.enter-key:hover { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #1c6ff7; } .keyboard-key.enter-key:checked, .keyboard-key.enter-key:active { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #064cc1; } -.keyboard-key.shift-key-lowercase { - background-image: url("assets/key-shift.svg"); -} - -.keyboard-key.shift-key-uppercase { - background-image: url("assets/key-shift-uppercase.svg"); -} - -.keyboard-key.shift-key-uppercase:latched { - background-image: url("assets/key-shift-latched-uppercase.svg"); -} - -.keyboard-key.hide-key { - background-image: url("assets/key-hide.svg"); -} - -.keyboard-key.layout-key { - background-image: url("assets/key-layout.svg"); +.keyboard-key StIcon { + icon-size: 1.125em; } .keyboard-subkeys { @@ -2981,7 +2972,7 @@ StWidget.focused .app-well-app-running-dot { background-size: contain; border: none; color: rgba(255, 255, 255, 0.85); - border-radius: 6px; + border-radius: 9999px; } .framed-user-icon:hover { @@ -3003,11 +2994,12 @@ StWidget.focused .app-well-app-running-dot { selection-background-color: rgba(0, 0, 0, 0.2); selected-background-color: rgba(0, 0, 0, 0.2); selected-color: #0860f2; - padding: 3px 8px; + padding: 4px 8px; min-height: 20px; - background-color: #fafafa; - border-radius: 6px; + background-color: rgba(255, 255, 255, 0.1); + border-radius: 10px; box-shadow: inset 0 0 0 2px transparent; + border-radius: 9999px; } .login-dialog StEntry:focus { @@ -3024,7 +3016,7 @@ StWidget.focused .app-well-app-running-dot { .login-dialog .modal-dialog-button { padding: 0 16px; - color: #424242; + color: white; background-color: transparent; border-color: transparent; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05); @@ -3033,8 +3025,8 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:hover, .login-dialog .modal-dialog-button:focus { - color: #242424; - background-color: rgba(0, 0, 0, 0.12); + color: white; + background-color: rgba(255, 255, 255, 0.15); border-color: transparent; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05); text-shadow: none; @@ -3042,8 +3034,8 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:active { - color: #242424; - background-color: rgba(0, 0, 0, 0.2); + color: white; + background-color: rgba(255, 255, 255, 0.3); border-color: transparent; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05); text-shadow: none; @@ -3051,7 +3043,7 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:insensitive { - color: rgba(36, 36, 36, 0.45); + color: rgba(255, 255, 255, 0.35); background-color: transparent; border-color: transparent; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.05); @@ -3060,7 +3052,7 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:default { - color: rgba(255, 255, 255, 0.85); + color: white; background-color: #3484e2; border: 1px solid rgba(0, 0, 0, 0.12); text-shadow: none; @@ -3068,7 +3060,7 @@ StWidget.focused .app-well-app-running-dot { } .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus { - color: rgba(255, 255, 255, 0.85); + color: white; border-color: rgba(0, 0, 0, 0.12); background-color: #277ce0; text-shadow: none; @@ -3224,6 +3216,21 @@ StWidget.focused .app-well-app-running-dot { background-color: rgba(255, 255, 255, 0.85); } +.user-icon { + background-size: contain; + color: rgba(255, 255, 255, 0.85); + border-radius: 9999px; +} + +.user-icon:hover { + color: white; +} + +.user-icon StIcon { + background-color: rgba(255, 255, 255, 0.05); + border-radius: 9999px; +} + .user-widget-label { color: rgba(255, 255, 255, 0.85); } @@ -3343,7 +3350,7 @@ StWidget.focused .app-well-app-running-dot { } #lockDialogGroup { - background: #333333 url("assets/background.jpg"); + background: url("assets/background.jpg"); background-size: cover; } @@ -3354,6 +3361,7 @@ StWidget.focused .app-well-app-running-dot { border: none; border-radius: 6px; box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15); + color: #242424; } #LookingGlassDialog > #Toolbar { @@ -3690,8 +3698,8 @@ StWidget.focused .app-well-app-running-dot { color: #242424; selection-background-color: #0860f2; selected-color: white; - background-color: #fafafa; - border-radius: 6px; + background-color: rgba(0, 0, 0, 0.1); + border-radius: 10px; box-shadow: inset 0 0 0 2px transparent; } @@ -3707,68 +3715,3 @@ StWidget.focused .app-well-app-running-dot { .popup-menu .search-entry:hover .search-entry-icon, .popup-menu .search-entry:focus .search-entry-icon { color: #242424; } - -/* shortcuts panel button window count indicators */ -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/right-running1.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/left-running1.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/top-running1.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/bottom-running1.svg"); -} - -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/right-running2.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/left-running2.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/top-running2.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/bottom-running2.svg"); -} - -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/right-running3.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/left-running3.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/top-running3.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/bottom-running3.svg"); -} - -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/right-running4.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/left-running4.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/top-running4.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/bottom-running4.svg"); -} diff --git a/src/main/gnome-shell/gnome-shell-theme.gresource.xml b/src/main/gnome-shell/gnome-shell-theme.gresource.xml index df59696..865f1b6 100644 --- a/src/main/gnome-shell/gnome-shell-theme.gresource.xml +++ b/src/main/gnome-shell/gnome-shell-theme.gresource.xml @@ -1,38 +1,6 @@ - assets/dash/bottom-running1.svg - assets/dash/bottom-running1-focused.svg - assets/dash/bottom-running2.svg - assets/dash/bottom-running2-focused.svg - assets/dash/bottom-running3.svg - assets/dash/bottom-running3-focused.svg - assets/dash/bottom-running4.svg - assets/dash/bottom-running4-focused.svg - assets/dash/left-running1.svg - assets/dash/left-running1-focused.svg - assets/dash/left-running2.svg - assets/dash/left-running2-focused.svg - assets/dash/left-running3.svg - assets/dash/left-running3-focused.svg - assets/dash/left-running4.svg - assets/dash/left-running4-focused.svg - assets/dash/right-running1.svg - assets/dash/right-running1-focused.svg - assets/dash/right-running2.svg - assets/dash/right-running2-focused.svg - assets/dash/right-running3.svg - assets/dash/right-running3-focused.svg - assets/dash/right-running4.svg - assets/dash/right-running4-focused.svg - assets/dash/top-running1.svg - assets/dash/top-running1-focused.svg - assets/dash/top-running2.svg - assets/dash/top-running2-focused.svg - assets/dash/top-running3.svg - assets/dash/top-running3-focused.svg - assets/dash/top-running4.svg - assets/dash/top-running4-focused.svg assets/calendar-arrow-left.svg assets/calendar-arrow-right.svg assets/checkbox.svg @@ -46,25 +14,20 @@ assets/window-close.svg assets/window-close-hover.svg assets/window-close-active.svg - assets/key-enter.svg - assets/key-hide.svg - assets/key-layout.svg - assets/key-shift.svg - assets/key-shift-latched-uppercase.svg - assets/key-shift-uppercase.svg assets/activities.svg assets/startup.svg assets/startup@2.svg - assets/background.png - assets/menu.svg - assets/menu-solid.svg - assets/menu-active.svg - assets/menu-hover.svg - assets/submenu.svg - assets/submenu-open.svg - no-events.svg - no-notifications.svg - process-working.svg + assets/background.jpg + message-indicator-symbolic.svg + eye-not-looking-symbolic.svg + eye-open-negative-filled-symbolic.svg + pointer-double-click-symbolic.svg + pointer-drag-symbolic.svg + pointer-primary-click-symbolic.svg + pointer-secondary-click-symbolic.svg + no-events.svg + no-notifications.svg + process-working.svg gnome-shell.css diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss index e7e143e..88ce0da 100644 --- a/src/sass/_colors.scss +++ b/src/sass/_colors.scss @@ -128,6 +128,7 @@ $panel_border_color: if($variant =='light', rgba(black, 0.2), rgb // Entry colors $entry_bg: if($variant == 'light', rgba(black, 0.05), rgba(white, 0.05)); +$entry_shell_bg: if($variant == 'light', rgba(black, 0.1), rgba(white, 0.1)); $entry_border: $borders_color; $entry_highlight: if($variant == 'light', rgba(#67a4e9, 0.75), rgba($selection_mode_bg, 0.75)); diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss index 818d16a..444e645 100644 --- a/src/sass/gnome-shell/_common.scss +++ b/src/sass/gnome-shell/_common.scss @@ -2385,15 +2385,27 @@ StWidget.focused .app-well-app-running-dot { //Keyboard /* On-screen Keyboard */ .word-suggestions { - font-size: 14pt; - spacing: 12px; - min-height: 20pt; + font-size: 14pt; + spacing: 12px; + min-height: 20pt; } #keyboard { - background-color: rgba(black, 0.25); + background-color: rgba(black, 0.25); + box-shadow: none; + + .page-indicator { + padding: 6px; + + .page-indicator-icon { + width: 8px; + height: 8px; + } + } } +// the container for individual keys +.key-container, .keyboard-layout { padding: 4px; spacing: 4px; @@ -2411,15 +2423,15 @@ StWidget.focused .app-well-app-running-dot { color: inherit; background-color: $solid_bg_color; box-shadow: 0 1px rgba(black, 0.2); - &:focus, &:hover { color: $light_alt_fg_color; background-color: $primary_color; } - &:checked, &:active { color: $light_alt_fg_color; background-color: darken($primary_color, 6%); } + &:focus, &:hover { color: $light_fg_color; background-color: $primary_color; } + &:checked, &:active { color: $light_fg_color; background-color: darken($primary_color, 6%); } &:grayed { //FIXME background-color: $alt_dark_bg_color; color: $light_alt_fg_color; border-color: $alt_dark_bg_color; } - &.default-key { background-size: 20px; } // backspace button + // &.default-key { background-size: 20px; } // backspace button &.default-key, &.enter-key, &.shift-key-lowercase, @@ -2428,30 +2440,33 @@ StWidget.focused .app-well-app-running-dot { &.layout-key { background-color: $alt_solid_bg_color; box-shadow: 0 1px rgba(black, 0.2); - &:focus, &:hover { color: $light_fg_color; background-color: $solid_bg_color; } - &:checked, &:active { color: $light_fg_color; background-color: darken($solid_bg_color, 6%); } + &:focus, &:hover { color: $fg_color; background-color: $solid_bg_color; } + &:checked, &:active { color: $fg_color; background-color: darken($solid_bg_color, 6%); } } &.enter-key { + color: $light_fg_color; background-color: $primary_color; - background-image: url("assets/key-enter.svg"); - &:focus, &:hover { color: $light_alt_fg_color; background-color: lighten($primary_color, 5%); } - &:checked, &:active { color: $light_alt_fg_color; background-color: darken($primary_color, 10%); } - } - &.shift-key-lowercase { - background-image: url("assets/key-shift.svg"); - } - &.shift-key-uppercase { - background-image: url("assets/key-shift-uppercase.svg"); - } - &.shift-key-uppercase:latched { - background-image: url("assets/key-shift-latched-uppercase.svg"); - } - &.hide-key { - background-image: url("assets/key-hide.svg"); - } - &.layout-key { - background-image: url("assets/key-layout.svg"); + // background-image: url("assets/key-enter.svg"); + &:focus, &:hover { color: $light_fg_color; background-color: lighten($primary_color, 5%); } + &:checked, &:active { color: $light_fg_color; background-color: darken($primary_color, 10%); } } + // &.shift-key-lowercase { + // background-image: url("assets/key-shift.svg"); + // } + // &.shift-key-uppercase { + // background-image: url("assets/key-shift-uppercase.svg"); + // } + // &.shift-key-uppercase:latched { + // background-image: url("assets/key-shift-latched-uppercase.svg"); + // } + // &.hide-key { + // background-image: url("assets/key-hide.svg"); + // } + // &.layout-key { + // background-image: url("assets/key-layout.svg"); + // } + + StIcon { icon-size: 1.125em; } } .keyboard-subkeys { //long press on a key popup @@ -2511,7 +2526,8 @@ StWidget.focused .app-well-app-running-dot { background-size: contain; border: none; color: $light_alt_fg_color; - border-radius: $bt_radius; + border-radius: $circular_radius; + &:hover { border-color: $light_alt_fg_color; color: $light_alt_fg_color; @@ -2525,36 +2541,38 @@ StWidget.focused .app-well-app-running-dot { max-width: 23em; } +$login_entry_bg: if($variant == 'dark', rgba(black, 0.1), rgba(white, 0.1)); + .login-dialog { //reset border: none; background-color: transparent; StEntry { - // color: $light_alt_fg_color; selection-background-color: $track_color; selected-background-color: $track_color; selected-color: $primary_color; - padding: 3px 8px; + padding: 4px 8px; min-height: $small_size; - @include entry(normal); + @include entry(normal, $bc: $login_entry_bg); &:focus { @include entry(focus); } &:insensitive { @include entry(insensitive); } + border-radius: $circular_radius; } .modal-dialog-button-box { spacing: 3px; } .modal-dialog-button { padding: 0 16px; - @include button(flat-normal, $tc: $light_alt_fg_color); - &:hover,&:focus { @include button(flat-hover, $tc: $light_alt_fg_color); } - &:active { @include button(flat-active, $tc: $light_alt_fg_color); } - &:insensitive { @include button(flat-insensitive, $tc: $light_alt_fg_color); } + @include button(flat-normal, $tc: $light_fg_color); + &:hover,&:focus { @include button(flat-hover, $tc: $light_fg_color); } + &:active { @include button(flat-active, $tc: $light_fg_color); } + &:insensitive { @include button(flat-insensitive, $tc: $light_fg_color); } &:default { - @include button(normal, $c: $suggested_color, $tc: $light_alt_fg_color); - &:hover,&:focus { @include button(hover, $c: $suggested_color, $tc: $light_alt_fg_color); } - &:active { @include button(active, $c: $suggested_color, $tc: $light_alt_fg_color); } + @include button(normal, $c: $suggested_color, $tc: $light_fg_color); + &:hover,&:focus { @include button(hover, $c: $suggested_color, $tc: $light_fg_color); } + &:active { @include button(active, $c: $suggested_color, $tc: $light_fg_color); } &:insensitive { @include button(insensitive, $c: $light_divider_color, $tc: $light_disabled_fg_color); } } } @@ -2628,6 +2646,21 @@ StWidget.focused .app-well-app-running-dot { &:focus .login-dialog-timed-login-indicator { background-color: $light_alt_fg_color; } } +.user-icon { + background-size: contain; + color: $light_alt_fg_color; + border-radius: $circular_radius; + + &:hover { + color: $light_fg_color; + } + + StIcon { + background-color: rgba(white, 0.05); + border-radius: $circular_radius; + } +} + // .login-dialog-username, .user-widget-label { color: $light_alt_fg_color; @@ -2738,7 +2771,7 @@ StWidget.focused .app-well-app-running-dot { } #lockDialogGroup { - background: #333333 url("assets/background.jpg"); + background: url("assets/background.jpg"); background-size: cover; } @@ -2755,6 +2788,8 @@ StWidget.focused .app-well-app-running-dot { border: none; border-radius: $bt_radius; box-shadow: $shadow_4; + color: $fg_color; + & > #Toolbar { padding: 0 8px; border: none; @@ -2791,65 +2826,65 @@ StWidget.focused .app-well-app-running-dot { StBoxLayout#ResultsArea { spacing: 4px; } } - .lg-dialog { - StEntry { - selection-background-color: $primary_color; - selected-color: $light_alt_fg_color; - } - .shell-link { - color: $link_color; - &:hover { color: $link_color; } - } +.lg-dialog { + StEntry { + selection-background-color: $primary_color; + selected-color: $light_alt_fg_color; } + .shell-link { + color: $link_color; + &:hover { color: $link_color; } + } +} - .lg-completions-text { - font-size: 1em; - font-style: italic; - } +.lg-completions-text { + font-size: 1em; + font-style: italic; +} - .lg-obj-inspector-title { - spacing: 4px; - } +.lg-obj-inspector-title { + spacing: 4px; +} - .lg-obj-inspector-button { - min-height: $medium_size; - padding: 0 16px; - border: none; - border-radius: $bt_radius; - @include font(button); - @include button(flat-normal); - &:hover { @include button(flat-hover); } - &:active { @include button(flat-active); } - &:insensitive { @include button(flat-insensitive); } - &:focus { @include button(flat-focus); } - &:hover { border: none; } - } +.lg-obj-inspector-button { + min-height: $medium_size; + padding: 0 16px; + border: none; + border-radius: $bt_radius; + @include font(button); + @include button(flat-normal); + &:hover { @include button(flat-hover); } + &:active { @include button(flat-active); } + &:insensitive { @include button(flat-insensitive); } + &:focus { @include button(flat-focus); } + &:hover { border: none; } +} - #lookingGlassExtensions { padding: 4px; } +#lookingGlassExtensions { padding: 4px; } - .lg-extensions-list { - padding: 4px; - spacing: 6px; - } +.lg-extensions-list { + padding: 4px; + spacing: 6px; +} - .lg-extension { - border: none; - border-radius: $bt_radius; - padding: 4px; - } +.lg-extension { + border: none; + border-radius: $bt_radius; + padding: 4px; +} - .lg-extension-name { - @include font(headline); - } +.lg-extension-name { + @include font(headline); +} - .lg-extension-meta { - spacing: 6px; - } +.lg-extension-meta { + spacing: 6px; +} - #LookingGlassPropertyInspector { - background: $base_color; - border: none; - border-radius: $bt_radius; - padding: 6px; - box-shadow: $shadow_4; - } +#LookingGlassPropertyInspector { + background: $base_color; + border: none; + border-radius: $bt_radius; + padding: 6px; + box-shadow: $shadow_4; +} diff --git a/src/sass/gnome-shell/_drawing.scss b/src/sass/gnome-shell/_drawing.scss index d85f8c6..7d165bd 100644 --- a/src/sass/gnome-shell/_drawing.scss +++ b/src/sass/gnome-shell/_drawing.scss @@ -87,7 +87,7 @@ } -@mixin entry($t, $fc: $primary_color) { +@mixin entry($t, $fc: $primary_color, $bc: $entry_shell_bg) { // // entry // @@ -96,8 +96,8 @@ // @if $t == normal { - background-color: if($variant == 'light', darken($base_color, 2%), darken($base_color, 1%)); - border-radius: $bt_radius; + background-color: $bc; + border-radius: $mn_radius; box-shadow: inset 0 0 0 2px transparent; } @@ -106,7 +106,7 @@ } @if $t == focus { - box-shadow: inset 0 0 0 2px lighten($primary_color, 15%); + box-shadow: inset 0 0 0 2px lighten($fc, 15%); } @if $t == insensitive { @@ -194,7 +194,7 @@ } @if $t == flat-normal { - color: if($tc != $light_fg_color, $alt_fg_color, $light_alt_fg_color); + color: if($tc != $light_fg_color, $alt_fg_color, $light_fg_color); background-color: transparent; border-color: transparent; box-shadow: $shadow_0; diff --git a/src/sass/gnome-shell/_extensions.scss b/src/sass/gnome-shell/_extensions.scss index 7b9d71f..84d9c28 100644 --- a/src/sass/gnome-shell/_extensions.scss +++ b/src/sass/gnome-shell/_extensions.scss @@ -183,70 +183,3 @@ $dash_panel_fg: if($variant == 'light', black, white); } } } - -// * Workspaces-to-dock * - -/* shortcuts panel button window count indicators */ -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/right-running1.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/left-running1.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/top-running1.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-1 { - background-image: url("assets/dash/bottom-running1.svg"); -} - -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/right-running2.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/left-running2.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/top-running2.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-2 { - background-image: url("assets/dash/bottom-running2.svg"); -} - -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/right-running3.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/left-running3.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/top-running3.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-3 { - background-image: url("assets/dash/bottom-running3.svg"); -} - -#workspacestodockDock.right .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/right-running4.svg"); -} - -#workspacestodockDock.left .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/left-running4.svg"); -} - -#workspacestodockDock.top .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/top-running4.svg"); -} - -#workspacestodockDock.bottom .workspacestodock-shortcut-button-windowcount-image-4 { - background-image: url("assets/dash/bottom-running4.svg"); -}