diff --git a/install.sh b/install.sh index cb5d88d..756e0bc 100755 --- a/install.sh +++ b/install.sh @@ -111,12 +111,17 @@ install() { echo "ButtonLayout=close,minimize,maximize:menu" >> ${THEME_DIR}/index.theme mkdir -p ${THEME_DIR}/gnome-shell - cp -r ${SRC_DIR}/assets/gnome-shell/source-assets/* ${THEME_DIR}/gnome-shell + cp -r ${SRC_DIR}/assets/gnome-shell/icons ${THEME_DIR}/gnome-shell 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/assets${color}/*.svg ${THEME_DIR}/gnome-shell/assets cp -r ${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 + if [[ ${alt} == '-alt' || ${opacity} == '-solid' ]] && [[ ${color} == '-light' ]]; then cp -r ${SRC_DIR}/assets/gnome-shell/activities-black/activities${icon}.svg ${THEME_DIR}/gnome-shell/assets/activities.svg fi diff --git a/src/assets/gnome-shell/assets-dark/no-events.svg b/src/assets/gnome-shell/assets-dark/no-events.svg new file mode 100644 index 0000000..fd56f6b --- /dev/null +++ b/src/assets/gnome-shell/assets-dark/no-events.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/gnome-shell/assets-dark/no-notifications.svg b/src/assets/gnome-shell/assets-dark/no-notifications.svg new file mode 100644 index 0000000..7733357 --- /dev/null +++ b/src/assets/gnome-shell/assets-dark/no-notifications.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/gnome-shell/assets-light/no-events.svg b/src/assets/gnome-shell/assets-light/no-events.svg new file mode 100644 index 0000000..4339d54 --- /dev/null +++ b/src/assets/gnome-shell/assets-light/no-events.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/gnome-shell/assets-light/no-notifications.svg b/src/assets/gnome-shell/assets-light/no-notifications.svg new file mode 100644 index 0000000..498a753 --- /dev/null +++ b/src/assets/gnome-shell/assets-light/no-notifications.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/gnome-shell/common-assets/process-working.svg b/src/assets/gnome-shell/common-assets/process-working.svg new file mode 100644 index 0000000..6671e97 --- /dev/null +++ b/src/assets/gnome-shell/common-assets/process-working.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/gnome-shell/common-assets/startup.svg b/src/assets/gnome-shell/common-assets/startup.svg deleted file mode 100644 index 0a95586..0000000 --- a/src/assets/gnome-shell/common-assets/startup.svg +++ /dev/null @@ -1,721 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/gnome-shell/common-assets/startup@2.svg b/src/assets/gnome-shell/common-assets/startup@2.svg deleted file mode 100644 index ee23adf..0000000 --- a/src/assets/gnome-shell/common-assets/startup@2.svg +++ /dev/null @@ -1,326 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/gnome-shell/icons/color-pick.svg b/src/assets/gnome-shell/icons/color-pick.svg new file mode 100644 index 0000000..2246776 --- /dev/null +++ b/src/assets/gnome-shell/icons/color-pick.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/gnome-shell/icons/eye-not-looking-symbolic.svg b/src/assets/gnome-shell/icons/eye-not-looking-symbolic.svg new file mode 100644 index 0000000..3dacfe1 --- /dev/null +++ b/src/assets/gnome-shell/icons/eye-not-looking-symbolic.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/gnome-shell/icons/eye-open-negative-filled-symbolic.svg b/src/assets/gnome-shell/icons/eye-open-negative-filled-symbolic.svg new file mode 100644 index 0000000..5ca48d1 --- /dev/null +++ b/src/assets/gnome-shell/icons/eye-open-negative-filled-symbolic.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/gnome-shell/icons/keyboard-caps-lock-filled-symbolic.svg b/src/assets/gnome-shell/icons/keyboard-caps-lock-filled-symbolic.svg new file mode 100644 index 0000000..99bea5b --- /dev/null +++ b/src/assets/gnome-shell/icons/keyboard-caps-lock-filled-symbolic.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/gnome-shell/icons/keyboard-enter-symbolic.svg b/src/assets/gnome-shell/icons/keyboard-enter-symbolic.svg new file mode 100644 index 0000000..70a27b3 --- /dev/null +++ b/src/assets/gnome-shell/icons/keyboard-enter-symbolic.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/gnome-shell/icons/keyboard-hide-symbolic.svg b/src/assets/gnome-shell/icons/keyboard-hide-symbolic.svg new file mode 100644 index 0000000..5ba9717 --- /dev/null +++ b/src/assets/gnome-shell/icons/keyboard-hide-symbolic.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/gnome-shell/icons/keyboard-layout-filled-symbolic.svg b/src/assets/gnome-shell/icons/keyboard-layout-filled-symbolic.svg new file mode 100644 index 0000000..06e2f53 --- /dev/null +++ b/src/assets/gnome-shell/icons/keyboard-layout-filled-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/gnome-shell/icons/keyboard-shift-filled-symbolic.svg b/src/assets/gnome-shell/icons/keyboard-shift-filled-symbolic.svg new file mode 100644 index 0000000..f02389c --- /dev/null +++ b/src/assets/gnome-shell/icons/keyboard-shift-filled-symbolic.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/gnome-shell/icons/message-indicator-symbolic.svg b/src/assets/gnome-shell/icons/message-indicator-symbolic.svg new file mode 100644 index 0000000..7397ba2 --- /dev/null +++ b/src/assets/gnome-shell/icons/message-indicator-symbolic.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/gnome-shell/icons/pointer-double-click-symbolic.svg b/src/assets/gnome-shell/icons/pointer-double-click-symbolic.svg new file mode 100644 index 0000000..625e188 --- /dev/null +++ b/src/assets/gnome-shell/icons/pointer-double-click-symbolic.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/gnome-shell/icons/pointer-drag-symbolic.svg b/src/assets/gnome-shell/icons/pointer-drag-symbolic.svg new file mode 100644 index 0000000..eb05cbf --- /dev/null +++ b/src/assets/gnome-shell/icons/pointer-drag-symbolic.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/gnome-shell/icons/pointer-primary-click-symbolic.svg b/src/assets/gnome-shell/icons/pointer-primary-click-symbolic.svg new file mode 100644 index 0000000..81d2087 --- /dev/null +++ b/src/assets/gnome-shell/icons/pointer-primary-click-symbolic.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/gnome-shell/icons/pointer-secondary-click-symbolic.svg b/src/assets/gnome-shell/icons/pointer-secondary-click-symbolic.svg new file mode 100644 index 0000000..6ec18f2 --- /dev/null +++ b/src/assets/gnome-shell/icons/pointer-secondary-click-symbolic.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/gnome-shell/source-assets/color-pick.svg b/src/assets/gnome-shell/source-assets/color-pick.svg deleted file mode 100644 index d9af690..0000000 --- a/src/assets/gnome-shell/source-assets/color-pick.svg +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - 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 deleted file mode 100644 index cbae148..0000000 --- a/src/assets/gnome-shell/source-assets/dash-placeholder.svg +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index a168c87..0000000 --- a/src/assets/gnome-shell/source-assets/eye-not-looking-symbolic.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - 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 deleted file mode 100644 index 1e5351c..0000000 --- a/src/assets/gnome-shell/source-assets/eye-open-negative-filled-symbolic.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - 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 deleted file mode 100644 index 45985b7..0000000 --- a/src/assets/gnome-shell/source-assets/keyboard-caps-lock-filled-symbolic.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/gnome-shell/source-assets/keyboard-enter-symbolic.svg b/src/assets/gnome-shell/source-assets/keyboard-enter-symbolic.svg deleted file mode 100644 index de68b71..0000000 --- a/src/assets/gnome-shell/source-assets/keyboard-enter-symbolic.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/gnome-shell/source-assets/keyboard-hide-symbolic.svg b/src/assets/gnome-shell/source-assets/keyboard-hide-symbolic.svg deleted file mode 100644 index 4212707..0000000 --- a/src/assets/gnome-shell/source-assets/keyboard-hide-symbolic.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - 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 deleted file mode 100644 index 7c9b955..0000000 --- a/src/assets/gnome-shell/source-assets/keyboard-layout-filled-symbolic.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - 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 deleted file mode 100644 index 04069e8..0000000 --- a/src/assets/gnome-shell/source-assets/keyboard-shift-filled-symbolic.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/gnome-shell/source-assets/message-indicator-symbolic.svg b/src/assets/gnome-shell/source-assets/message-indicator-symbolic.svg deleted file mode 100644 index 257a984..0000000 --- a/src/assets/gnome-shell/source-assets/message-indicator-symbolic.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - 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 deleted file mode 100644 index 8ab08a9..0000000 --- a/src/assets/gnome-shell/source-assets/no-events.svg +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - 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 deleted file mode 100644 index 862e2d1..0000000 --- a/src/assets/gnome-shell/source-assets/no-notifications.svg +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index 5267834..0000000 --- a/src/assets/gnome-shell/source-assets/pointer-double-click-symbolic.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/src/assets/gnome-shell/source-assets/pointer-drag-symbolic.svg b/src/assets/gnome-shell/source-assets/pointer-drag-symbolic.svg deleted file mode 100644 index be37e6f..0000000 --- a/src/assets/gnome-shell/source-assets/pointer-drag-symbolic.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - 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 deleted file mode 100644 index f447991..0000000 --- a/src/assets/gnome-shell/source-assets/pointer-primary-click-symbolic.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - 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 deleted file mode 100644 index b72e178..0000000 --- a/src/assets/gnome-shell/source-assets/pointer-secondary-click-symbolic.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/src/assets/gnome-shell/source-assets/process-working.svg b/src/assets/gnome-shell/source-assets/process-working.svg deleted file mode 100644 index 920a67d..0000000 --- a/src/assets/gnome-shell/source-assets/process-working.svg +++ /dev/null @@ -1,3084 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css index 9bf435f..d0dbc53 100644 --- a/src/main/gnome-shell/gnome-shell-dark-alt.css +++ b/src/main/gnome-shell/gnome-shell-dark-alt.css @@ -3066,25 +3066,25 @@ StWidget.focused .app-well-app-running-dot { } .keyboard-key { - min-height: 2em; - min-width: 2em; - font-size: 14pt; + min-height: 1.2em; + min-width: 1.2em; font-weight: bold; - border-radius: 6px; + font-size: 16pt; + border-radius: 10px; border: none; - color: inherit; + color: #afafaf; background-color: #555555; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15); } .keyboard-key:focus, .keyboard-key:hover { - color: white; - background-color: #0860f2; + color: #dedede; + background-color: #6f6f6f; } .keyboard-key:checked, .keyboard-key:active { - color: white; - background-color: #0754d4; + color: #dedede; + background-color: #3c3c3c; } .keyboard-key:grayed { @@ -3093,25 +3093,25 @@ StWidget.focused .app-well-app-running-dot { border-color: rgba(0, 0, 0, 0.3); } -.keyboard-key.default-key, .keyboard-key.shift-key-lowercase, .keyboard-key.shift-key-uppercase, .keyboard-key.hide-key, .keyboard-key.layout-key { +.keyboard-key.default-key { background-color: #242424; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); } -.keyboard-key.default-key:focus, .keyboard-key.default-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 { +.keyboard-key.default-key:focus, .keyboard-key.default-key:hover { color: #dedede; - background-color: #555555; + background-color: #3e3e3e; } -.keyboard-key.default-key:checked, .keyboard-key.default-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 { +.keyboard-key.default-key:checked, .keyboard-key.default-key:active { color: #dedede; - background-color: #464646; + background-color: #0b0b0b; } .keyboard-key.enter-key { color: white; background-color: #0860f2; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); } .keyboard-key.enter-key:focus, .keyboard-key.enter-key:hover { @@ -3124,6 +3124,10 @@ StWidget.focused .app-well-app-running-dot { background-color: #064cc1; } +.keyboard-key.shift-key-uppercase, .keyboard-key.shift-key-uppercase:focus, .keyboard-key.shift-key-uppercase:hover, .keyboard-key.shift-key-uppercase:checked, .keyboard-key.shift-key-uppercase:active { + color: #0860f2; +} + .keyboard-key StIcon { icon-size: 1.125em; } diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css index c6f65cd..fa41ab9 100644 --- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css +++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css @@ -3066,25 +3066,25 @@ StWidget.focused .app-well-app-running-dot { } .keyboard-key { - min-height: 2em; - min-width: 2em; - font-size: 14pt; + min-height: 1.2em; + min-width: 1.2em; font-weight: bold; - border-radius: 6px; + font-size: 16pt; + border-radius: 10px; border: none; - color: inherit; + color: #afafaf; background-color: #555555; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15); } .keyboard-key:focus, .keyboard-key:hover { - color: white; - background-color: #0860f2; + color: #dedede; + background-color: #6f6f6f; } .keyboard-key:checked, .keyboard-key:active { - color: white; - background-color: #0754d4; + color: #dedede; + background-color: #3c3c3c; } .keyboard-key:grayed { @@ -3093,25 +3093,25 @@ StWidget.focused .app-well-app-running-dot { border-color: rgba(0, 0, 0, 0.3); } -.keyboard-key.default-key, .keyboard-key.shift-key-lowercase, .keyboard-key.shift-key-uppercase, .keyboard-key.hide-key, .keyboard-key.layout-key { +.keyboard-key.default-key { background-color: #242424; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); } -.keyboard-key.default-key:focus, .keyboard-key.default-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 { +.keyboard-key.default-key:focus, .keyboard-key.default-key:hover { color: #dedede; - background-color: #555555; + background-color: #3e3e3e; } -.keyboard-key.default-key:checked, .keyboard-key.default-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 { +.keyboard-key.default-key:checked, .keyboard-key.default-key:active { color: #dedede; - background-color: #464646; + background-color: #0b0b0b; } .keyboard-key.enter-key { color: white; background-color: #0860f2; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); } .keyboard-key.enter-key:focus, .keyboard-key.enter-key:hover { @@ -3124,6 +3124,10 @@ StWidget.focused .app-well-app-running-dot { background-color: #064cc1; } +.keyboard-key.shift-key-uppercase, .keyboard-key.shift-key-uppercase:focus, .keyboard-key.shift-key-uppercase:hover, .keyboard-key.shift-key-uppercase:checked, .keyboard-key.shift-key-uppercase:active { + color: #0860f2; +} + .keyboard-key StIcon { icon-size: 1.125em; } diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css index c6f65cd..fa41ab9 100644 --- a/src/main/gnome-shell/gnome-shell-dark-solid.css +++ b/src/main/gnome-shell/gnome-shell-dark-solid.css @@ -3066,25 +3066,25 @@ StWidget.focused .app-well-app-running-dot { } .keyboard-key { - min-height: 2em; - min-width: 2em; - font-size: 14pt; + min-height: 1.2em; + min-width: 1.2em; font-weight: bold; - border-radius: 6px; + font-size: 16pt; + border-radius: 10px; border: none; - color: inherit; + color: #afafaf; background-color: #555555; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15); } .keyboard-key:focus, .keyboard-key:hover { - color: white; - background-color: #0860f2; + color: #dedede; + background-color: #6f6f6f; } .keyboard-key:checked, .keyboard-key:active { - color: white; - background-color: #0754d4; + color: #dedede; + background-color: #3c3c3c; } .keyboard-key:grayed { @@ -3093,25 +3093,25 @@ StWidget.focused .app-well-app-running-dot { border-color: rgba(0, 0, 0, 0.3); } -.keyboard-key.default-key, .keyboard-key.shift-key-lowercase, .keyboard-key.shift-key-uppercase, .keyboard-key.hide-key, .keyboard-key.layout-key { +.keyboard-key.default-key { background-color: #242424; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); } -.keyboard-key.default-key:focus, .keyboard-key.default-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 { +.keyboard-key.default-key:focus, .keyboard-key.default-key:hover { color: #dedede; - background-color: #555555; + background-color: #3e3e3e; } -.keyboard-key.default-key:checked, .keyboard-key.default-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 { +.keyboard-key.default-key:checked, .keyboard-key.default-key:active { color: #dedede; - background-color: #464646; + background-color: #0b0b0b; } .keyboard-key.enter-key { color: white; background-color: #0860f2; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); } .keyboard-key.enter-key:focus, .keyboard-key.enter-key:hover { @@ -3124,6 +3124,10 @@ StWidget.focused .app-well-app-running-dot { background-color: #064cc1; } +.keyboard-key.shift-key-uppercase, .keyboard-key.shift-key-uppercase:focus, .keyboard-key.shift-key-uppercase:hover, .keyboard-key.shift-key-uppercase:checked, .keyboard-key.shift-key-uppercase:active { + color: #0860f2; +} + .keyboard-key StIcon { icon-size: 1.125em; } diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css index 9bf435f..d0dbc53 100644 --- a/src/main/gnome-shell/gnome-shell-dark.css +++ b/src/main/gnome-shell/gnome-shell-dark.css @@ -3066,25 +3066,25 @@ StWidget.focused .app-well-app-running-dot { } .keyboard-key { - min-height: 2em; - min-width: 2em; - font-size: 14pt; + min-height: 1.2em; + min-width: 1.2em; font-weight: bold; - border-radius: 6px; + font-size: 16pt; + border-radius: 10px; border: none; - color: inherit; + color: #afafaf; background-color: #555555; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15); } .keyboard-key:focus, .keyboard-key:hover { - color: white; - background-color: #0860f2; + color: #dedede; + background-color: #6f6f6f; } .keyboard-key:checked, .keyboard-key:active { - color: white; - background-color: #0754d4; + color: #dedede; + background-color: #3c3c3c; } .keyboard-key:grayed { @@ -3093,25 +3093,25 @@ StWidget.focused .app-well-app-running-dot { border-color: rgba(0, 0, 0, 0.3); } -.keyboard-key.default-key, .keyboard-key.shift-key-lowercase, .keyboard-key.shift-key-uppercase, .keyboard-key.hide-key, .keyboard-key.layout-key { +.keyboard-key.default-key { background-color: #242424; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); } -.keyboard-key.default-key:focus, .keyboard-key.default-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 { +.keyboard-key.default-key:focus, .keyboard-key.default-key:hover { color: #dedede; - background-color: #555555; + background-color: #3e3e3e; } -.keyboard-key.default-key:checked, .keyboard-key.default-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 { +.keyboard-key.default-key:checked, .keyboard-key.default-key:active { color: #dedede; - background-color: #464646; + background-color: #0b0b0b; } .keyboard-key.enter-key { color: white; background-color: #0860f2; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); } .keyboard-key.enter-key:focus, .keyboard-key.enter-key:hover { @@ -3124,6 +3124,10 @@ StWidget.focused .app-well-app-running-dot { background-color: #064cc1; } +.keyboard-key.shift-key-uppercase, .keyboard-key.shift-key-uppercase:focus, .keyboard-key.shift-key-uppercase:hover, .keyboard-key.shift-key-uppercase:checked, .keyboard-key.shift-key-uppercase:active { + color: #0860f2; +} + .keyboard-key StIcon { icon-size: 1.125em; } diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css index 7676b98..27a1a5f 100644 --- a/src/main/gnome-shell/gnome-shell-light-alt.css +++ b/src/main/gnome-shell/gnome-shell-light-alt.css @@ -3066,25 +3066,25 @@ StWidget.focused .app-well-app-running-dot { } .keyboard-key { - min-height: 2em; - min-width: 2em; - font-size: 14pt; + min-height: 1.2em; + min-width: 1.2em; font-weight: bold; - border-radius: 6px; + font-size: 16pt; + border-radius: 10px; border: none; - color: inherit; - background-color: #FAFAFA; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + color: #424242; + background-color: #eeeeee; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15); } .keyboard-key:focus, .keyboard-key:hover { - color: white; - background-color: #0860f2; + color: #242424; + background-color: white; } .keyboard-key:checked, .keyboard-key:active { - color: white; - background-color: #0754d4; + color: #242424; + background-color: #d5d5d5; } .keyboard-key:grayed { @@ -3093,25 +3093,25 @@ StWidget.focused .app-well-app-running-dot { border-color: rgba(0, 0, 0, 0.3); } -.keyboard-key.default-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 { + background-color: #c0c0c0; + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); } -.keyboard-key.default-key:focus, .keyboard-key.default-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 { +.keyboard-key.default-key:focus, .keyboard-key.default-key:hover { color: #242424; - background-color: #FAFAFA; + background-color: #dadada; } -.keyboard-key.default-key:checked, .keyboard-key.default-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 { +.keyboard-key.default-key:checked, .keyboard-key.default-key:active { color: #242424; - background-color: #ebebeb; + background-color: #a7a7a7; } .keyboard-key.enter-key { color: white; background-color: #0860f2; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); } .keyboard-key.enter-key:focus, .keyboard-key.enter-key:hover { @@ -3124,6 +3124,10 @@ StWidget.focused .app-well-app-running-dot { background-color: #064cc1; } +.keyboard-key.shift-key-uppercase, .keyboard-key.shift-key-uppercase:focus, .keyboard-key.shift-key-uppercase:hover, .keyboard-key.shift-key-uppercase:checked, .keyboard-key.shift-key-uppercase:active { + color: #0860f2; +} + .keyboard-key StIcon { icon-size: 1.125em; } diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt.css b/src/main/gnome-shell/gnome-shell-light-solid-alt.css index 4578247..6008d55 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css +++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css @@ -3066,25 +3066,25 @@ StWidget.focused .app-well-app-running-dot { } .keyboard-key { - min-height: 2em; - min-width: 2em; - font-size: 14pt; + min-height: 1.2em; + min-width: 1.2em; font-weight: bold; - border-radius: 6px; + font-size: 16pt; + border-radius: 10px; border: none; - color: inherit; - background-color: #FAFAFA; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + color: #424242; + background-color: #eeeeee; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15); } .keyboard-key:focus, .keyboard-key:hover { - color: white; - background-color: #0860f2; + color: #242424; + background-color: white; } .keyboard-key:checked, .keyboard-key:active { - color: white; - background-color: #0754d4; + color: #242424; + background-color: #d5d5d5; } .keyboard-key:grayed { @@ -3093,25 +3093,25 @@ StWidget.focused .app-well-app-running-dot { border-color: rgba(0, 0, 0, 0.3); } -.keyboard-key.default-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 { + background-color: #c0c0c0; + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); } -.keyboard-key.default-key:focus, .keyboard-key.default-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 { +.keyboard-key.default-key:focus, .keyboard-key.default-key:hover { color: #242424; - background-color: #FAFAFA; + background-color: #dadada; } -.keyboard-key.default-key:checked, .keyboard-key.default-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 { +.keyboard-key.default-key:checked, .keyboard-key.default-key:active { color: #242424; - background-color: #ebebeb; + background-color: #a7a7a7; } .keyboard-key.enter-key { color: white; background-color: #0860f2; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); } .keyboard-key.enter-key:focus, .keyboard-key.enter-key:hover { @@ -3124,6 +3124,10 @@ StWidget.focused .app-well-app-running-dot { background-color: #064cc1; } +.keyboard-key.shift-key-uppercase, .keyboard-key.shift-key-uppercase:focus, .keyboard-key.shift-key-uppercase:hover, .keyboard-key.shift-key-uppercase:checked, .keyboard-key.shift-key-uppercase:active { + color: #0860f2; +} + .keyboard-key StIcon { icon-size: 1.125em; } diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css index 4578247..6008d55 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid.css +++ b/src/main/gnome-shell/gnome-shell-light-solid.css @@ -3066,25 +3066,25 @@ StWidget.focused .app-well-app-running-dot { } .keyboard-key { - min-height: 2em; - min-width: 2em; - font-size: 14pt; + min-height: 1.2em; + min-width: 1.2em; font-weight: bold; - border-radius: 6px; + font-size: 16pt; + border-radius: 10px; border: none; - color: inherit; - background-color: #FAFAFA; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + color: #424242; + background-color: #eeeeee; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15); } .keyboard-key:focus, .keyboard-key:hover { - color: white; - background-color: #0860f2; + color: #242424; + background-color: white; } .keyboard-key:checked, .keyboard-key:active { - color: white; - background-color: #0754d4; + color: #242424; + background-color: #d5d5d5; } .keyboard-key:grayed { @@ -3093,25 +3093,25 @@ StWidget.focused .app-well-app-running-dot { border-color: rgba(0, 0, 0, 0.3); } -.keyboard-key.default-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 { + background-color: #c0c0c0; + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); } -.keyboard-key.default-key:focus, .keyboard-key.default-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 { +.keyboard-key.default-key:focus, .keyboard-key.default-key:hover { color: #242424; - background-color: #FAFAFA; + background-color: #dadada; } -.keyboard-key.default-key:checked, .keyboard-key.default-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 { +.keyboard-key.default-key:checked, .keyboard-key.default-key:active { color: #242424; - background-color: #ebebeb; + background-color: #a7a7a7; } .keyboard-key.enter-key { color: white; background-color: #0860f2; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); } .keyboard-key.enter-key:focus, .keyboard-key.enter-key:hover { @@ -3124,6 +3124,10 @@ StWidget.focused .app-well-app-running-dot { background-color: #064cc1; } +.keyboard-key.shift-key-uppercase, .keyboard-key.shift-key-uppercase:focus, .keyboard-key.shift-key-uppercase:hover, .keyboard-key.shift-key-uppercase:checked, .keyboard-key.shift-key-uppercase:active { + color: #0860f2; +} + .keyboard-key StIcon { icon-size: 1.125em; } diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css index 626dd60..86e564c 100644 --- a/src/main/gnome-shell/gnome-shell-light.css +++ b/src/main/gnome-shell/gnome-shell-light.css @@ -3066,25 +3066,25 @@ StWidget.focused .app-well-app-running-dot { } .keyboard-key { - min-height: 2em; - min-width: 2em; - font-size: 14pt; + min-height: 1.2em; + min-width: 1.2em; font-weight: bold; - border-radius: 6px; + font-size: 16pt; + border-radius: 10px; border: none; - color: inherit; - background-color: #FAFAFA; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + color: #424242; + background-color: #eeeeee; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15); } .keyboard-key:focus, .keyboard-key:hover { - color: white; - background-color: #0860f2; + color: #242424; + background-color: white; } .keyboard-key:checked, .keyboard-key:active { - color: white; - background-color: #0754d4; + color: #242424; + background-color: #d5d5d5; } .keyboard-key:grayed { @@ -3093,25 +3093,25 @@ StWidget.focused .app-well-app-running-dot { border-color: rgba(0, 0, 0, 0.3); } -.keyboard-key.default-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 { + background-color: #c0c0c0; + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); } -.keyboard-key.default-key:focus, .keyboard-key.default-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 { +.keyboard-key.default-key:focus, .keyboard-key.default-key:hover { color: #242424; - background-color: #FAFAFA; + background-color: #dadada; } -.keyboard-key.default-key:checked, .keyboard-key.default-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 { +.keyboard-key.default-key:checked, .keyboard-key.default-key:active { color: #242424; - background-color: #ebebeb; + background-color: #a7a7a7; } .keyboard-key.enter-key { color: white; background-color: #0860f2; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15); } .keyboard-key.enter-key:focus, .keyboard-key.enter-key:hover { @@ -3124,6 +3124,10 @@ StWidget.focused .app-well-app-running-dot { background-color: #064cc1; } +.keyboard-key.shift-key-uppercase, .keyboard-key.shift-key-uppercase:focus, .keyboard-key.shift-key-uppercase:hover, .keyboard-key.shift-key-uppercase:checked, .keyboard-key.shift-key-uppercase:active { + color: #0860f2; +} + .keyboard-key StIcon { icon-size: 1.125em; } diff --git a/src/main/gnome-shell/gnome-shell-theme.gresource.xml b/src/main/gnome-shell/gnome-shell-theme.gresource.xml index b4d0caa..7ffd3d5 100644 --- a/src/main/gnome-shell/gnome-shell-theme.gresource.xml +++ b/src/main/gnome-shell/gnome-shell-theme.gresource.xml @@ -16,19 +16,23 @@ assets/window-close-hover.svg assets/window-close-active.svg assets/activities.svg - assets/startup.svg - assets/startup@2.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 + icons/color-pick.svg + icons/eye-not-looking-symbolic.svg + icons/eye-open-negative-filled-symbolic.svg + icons/keyboard-caps-lock-filled-symbolic.svg + icons/keyboard-enter-symbolic.svg + icons/keyboard-hide-symbolic.svg + icons/keyboard-layout-filled-symbolic.svg + icons/keyboard-shift-filled-symbolic.svg + icons/message-indicator-symbolic.svg + icons/pointer-double-click-symbolic.svg + icons/pointer-drag-symbolic.svg + icons/pointer-primary-click-symbolic.svg + icons/pointer-secondary-click-symbolic.svg gnome-shell.css + no-events.svg + no-notifications.svg + process-working.svg diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css index fa477ee..4df4c77 100644 --- a/src/main/gtk-3.0/gtk-dark-solid.css +++ b/src/main/gtk-3.0/gtk-dark-solid.css @@ -6569,7 +6569,7 @@ window.background.csd evview.view.content-view { background-color: transparent; } -box.vertical > box.vertical > box.vertical > paned.horizontal { +.background.csd > box.vertical > box.vertical > box.vertical > paned.horizontal > separator { background-image: none; background-color: #0e0e0e; } diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css index 3d0c086..d5a5669 100644 --- a/src/main/gtk-3.0/gtk-dark.css +++ b/src/main/gtk-3.0/gtk-dark.css @@ -6565,7 +6565,7 @@ window.background.csd evview.view.content-view { background-color: transparent; } -box.vertical > box.vertical > box.vertical > paned.horizontal { +.background.csd > box.vertical > box.vertical > box.vertical > paned.horizontal > separator { background-image: none; background-color: #0e0e0e; } diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css index 5d80b90..508f324 100644 --- a/src/main/gtk-3.0/gtk-light-solid.css +++ b/src/main/gtk-3.0/gtk-light-solid.css @@ -6586,7 +6586,7 @@ window.background.csd evview.view.content-view { background-color: transparent; } -box.vertical > box.vertical > box.vertical > paned.horizontal { +.background.csd > box.vertical > box.vertical > box.vertical > paned.horizontal > separator { background-image: none; background-color: #e0e0e0; } diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css index 90659e2..76d2efe 100644 --- a/src/main/gtk-3.0/gtk-light.css +++ b/src/main/gtk-3.0/gtk-light.css @@ -6582,7 +6582,7 @@ window.background.csd evview.view.content-view { background-color: transparent; } -box.vertical > box.vertical > box.vertical > paned.horizontal { +.background.csd > box.vertical > box.vertical > box.vertical > paned.horizontal > separator { background-image: none; background-color: #e0e0e0; } diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss index 61a4263..0a7928b 100644 --- a/src/sass/_colors.scss +++ b/src/sass/_colors.scss @@ -40,8 +40,8 @@ $highlight_color: if($variant == 'light', rgba(white, 0.65), r // Background colors $dark_bg_color: rgba(black, 0.6); $alt_dark_bg_color: rgba(black, 0.3); -$solid_bg_color: if($variant == 'light', #FAFAFA, #555555); // for gnome-shell keyboard -$alt_solid_bg_color: if($variant == 'light', #E0E0E0, #242424); // for gnome-shell keyboard +$solid_bg_color: if($variant == 'light', #eeeeee, #555555); // for gnome-shell keyboard +$alt_solid_bg_color: if($variant == 'light', #c0c0c0, #242424); // for gnome-shell keyboard // Link colors $link_color: #3484e2; diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss index c788a56..5447eec 100644 --- a/src/sass/gnome-shell/_common.scss +++ b/src/sass/gnome-shell/_common.scss @@ -2663,57 +2663,46 @@ StWidget.focused .app-well-app-running-dot { // .keyboard-row { spacing: 15px; } .keyboard-key { - min-height: 2em; - min-width: 2em; - font-size: 14pt; + min-height: 1.2em; + min-width: 1.2em; font-weight: bold; - border-radius: $bt_radius; + font-size: round(16) + pt; + border-radius: $mn_radius; border: none; - color: inherit; + color: $alt_fg_color; background-color: $solid_bg_color; - box-shadow: 0 1px rgba(black, 0.2); - &:focus, &:hover { color: $light_fg_color; background-color: $primary_color; } - &:checked, &:active { color: $light_fg_color; background-color: darken($primary_color, 6%); } + box-shadow: 0 1px 3px rgba(black, 0.15); + + &:focus, &:hover { color: $fg_color; background-color: if($variant == 'light', white, lighten($solid_bg_color, 10%)); } + &:checked, &:active { color: $fg_color; background-color: darken($solid_bg_color, 10%); } &: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, - &.shift-key-lowercase, - &.shift-key-uppercase, - &.hide-key, - &.layout-key { + &.default-key { // non-character keys background-color: $alt_solid_bg_color; - box-shadow: 0 1px rgba(black, 0.2); - &:focus, &:hover { color: $fg_color; background-color: $solid_bg_color; } - &:checked, &:active { color: $fg_color; background-color: darken($solid_bg_color, 6%); } + box-shadow: 0 2px 3px rgba(black, 0.15); + + &:focus, &:hover { color: $fg_color; background-color: lighten($alt_solid_bg_color, 10%); } + &:checked, &:active { color: $fg_color; background-color: darken($alt_solid_bg_color, 10%); } } - &.enter-key { + + &.enter-key { // enter key is suggested-action color: $light_fg_color; background-color: $primary_color; - box-shadow: 0 1px rgba(black, 0.2); - // background-image: url("assets/key-enter.svg"); + box-shadow: 0 2px 3px rgba(black, 0.15); + &: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"); - // } + + &.shift-key-uppercase { + &, &:focus, &:hover, &:checked, &:active { + color: $primary_color; + } + } StIcon { icon-size: 1.125em; } } diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss index f84df4f..5129198 100644 --- a/src/sass/gtk/_applications.scss +++ b/src/sass/gtk/_applications.scss @@ -2180,10 +2180,14 @@ window.background.csd { // // Eye of GNOME Image Viewer // -box.vertical > box.vertical > box.vertical{ - > paned.horizontal { - background-image: none; - background-color: $header_border; +.background.csd { + > box.vertical > box.vertical > box.vertical{ + > paned.horizontal { + > separator { + background-image: none; + background-color: $header_border; + } + } } }