diff --git a/README.md b/README.md index 51f0964b..81e238be 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,43 @@ After all the dependencies are installed, you can Run ./install.sh +#### Install tips + +Usage: `./Install` **[OPTIONS...]** + +| OPTIONS: | | +|:--------------------|:-------------| +|-d, --dest | Specify theme destination directory (Default: $HOME/.themes)| +|-n, --name | Specify theme name (Default: WhiteSur)| +|-c, --color | Specify theme color variant(s) **[light/dark]** (Default: All variants)| +|-o, --opacity | Specify theme opacity variant(s) **[standard/solid]** (Default: All variants)| +|-a, --alt | Specify titlebutton variant(s) **[standard/alt]** (Default: All variants)| +|-t, --theme | Run a terminal dialog to change the theme accent color (Default: blue)| +|-p, --panel | Run a terminal dialog to change the panel transparency (Default: 85%)| +|-s, --size | Run a terminal dialog to change the nautilus sidebar width size (Default: 200px)| +|-i, --icon | activities icon variant(s) **[standard/normal/gnome/ubuntu/arch/manjaro/fedora/debian/void]** (Default: standard variant)| +|-g, --gdm | Install GDM theme, you should run this with sudo!| +|-r, --remove | remove theme, this will remove all installed themes!| +|-h, --help | Show this help| + +If you want to change the nautilus sidebar width size, +(Nautilus cannot change the structure of the sidebar, so I added a picture as a background to achieve the effect of bigsur) +then you can run: + + ./install.sh -s + +If you want to change the panel transparency, then you can run: + + ./install.sh -p + +If you want to remove all installed themes, then you can run: + + ./install.sh -r + +If you want to remove installed gdm theme, then you can run: + + ./install.sh -r -g + ### On Snapcraft @@ -84,42 +121,6 @@ To connect the theme to all apps which have available plugs to gtk-common-themes for i in $(snap connections | grep gtk-common-themes:gtk-3-themes | awk '{print $2}'); do sudo snap connect $i whitesur-gtk-theme:gtk-3-themes; done ``` -#### Install tips - -Usage: `./Install` **[OPTIONS...]** - -| OPTIONS: | | -|:--------------------|:-------------| -|-d, --dest | Specify theme destination directory (Default: $HOME/.themes)| -|-n, --name | Specify theme name (Default: WhiteSur)| -|-c, --color | Specify theme color variant(s) **[light/dark]** (Default: All variants)| -|-o, --opacity | Specify theme opacity variant(s) **[standard/solid]** (Default: All variants)| -|-a, --alt | Specify titlebutton variant(s) **[standard/alt]** (Default: All variants)| -|-t, --trans | Run a dialg to change the panel transparency (Default: 85%)| -|-s, --size | Run a dialg to change the nautilus sidebar width size (Default: 200px)| -|-i, --icon | activities icon variant(s) **[standard/normal/gnome/ubuntu/arch/manjaro/fedora/debian/void]** (Default: standard variant)| -|-g, --gdm | Install GDM theme, you should run this with sudo!| -|-r, --remove | remove theme, this will remove all installed themes!| -|-h, --help | Show this help| - -If you want to change the nautilus sidebar width size, -(Nautilus cannot change the structure of the sidebar, so I added a picture as a background to achieve the effect of bigsur) -then you can run: - - ./install.sh -s - -If you want to change the panel transparency, then you can run: - - ./install.sh -t - -If you want to remove all installed themes, then you can run: - - ./install.sh -r - -If you want to remove installed gdm theme, then you can run: - - ./install.sh -r -g - ### Suggested themes | Suggested themes | links | preview | |:--------------------|:-------------|:-------------| diff --git a/install.sh b/install.sh index b9416524..ef9e8a20 100755 --- a/install.sh +++ b/install.sh @@ -68,9 +68,10 @@ usage() { printf " %-25s%s\n" "-n, --name NAME" "Specify theme name (Default: ${THEME_NAME})" printf " %-25s%s\n" "-o, --opacity VARIANTS" "Specify theme opacity variant(s) [standard|solid] (Default: All variants)" printf " %-25s%s\n" "-c, --color VARIANTS" "Specify theme color variant(s) [light|dark] (Default: All variants)" + printf " %-25s%s\n" "-t, --theme VARIANTS" "Run a dialog to change the theme color (Default: blue)" printf " %-25s%s\n" "-a, --alt VARIANTS" "Specify theme titilebutton variant(s) [standard|alt] (Default: All variants)" - printf " %-25s%s\n" "-t, --trans VARIANTS" "Run a dialg to change the panel transparency (Default: 85%)" - printf " %-25s%s\n" "-s, --size VARIANTS" "Run a dialg to change the nautilus sidebar width size (Default: 200px)" + printf " %-25s%s\n" "-p, --panel VARIANTS" "Run a dialog to change the panel transparency (Default: 85%)" + printf " %-25s%s\n" "-s, --size VARIANTS" "Run a dialog to change the nautilus sidebar width size (Default: 200px)" printf " %-25s%s\n" "-i, --icon VARIANTS" "Specify activities icon variant(s) for gnome-shell [standard|normal|gnome|ubuntu|arch|manjaro|fedora|debian|void] (Default: standard variant)" printf " %-25s%s\n" "-g, --gdm" "Install GDM theme, this option need root user authority! please run this with sudo" printf " %-25s%s\n" "-r, --remove" "remove theme, remove all installed themes" @@ -338,6 +339,32 @@ run_shell_dialog() { fi } +run_theme_dialog() { + if [[ -x /usr/bin/dialog ]]; then + tui=$(dialog --backtitle "${THEME_NAME} gtk theme installer" \ + --radiolist "Choose your theme color (default is Mac Blue):" 20 50 10 \ + 1 "Blue" on \ + 2 "Purple" off \ + 3 "Pink" off \ + 4 "Red" off \ + 5 "Orange" off \ + 6 "Yellow" off \ + 7 "Green" off \ + 8 "Grey" off --output-fd 1 ) + case "$tui" in + 1) theme_color="#2E7CF7" ;; + 2) theme_color="#9A57A3" ;; + 3) theme_color="#E55E9C" ;; + 4) theme_color="#ED5F5D" ;; + 5) theme_color="#E9873A" ;; + 6) theme_color="#F3BA4B" ;; + 7) theme_color="#79B757" ;; + 8) theme_color="#8C8C8C" ;; + *) operation_canceled ;; + esac + fi +} + parse_sass() { cd ${REPO_DIR} && ./parse-sass.sh } @@ -349,6 +376,105 @@ change_size() { prompt -w "Change nautilus sidebar size ..." } +change_theme_color() { + notify-send "Notice" "It will take a few minutes to regenerate the assets files, please be patient!" -i face-wink + + cd ${SRC_DIR}/sass + cp -an _colors.scss _colors.scss.bak + sed -i "s/#0860f2/$theme_color/g" _colors.scss + + cd ${SRC_DIR}/assets/gtk-3.0 + cp -an thumbnail.svg thumbnail.svg.bak + mv thumbnail-dark.png thumbnail-dark.png.bak + mv thumbnail-light.png thumbnail-light.png.bak + sed -i "s/#0860f2/$theme_color/g" thumbnail.svg + ./render-thumbnails.sh + + cd ${SRC_DIR}/assets/gtk-3.0/common-assets + cp -an assets.svg assets.svg.bak + mv assets assets-bak + sed -i "s/#0860f2/$theme_color/g" assets.svg + ./render-assets.sh + + cd ${SRC_DIR}/assets/gnome-shell/common-assets + cp -an checkbox.svg checkbox.svg.bak + cp -an more-results.svg more-results.svg.bak + cp -an toggle-on.svg toggle-on.svg.bak + sed -i "s/#0860f2/$theme_color/g" {checkbox.svg,more-results.svg,toggle-on.svg} + + cd ${SRC_DIR}/main/gtk-2.0 + cp -an gtkrc-dark gtkrc-dark.bak + cp -an gtkrc-light gtkrc-light.bak + sed -i "s/#0860f2/$theme_color/g" {gtkrc-dark,gtkrc-light} + + cd ${SRC_DIR}/assets/gtk-2.0 + cp -an assets-dark.svg assets-dark.svg.bak + cp -an assets-light.svg assets-light.svg.bak + mv assets-dark assets-dark-bak + mv assets-light assets-light-bak + sed -i "s/#0860f2/$theme_color/g" {assets-dark.svg,assets-light.svg} + ./render-assets.sh + + cd ${SRC_DIR}/assets/cinnamon + cp -an thumbnail.svg thumbnail.svg.bak + mv thumbnail-dark.png thumbnail-dark.png.bak + mv thumbnail-light.png thumbnail-light.png.bak + sed -i "s/#0860f2/$theme_color/g" thumbnail.svg + ./render-thumbnails.sh + + cd ${SRC_DIR}/assets/cinnamon/common-assets + cp -an checkbox.svg checkbox.svg.bak + cp -an radiobutton.svg radiobutton.svg.bak + cp -an add-workspace-active.svg add-workspace-active.svg.bak + cp -an menu-hover.svg menu-hover.svg.bak + cp -an toggle-on.svg toggle-on.svg.bak + cp -an corner-ripple.svg corner-ripple.svg.bak + sed -i "s/#0860f2/$theme_color/g" {checkbox.svg,radiobutton.svg,menu-hover.svg,add-workspace-active.svg,corner-ripple.svg,toggle-on.svg} + + prompt -w "Change theme color ..." +} + +restore_assets_files() { + cd ${SRC_DIR}/assets/gtk-3.0 + mv -f thumbnail.svg.bak thumbnail.svg + mv -f thumbnail-dark.png.bak thumbnail-dark.png + mv -f thumbnail-light.png.bak thumbnail-light.png + + cd ${SRC_DIR}/assets/gtk-3.0/common-assets + mv -f assets.svg.bak assets.svg + [[ -d assets-bak ]] && rm -rf assets && mv assets-bak assets + + cd ${SRC_DIR}/assets/gnome-shell/common-assets + mv -f checkbox.svg.bak checkbox.svg + mv -f more-results.svg.bak more-results.svg + mv -f toggle-on.svg.bak toggle-on.svg + + cd ${SRC_DIR}/main/gtk-2.0 + mv -f gtkrc-dark.bak gtkrc-dark + mv -f gtkrc-light.bak gtkrc-light + + cd ${SRC_DIR}/assets/gtk-2.0 + mv -f assets-dark.svg.bak assets-dark.svg + mv -f assets-light.svg.bak assets-light.svg + [[ -d assets-dark-bak ]] && rm -rf assets-dark && mv assets-dark-bak assets-dark + [[ -d assets-light-bak ]] && rm -rf assets-light && mv assets-light-bak assets-light + + cd ${SRC_DIR}/assets/cinnamon + mv -f thumbnail.svg.bak thumbnail.svg + mv -f thumbnail-dark.png.bak thumbnail-dark.png + mv -f thumbnail-light.png.bak thumbnail-light.png + + cd ${SRC_DIR}/assets/cinnamon/common-assets + mv -f checkbox.svg.bak checkbox.svg + mv -f radiobutton.svg.bak radiobutton.svg + mv -f add-workspace-active.svg.bak add-workspace-active.svg + mv -f menu-hover.svg.bak menu-hover.svg + mv -f toggle-on.svg.bak toggle-on.svg + mv -f corner-ripple.svg.bak corner-ripple.svg + + prompt -w "restore assets files ..." +} + change_transparency() { cd ${SRC_DIR}/sass cp -an _colors.scss _colors.scss.bak @@ -392,8 +518,12 @@ while [[ $# -gt 0 ]]; do size='true' shift 1 ;; - -t|--trans) - trans='true' + -t|--theme) + theme='true' + shift 1 + ;; + -p|--panel) + panel='true' shift 1 ;; -r|--remove) @@ -555,7 +685,11 @@ if [[ "${size:-}" == 'true' ]]; then fi fi -if [[ "${trans:-}" == 'true' ]]; then +if [[ "${theme:-}" == 'true' ]]; then + install_dialog && run_theme_dialog && change_theme_color && parse_sass +fi + +if [[ "${panel:-}" == 'true' ]]; then install_dialog && run_shell_dialog && change_transparency && parse_sass fi @@ -583,5 +717,11 @@ if [[ -f "${SRC_DIR}"/sass/_colors.scss.bak ]]; then restore_colors_file && parse_sass fi +if [[ -f "${SRC_DIR}"/assets/gtk-3.0/thumbnail.svg.bak ]]; then + restore_assets_files +fi + +notify-send "Finished" "Enjoy you new WhiteSur theme!" -i face-smile + echo prompt -s Done. diff --git a/render-assets.sh b/render-assets.sh index 2d6a6115..0a59ce30 100755 --- a/render-assets.sh +++ b/render-assets.sh @@ -26,38 +26,17 @@ if [ ! "$(which inkscape 2> /dev/null)" ]; then fi fi -render_thumbnail() { - local dest=$1 - local color=$2 - - if [ -f $ASRC_DIR/$1/thumbnail$2.png ]; then - echo $ASRC_DIR/$1/thumbnail$2.png exists. - else - echo - echo Rendering $ASRC_DIR/$1/thumbnail$2.png - $INKSCAPE --export-id=thumbnail$2 \ - --export-id-only \ - --export-type=png $ASRC_DIR/$1/thumbnail$2.png $ASRC_DIR/$1/thumbnail.svg >/dev/null \ - || $INKSCAPE --export-id=thumbnail$2 \ - --export-id-only \ - --export-png=$ASRC_DIR/$1/thumbnail$2.png $ASRC_DIR/$1/thumbnail.svg >/dev/null \ - && $OPTIPNG -o7 --quiet $ASRC_DIR/$1/thumbnail$2.png - fi -} - -for color in '-light' '-dark' ; do - render_thumbnail "${dest:-cinnamon}" "${color}" - render_thumbnail "${dest:-gtk-3.0}" "${color}" - render_thumbnail "${dest:-metacity-1}" "${color}" -done - echo Rendering gtk-2.0 assets cd $ASRC_DIR/gtk-2.0 && ./render-assets.sh echo Rendering gtk-3.0 assets +cd $ASRC_DIR/gtk-3.0 && ./render-thumbnails.sh cd $ASRC_DIR/gtk-3.0/common-assets && ./render-assets.sh cd $ASRC_DIR/gtk-3.0/windows-assets && ./render-assets.sh && ./render-alt-assets.sh +echo Rendering cinnamon thumbnails +cd $ASRC_DIR/cinnamon && ./render-thumbnails.sh + echo Rendering metacity-1 assets cd $ASRC_DIR/metacity-1 && ./render-assets.sh diff --git a/src/assets/cinnamon/assets-dark/checkbox.svg b/src/assets/cinnamon/assets-dark/checkbox.svg deleted file mode 100644 index 531493f0..00000000 --- a/src/assets/cinnamon/assets-dark/checkbox.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/cinnamon/assets-dark/radiobutton.svg b/src/assets/cinnamon/assets-dark/radiobutton.svg deleted file mode 100644 index 1b1306db..00000000 --- a/src/assets/cinnamon/assets-dark/radiobutton.svg +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/cinnamon/assets-light/checkbox.svg b/src/assets/cinnamon/assets-light/checkbox.svg deleted file mode 100644 index 531493f0..00000000 --- a/src/assets/cinnamon/assets-light/checkbox.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/cinnamon/assets-light/radiobutton.svg b/src/assets/cinnamon/assets-light/radiobutton.svg deleted file mode 100644 index 1b1306db..00000000 --- a/src/assets/cinnamon/assets-light/radiobutton.svg +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/cinnamon/common-assets/add-workspace-active.svg b/src/assets/cinnamon/common-assets/add-workspace-active.svg index 4ce63213..7a13f579 100644 --- a/src/assets/cinnamon/common-assets/add-workspace-active.svg +++ b/src/assets/cinnamon/common-assets/add-workspace-active.svg @@ -1,130 +1,12 @@ - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/assets/cinnamon/common-assets/checkbox.svg b/src/assets/cinnamon/common-assets/checkbox.svg new file mode 100644 index 00000000..67a41c18 --- /dev/null +++ b/src/assets/cinnamon/common-assets/checkbox.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/cinnamon/common-assets/close-active.svg b/src/assets/cinnamon/common-assets/close-active.svg index a31d8f72..0dde2b9d 100644 --- a/src/assets/cinnamon/common-assets/close-active.svg +++ b/src/assets/cinnamon/common-assets/close-active.svg @@ -1,100 +1,10 @@ - - - -image/svg+xml + + + + + + + + + + diff --git a/src/assets/cinnamon/common-assets/close-hover.svg b/src/assets/cinnamon/common-assets/close-hover.svg index 1211884b..37f8806a 100644 --- a/src/assets/cinnamon/common-assets/close-hover.svg +++ b/src/assets/cinnamon/common-assets/close-hover.svg @@ -1,100 +1,10 @@ - - - -image/svg+xml + + + + + + + + + + diff --git a/src/assets/cinnamon/common-assets/close.svg b/src/assets/cinnamon/common-assets/close.svg index 3694958a..5dcc697b 100644 --- a/src/assets/cinnamon/common-assets/close.svg +++ b/src/assets/cinnamon/common-assets/close.svg @@ -1,100 +1,10 @@ - - - -image/svg+xml + + + + + + + + + + diff --git a/src/assets/cinnamon/common-assets/corner-ripple.svg b/src/assets/cinnamon/common-assets/corner-ripple.svg index ceeded6a..e421812f 100644 --- a/src/assets/cinnamon/common-assets/corner-ripple.svg +++ b/src/assets/cinnamon/common-assets/corner-ripple.svg @@ -1,89 +1,5 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - + + + + diff --git a/src/assets/cinnamon/common-assets/menu-hover.svg b/src/assets/cinnamon/common-assets/menu-hover.svg index 7e543405..951294bf 100644 --- a/src/assets/cinnamon/common-assets/menu-hover.svg +++ b/src/assets/cinnamon/common-assets/menu-hover.svg @@ -1,105 +1,12 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - + + + + + + + + + + diff --git a/src/assets/cinnamon/common-assets/radiobutton.svg b/src/assets/cinnamon/common-assets/radiobutton.svg new file mode 100644 index 00000000..44ba2b3b --- /dev/null +++ b/src/assets/cinnamon/common-assets/radiobutton.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/cinnamon/common-assets/toggle-off.svg b/src/assets/cinnamon/common-assets/toggle-off.svg index 61b532eb..d0814423 100644 --- a/src/assets/cinnamon/common-assets/toggle-off.svg +++ b/src/assets/cinnamon/common-assets/toggle-off.svg @@ -1,88 +1,13 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/assets/cinnamon/common-assets/toggle-on.svg b/src/assets/cinnamon/common-assets/toggle-on.svg index f948aa32..1a18c706 100644 --- a/src/assets/cinnamon/common-assets/toggle-on.svg +++ b/src/assets/cinnamon/common-assets/toggle-on.svg @@ -1,153 +1,13 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/assets/cinnamon/render-thumbnails.sh b/src/assets/cinnamon/render-thumbnails.sh new file mode 100755 index 00000000..46c279f0 --- /dev/null +++ b/src/assets/cinnamon/render-thumbnails.sh @@ -0,0 +1,19 @@ +#! /bin/bash + +INKSCAPE="/usr/bin/inkscape" +OPTIPNG="/usr/bin/optipng" + +SRC_FILE="thumbnail.svg" + +[[ -f thumbnail-light.png ]] && rm -rf thumbnail-light.png +echo Rendering thumbnail-light.png + +$INKSCAPE --export-id=thumbnail-light --export-id-only --export-filename=thumbnail-light.png $SRC_FILE >/dev/null +$OPTIPNG -o7 --quiet thumbnail-light.png + +[[ -f thumbnail-dark.png ]] && rm -rf thumbnail-dark.png +echo Rendering thumbnail-dark.png +$INKSCAPE --export-id=thumbnail-dark --export-id-only --export-filename=thumbnail-dark.png $SRC_FILE >/dev/null +$OPTIPNG -o7 --quiet thumbnail-dark.png + +exit 0 diff --git a/src/assets/cinnamon/thumbnail-dark.png b/src/assets/cinnamon/thumbnail-dark.png index cb8aea03..4574fea2 100644 Binary files a/src/assets/cinnamon/thumbnail-dark.png and b/src/assets/cinnamon/thumbnail-dark.png differ diff --git a/src/assets/cinnamon/thumbnail-light.png b/src/assets/cinnamon/thumbnail-light.png index 9c48df84..f7522b05 100644 Binary files a/src/assets/cinnamon/thumbnail-light.png and b/src/assets/cinnamon/thumbnail-light.png differ diff --git a/src/assets/cinnamon/thumbnail.svg b/src/assets/cinnamon/thumbnail.svg index 0f088ad3..3b9f0992 100644 --- a/src/assets/cinnamon/thumbnail.svg +++ b/src/assets/cinnamon/thumbnail.svg @@ -1,617 +1,2131 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + - - - - - - - - - - - - + + + - - - - - - - - - - + + + + - - - - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + - - - - - - + + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + - - - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - diff --git a/src/assets/gnome-shell/common-assets/checkbox.svg b/src/assets/gnome-shell/common-assets/checkbox.svg index a9cbc9d5..4a5b3ffb 100644 --- a/src/assets/gnome-shell/common-assets/checkbox.svg +++ b/src/assets/gnome-shell/common-assets/checkbox.svg @@ -1,20 +1,18 @@ - + - - - - - - - + + + + - - + + + diff --git a/src/assets/gtk-2.0/assets-dark.svg b/src/assets/gtk-2.0/assets-dark.svg index 60703f0b..4505bfb1 100644 --- a/src/assets/gtk-2.0/assets-dark.svg +++ b/src/assets/gtk-2.0/assets-dark.svg @@ -1,9 +1,5 @@ - - - - - + @@ -100,7 +96,7 @@ - + @@ -113,53 +109,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -188,8 +141,12 @@ - + + + + + @@ -211,7 +168,7 @@ - + @@ -266,7 +223,7 @@ - + @@ -314,7 +271,7 @@ - + @@ -685,7 +642,7 @@ - + @@ -693,7 +650,7 @@ - + @@ -701,7 +658,7 @@ - + @@ -722,12 +679,12 @@ - + - + @@ -774,7 +731,7 @@ - + @@ -795,7 +752,7 @@ - + @@ -808,16 +765,16 @@ - + - + - + @@ -845,14 +802,14 @@ - + - + - + @@ -866,10 +823,11 @@ - + + diff --git a/src/assets/gtk-2.0/assets-dark/button-active-hover.png b/src/assets/gtk-2.0/assets-dark/button-active-hover.png index 3c77765f..9dc330c1 100644 Binary files a/src/assets/gtk-2.0/assets-dark/button-active-hover.png and b/src/assets/gtk-2.0/assets-dark/button-active-hover.png differ diff --git a/src/assets/gtk-2.0/assets-dark/button-active.png b/src/assets/gtk-2.0/assets-dark/button-active.png index 3f16adcb..1d663f49 100644 Binary files a/src/assets/gtk-2.0/assets-dark/button-active.png and b/src/assets/gtk-2.0/assets-dark/button-active.png differ diff --git a/src/assets/gtk-2.0/assets-dark/checkbox-checked-insensitive.png b/src/assets/gtk-2.0/assets-dark/checkbox-checked-insensitive.png index ea4b83d3..fcddb998 100644 Binary files a/src/assets/gtk-2.0/assets-dark/checkbox-checked-insensitive.png and b/src/assets/gtk-2.0/assets-dark/checkbox-checked-insensitive.png differ diff --git a/src/assets/gtk-2.0/assets-dark/checkbox-checked.png b/src/assets/gtk-2.0/assets-dark/checkbox-checked.png index 6080242a..ca9e68c2 100644 Binary files a/src/assets/gtk-2.0/assets-dark/checkbox-checked.png and b/src/assets/gtk-2.0/assets-dark/checkbox-checked.png differ diff --git a/src/assets/gtk-2.0/assets-dark/combo-entry-button-active-rtl.png b/src/assets/gtk-2.0/assets-dark/combo-entry-button-active-rtl.png index a5a58e8f..24710cf4 100644 Binary files a/src/assets/gtk-2.0/assets-dark/combo-entry-button-active-rtl.png and b/src/assets/gtk-2.0/assets-dark/combo-entry-button-active-rtl.png differ diff --git a/src/assets/gtk-2.0/assets-dark/combo-entry-button-active.png b/src/assets/gtk-2.0/assets-dark/combo-entry-button-active.png index 769eb402..b8868c74 100644 Binary files a/src/assets/gtk-2.0/assets-dark/combo-entry-button-active.png and b/src/assets/gtk-2.0/assets-dark/combo-entry-button-active.png differ diff --git a/src/assets/gtk-2.0/assets-dark/menu-checkbox-checked-insensitive.png b/src/assets/gtk-2.0/assets-dark/menu-checkbox-checked-insensitive.png index 26c1781c..b8c06177 100644 Binary files a/src/assets/gtk-2.0/assets-dark/menu-checkbox-checked-insensitive.png and b/src/assets/gtk-2.0/assets-dark/menu-checkbox-checked-insensitive.png differ diff --git a/src/assets/gtk-2.0/assets-dark/menu-checkbox-checked.png b/src/assets/gtk-2.0/assets-dark/menu-checkbox-checked.png index 56e3844f..49c0a625 100644 Binary files a/src/assets/gtk-2.0/assets-dark/menu-checkbox-checked.png and b/src/assets/gtk-2.0/assets-dark/menu-checkbox-checked.png differ diff --git a/src/assets/gtk-2.0/assets-dark/menu-radio-checked-insensitive.png b/src/assets/gtk-2.0/assets-dark/menu-radio-checked-insensitive.png index 8f809e13..7f5f64f8 100644 Binary files a/src/assets/gtk-2.0/assets-dark/menu-radio-checked-insensitive.png and b/src/assets/gtk-2.0/assets-dark/menu-radio-checked-insensitive.png differ diff --git a/src/assets/gtk-2.0/assets-dark/menu-radio-checked.png b/src/assets/gtk-2.0/assets-dark/menu-radio-checked.png index 1b753e56..647d86d9 100644 Binary files a/src/assets/gtk-2.0/assets-dark/menu-radio-checked.png and b/src/assets/gtk-2.0/assets-dark/menu-radio-checked.png differ diff --git a/src/assets/gtk-2.0/assets-dark/pathbar_button_active.png b/src/assets/gtk-2.0/assets-dark/pathbar_button_active.png index 4920dab8..ac012c02 100644 Binary files a/src/assets/gtk-2.0/assets-dark/pathbar_button_active.png and b/src/assets/gtk-2.0/assets-dark/pathbar_button_active.png differ diff --git a/src/assets/gtk-2.0/assets-dark/pathbar_button_prelight.png b/src/assets/gtk-2.0/assets-dark/pathbar_button_prelight.png index e8631069..91a6d18e 100644 Binary files a/src/assets/gtk-2.0/assets-dark/pathbar_button_prelight.png and b/src/assets/gtk-2.0/assets-dark/pathbar_button_prelight.png differ diff --git a/src/assets/gtk-2.0/assets-dark/radio-checked-insensitive.png b/src/assets/gtk-2.0/assets-dark/radio-checked-insensitive.png index ee61c359..962dcd14 100644 Binary files a/src/assets/gtk-2.0/assets-dark/radio-checked-insensitive.png and b/src/assets/gtk-2.0/assets-dark/radio-checked-insensitive.png differ diff --git a/src/assets/gtk-2.0/assets-dark/radio-checked.png b/src/assets/gtk-2.0/assets-dark/radio-checked.png index 37a67dbc..0e7f953f 100644 Binary files a/src/assets/gtk-2.0/assets-dark/radio-checked.png and b/src/assets/gtk-2.0/assets-dark/radio-checked.png differ diff --git a/src/assets/gtk-2.0/assets-light.svg b/src/assets/gtk-2.0/assets-light.svg index 9c36149a..38481536 100644 --- a/src/assets/gtk-2.0/assets-light.svg +++ b/src/assets/gtk-2.0/assets-light.svg @@ -10,7 +10,7 @@ - + @@ -19,9 +19,6 @@ - - - @@ -117,17 +114,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -178,7 +175,8 @@ - + + @@ -203,24 +201,24 @@ - - - + + + - - - + + + - + @@ -256,7 +254,7 @@ - + @@ -289,17 +287,17 @@ - - + + - + @@ -332,20 +330,20 @@ - + - - + + - + @@ -377,7 +375,7 @@ - + @@ -893,7 +891,7 @@ - + @@ -901,7 +899,7 @@ - + diff --git a/src/assets/gtk-2.0/assets-light/checkbox-checked-insensitive.png b/src/assets/gtk-2.0/assets-light/checkbox-checked-insensitive.png index 192939ca..302a921f 100644 Binary files a/src/assets/gtk-2.0/assets-light/checkbox-checked-insensitive.png and b/src/assets/gtk-2.0/assets-light/checkbox-checked-insensitive.png differ diff --git a/src/assets/gtk-2.0/assets-light/checkbox-checked.png b/src/assets/gtk-2.0/assets-light/checkbox-checked.png index f9d779ce..e4d38f67 100644 Binary files a/src/assets/gtk-2.0/assets-light/checkbox-checked.png and b/src/assets/gtk-2.0/assets-light/checkbox-checked.png differ diff --git a/src/assets/gtk-2.0/assets-light/checkbox-unchecked-insensitive.png b/src/assets/gtk-2.0/assets-light/checkbox-unchecked-insensitive.png index 4f8ffb14..3533dc29 100644 Binary files a/src/assets/gtk-2.0/assets-light/checkbox-unchecked-insensitive.png and b/src/assets/gtk-2.0/assets-light/checkbox-unchecked-insensitive.png differ diff --git a/src/assets/gtk-2.0/assets-light/checkbox-unchecked.png b/src/assets/gtk-2.0/assets-light/checkbox-unchecked.png index d5e9875a..d15b91aa 100644 Binary files a/src/assets/gtk-2.0/assets-light/checkbox-unchecked.png and b/src/assets/gtk-2.0/assets-light/checkbox-unchecked.png differ diff --git a/src/assets/gtk-2.0/assets-light/combo-entry-border-focus-rtl.png b/src/assets/gtk-2.0/assets-light/combo-entry-border-focus-rtl.png index fbb36e65..4e8bf86d 100644 Binary files a/src/assets/gtk-2.0/assets-light/combo-entry-border-focus-rtl.png and b/src/assets/gtk-2.0/assets-light/combo-entry-border-focus-rtl.png differ diff --git a/src/assets/gtk-2.0/assets-light/combo-entry-border-focus.png b/src/assets/gtk-2.0/assets-light/combo-entry-border-focus.png index 65b6e9d7..3924dbf7 100644 Binary files a/src/assets/gtk-2.0/assets-light/combo-entry-border-focus.png and b/src/assets/gtk-2.0/assets-light/combo-entry-border-focus.png differ diff --git a/src/assets/gtk-2.0/assets-light/combo-entry-focus-notebook-rtl.png b/src/assets/gtk-2.0/assets-light/combo-entry-focus-notebook-rtl.png index 0aabfc2d..340be413 100644 Binary files a/src/assets/gtk-2.0/assets-light/combo-entry-focus-notebook-rtl.png and b/src/assets/gtk-2.0/assets-light/combo-entry-focus-notebook-rtl.png differ diff --git a/src/assets/gtk-2.0/assets-light/combo-entry-focus-notebook.png b/src/assets/gtk-2.0/assets-light/combo-entry-focus-notebook.png index 35c8c8b6..dccd0b05 100644 Binary files a/src/assets/gtk-2.0/assets-light/combo-entry-focus-notebook.png and b/src/assets/gtk-2.0/assets-light/combo-entry-focus-notebook.png differ diff --git a/src/assets/gtk-2.0/assets-light/combo-entry-focus-rtl.png b/src/assets/gtk-2.0/assets-light/combo-entry-focus-rtl.png index 417e9d4a..3570a7d9 100644 Binary files a/src/assets/gtk-2.0/assets-light/combo-entry-focus-rtl.png and b/src/assets/gtk-2.0/assets-light/combo-entry-focus-rtl.png differ diff --git a/src/assets/gtk-2.0/assets-light/combo-entry-focus.png b/src/assets/gtk-2.0/assets-light/combo-entry-focus.png index b3c82e67..fb52e399 100644 Binary files a/src/assets/gtk-2.0/assets-light/combo-entry-focus.png and b/src/assets/gtk-2.0/assets-light/combo-entry-focus.png differ diff --git a/src/assets/gtk-2.0/assets-light/entry-active-bg.png b/src/assets/gtk-2.0/assets-light/entry-active-bg.png index 34277e92..a5a3b1af 100644 Binary files a/src/assets/gtk-2.0/assets-light/entry-active-bg.png and b/src/assets/gtk-2.0/assets-light/entry-active-bg.png differ diff --git a/src/assets/gtk-2.0/assets-light/entry-active-notebook.png b/src/assets/gtk-2.0/assets-light/entry-active-notebook.png index 61111617..11cfe075 100644 Binary files a/src/assets/gtk-2.0/assets-light/entry-active-notebook.png and b/src/assets/gtk-2.0/assets-light/entry-active-notebook.png differ diff --git a/src/assets/gtk-2.0/assets-light/entry-active-toolbar.png b/src/assets/gtk-2.0/assets-light/entry-active-toolbar.png index 1d17f0d9..54edca96 100644 Binary files a/src/assets/gtk-2.0/assets-light/entry-active-toolbar.png and b/src/assets/gtk-2.0/assets-light/entry-active-toolbar.png differ diff --git a/src/assets/gtk-2.0/assets-light/entry-border-active-bg.png b/src/assets/gtk-2.0/assets-light/entry-border-active-bg.png index 62038f6f..08e0f90c 100644 Binary files a/src/assets/gtk-2.0/assets-light/entry-border-active-bg.png and b/src/assets/gtk-2.0/assets-light/entry-border-active-bg.png differ diff --git a/src/assets/gtk-2.0/assets-light/menu-checkbox-checked-insensitive.png b/src/assets/gtk-2.0/assets-light/menu-checkbox-checked-insensitive.png index 44e7bced..69500581 100644 Binary files a/src/assets/gtk-2.0/assets-light/menu-checkbox-checked-insensitive.png and b/src/assets/gtk-2.0/assets-light/menu-checkbox-checked-insensitive.png differ diff --git a/src/assets/gtk-2.0/assets-light/menu-checkbox-checked.png b/src/assets/gtk-2.0/assets-light/menu-checkbox-checked.png index e0ab5848..67fba56c 100644 Binary files a/src/assets/gtk-2.0/assets-light/menu-checkbox-checked.png and b/src/assets/gtk-2.0/assets-light/menu-checkbox-checked.png differ diff --git a/src/assets/gtk-2.0/assets-light/menu-checkbox-unchecked-insensitive.png b/src/assets/gtk-2.0/assets-light/menu-checkbox-unchecked-insensitive.png index 33653512..8dc410fc 100644 Binary files a/src/assets/gtk-2.0/assets-light/menu-checkbox-unchecked-insensitive.png and b/src/assets/gtk-2.0/assets-light/menu-checkbox-unchecked-insensitive.png differ diff --git a/src/assets/gtk-2.0/assets-light/menu-checkbox-unchecked.png b/src/assets/gtk-2.0/assets-light/menu-checkbox-unchecked.png index 7988af4a..73ffb1da 100644 Binary files a/src/assets/gtk-2.0/assets-light/menu-checkbox-unchecked.png and b/src/assets/gtk-2.0/assets-light/menu-checkbox-unchecked.png differ diff --git a/src/assets/gtk-2.0/assets-light/pathbar_button_active.png b/src/assets/gtk-2.0/assets-light/pathbar_button_active.png index 4920dab8..ac012c02 100644 Binary files a/src/assets/gtk-2.0/assets-light/pathbar_button_active.png and b/src/assets/gtk-2.0/assets-light/pathbar_button_active.png differ diff --git a/src/assets/gtk-2.0/assets-light/pathbar_button_prelight.png b/src/assets/gtk-2.0/assets-light/pathbar_button_prelight.png index e8631069..91a6d18e 100644 Binary files a/src/assets/gtk-2.0/assets-light/pathbar_button_prelight.png and b/src/assets/gtk-2.0/assets-light/pathbar_button_prelight.png differ diff --git a/src/assets/gtk-2.0/assets-light/radio-checked-insensitive.png b/src/assets/gtk-2.0/assets-light/radio-checked-insensitive.png index c20aafa9..59335121 100644 Binary files a/src/assets/gtk-2.0/assets-light/radio-checked-insensitive.png and b/src/assets/gtk-2.0/assets-light/radio-checked-insensitive.png differ diff --git a/src/assets/gtk-2.0/assets-light/radio-checked.png b/src/assets/gtk-2.0/assets-light/radio-checked.png index 7ea944c0..ae683213 100644 Binary files a/src/assets/gtk-2.0/assets-light/radio-checked.png and b/src/assets/gtk-2.0/assets-light/radio-checked.png differ diff --git a/src/assets/gtk-2.0/render-assets.sh b/src/assets/gtk-2.0/render-assets.sh index 5b1d71a2..b2b1b01b 100755 --- a/src/assets/gtk-2.0/render-assets.sh +++ b/src/assets/gtk-2.0/render-assets.sh @@ -11,6 +11,8 @@ DARK_ASSETS_DIR="assets-dark" INDEX="assets.txt" +[[ -d $LIGHT_ASSETS_DIR ]] && rm -rf $LIGHT_ASSETS_DIR +[[ -d $DARK_ASSETS_DIR ]] && rm -rf $DARK_ASSETS_DIR mkdir -p $LIGHT_ASSETS_DIR && mkdir -p $DARK_ASSETS_DIR for i in `cat $INDEX` diff --git a/src/assets/gtk-3.0/common-assets/assets.svg b/src/assets/gtk-3.0/common-assets/assets.svg index c673f737..2f83e763 100644 --- a/src/assets/gtk-3.0/common-assets/assets.svg +++ b/src/assets/gtk-3.0/common-assets/assets.svg @@ -1,3986 +1,748 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/gtk-3.0/common-assets/assets.txt b/src/assets/gtk-3.0/common-assets/assets.txt index c32d08aa..28cd9379 100644 --- a/src/assets/gtk-3.0/common-assets/assets.txt +++ b/src/assets/gtk-3.0/common-assets/assets.txt @@ -76,8 +76,3 @@ combobox-arrow-dark paned-separator paned-separator-dark - -toggle-on -toggle-off -toggle-on-disabled -toggle-off-disabled diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-dark.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-dark.png index 2a4e55bb..17e09ef7 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-dark.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-dark@2.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-dark@2.png index 739a15df..203532fb 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-dark@2.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-dark@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-dark.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-dark.png index 7af5b26c..4a3c90b6 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-dark.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-dark@2.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-dark@2.png index 6199a152..42693cae 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-dark@2.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-dark@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-selected.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-selected.png index 8af64fbd..5761f1e6 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-selected.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive-selected.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive.png index 5af138b0..4e073ccb 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive@2.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive@2.png index c63239d9..4b8edce1 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive@2.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-insensitive@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selected.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selected.png index 88c56e53..41c410c9 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selected.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selected.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode-dark.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode-dark.png index 58c04cb3..3540dd2b 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode-dark.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode-dark@2.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode-dark@2.png index 5aff8c04..935efa62 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode-dark@2.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode-dark@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode.png index 59df363f..c236be2a 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode@2.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode@2.png index a4d59a27..7145ba62 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode@2.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked-selectionmode@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked.png index cd4c3c13..8c132009 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked@2.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked@2.png index 73807ee8..8c7b6735 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-checked@2.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-checked@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-dark.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-dark.png index 81710275..6b237be2 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-dark.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-dark@2.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-dark@2.png index adfcf5b0..ff07e320 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-dark@2.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-dark@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-dark.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-dark.png index 9339160d..c18edef7 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-dark.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-dark@2.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-dark@2.png index 44cd8a3b..561b8d37 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-dark@2.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-dark@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-selected.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-selected.png index 624fac29..aa75edaf 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-selected.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive-selected.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive.png index 63307c63..75ce2e49 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive@2.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive@2.png index b17c64e4..86435333 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive@2.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-insensitive@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-selected.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-selected.png index 29b11e3b..2abb6e30 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-selected.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed-selected.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed.png index 3b99a7e7..9b375bc9 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed@2.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed@2.png index 6e92f9f7..b2ee148c 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed@2.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-mixed@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode-dark.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode-dark.png index b3331ba9..a212b091 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode-dark.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode-dark@2.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode-dark@2.png index 5a8d9c34..fd5a401a 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode-dark@2.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode-dark@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode.png index aac8a79b..05a5473a 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode@2.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode@2.png index fa968c7e..81eb909d 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode@2.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-selectionmode@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-dark.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-dark.png index 7499fe88..5b47fd14 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-dark.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-dark@2.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-dark@2.png index b60754f2..79afe4c0 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-dark@2.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-dark@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-dark.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-dark.png index aaa8d44b..919cbb77 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-dark.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-dark@2.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-dark@2.png index 4075356c..f0a71b67 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-dark@2.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-dark@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-selected.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-selected.png index 6bba300f..557eeefb 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-selected.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive-selected.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive.png index fe338aca..67880e85 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive@2.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive@2.png index 334d1813..481683f2 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive@2.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-insensitive@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-selected.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-selected.png index 9a1362a0..cae35a70 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-selected.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked-selected.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked.png index a823fdf6..2a384247 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked@2.png b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked@2.png index 9ff93729..b4677206 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked@2.png and b/src/assets/gtk-3.0/common-assets/assets/checkbox-unchecked@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/combobox-arrow-dark.png b/src/assets/gtk-3.0/common-assets/assets/combobox-arrow-dark.png index 1d5fe893..959e3ed2 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/combobox-arrow-dark.png and b/src/assets/gtk-3.0/common-assets/assets/combobox-arrow-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/combobox-arrow-dark@2.png b/src/assets/gtk-3.0/common-assets/assets/combobox-arrow-dark@2.png index d65f2a42..4ae7c77f 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/combobox-arrow-dark@2.png and b/src/assets/gtk-3.0/common-assets/assets/combobox-arrow-dark@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/combobox-arrow.png b/src/assets/gtk-3.0/common-assets/assets/combobox-arrow.png index eecfbe36..01b33168 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/combobox-arrow.png and b/src/assets/gtk-3.0/common-assets/assets/combobox-arrow.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/combobox-arrow@2.png b/src/assets/gtk-3.0/common-assets/assets/combobox-arrow@2.png index 9c990188..2d99a9ce 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/combobox-arrow@2.png and b/src/assets/gtk-3.0/common-assets/assets/combobox-arrow@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-dark.png b/src/assets/gtk-3.0/common-assets/assets/radio-checked-dark.png index 63f2d38e..ea1e206c 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-checked-dark.png and b/src/assets/gtk-3.0/common-assets/assets/radio-checked-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-dark@2.png b/src/assets/gtk-3.0/common-assets/assets/radio-checked-dark@2.png index 9435113e..f04dc211 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-checked-dark@2.png and b/src/assets/gtk-3.0/common-assets/assets/radio-checked-dark@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-dark.png b/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-dark.png index 5e8196a4..6257d6ec 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-dark.png and b/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-dark@2.png b/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-dark@2.png index 09f7f928..b79cfab6 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-dark@2.png and b/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-dark@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-selected.png b/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-selected.png index 0f0b2df7..6530d059 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-selected.png and b/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-selected.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-selected@2.png b/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-selected@2.png index 57282606..3795b542 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-selected@2.png and b/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive-selected@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive.png b/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive.png index afffe2c3..97476ecf 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive.png and b/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive@2.png b/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive@2.png index 5a7184bf..f967704a 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive@2.png and b/src/assets/gtk-3.0/common-assets/assets/radio-checked-insensitive@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-selected.png b/src/assets/gtk-3.0/common-assets/assets/radio-checked-selected.png index 2fd39f61..958ac1d7 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-checked-selected.png and b/src/assets/gtk-3.0/common-assets/assets/radio-checked-selected.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked-selected@2.png b/src/assets/gtk-3.0/common-assets/assets/radio-checked-selected@2.png index b2ef488a..e47b88d2 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-checked-selected@2.png and b/src/assets/gtk-3.0/common-assets/assets/radio-checked-selected@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked.png b/src/assets/gtk-3.0/common-assets/assets/radio-checked.png index 29dd5b9e..408a984d 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-checked.png and b/src/assets/gtk-3.0/common-assets/assets/radio-checked.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-checked@2.png b/src/assets/gtk-3.0/common-assets/assets/radio-checked@2.png index 64d3473b..c414c5c8 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-checked@2.png and b/src/assets/gtk-3.0/common-assets/assets/radio-checked@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-dark.png b/src/assets/gtk-3.0/common-assets/assets/radio-mixed-dark.png index 922edaa5..c9685abc 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-dark.png and b/src/assets/gtk-3.0/common-assets/assets/radio-mixed-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-dark@2.png b/src/assets/gtk-3.0/common-assets/assets/radio-mixed-dark@2.png index 5bb3dd07..c05f4cd6 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-dark@2.png and b/src/assets/gtk-3.0/common-assets/assets/radio-mixed-dark@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-dark.png b/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-dark.png index d2af67b8..a601d3f7 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-dark.png and b/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-dark@2.png b/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-dark@2.png index 8ff58e72..7807e07f 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-dark@2.png and b/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-dark@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-selected.png b/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-selected.png index 71394701..8e519f55 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-selected.png and b/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive-selected.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive.png b/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive.png index 6b3109a5..07435b7a 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive.png and b/src/assets/gtk-3.0/common-assets/assets/radio-mixed-insensitive.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-selected.png b/src/assets/gtk-3.0/common-assets/assets/radio-mixed-selected.png index 95b6c91f..d00d856d 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-mixed-selected.png and b/src/assets/gtk-3.0/common-assets/assets/radio-mixed-selected.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed.png b/src/assets/gtk-3.0/common-assets/assets/radio-mixed.png index 42af8a03..cc3b0cea 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-mixed.png and b/src/assets/gtk-3.0/common-assets/assets/radio-mixed.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-mixed@2.png b/src/assets/gtk-3.0/common-assets/assets/radio-mixed@2.png index f63e0a7f..61039e06 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-mixed@2.png and b/src/assets/gtk-3.0/common-assets/assets/radio-mixed@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-dark.png b/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-dark.png index edc82c58..bc67c1ac 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-dark.png and b/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive-dark.png b/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive-dark.png index e943f590..9199e1e7 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive-dark.png and b/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive-selected.png b/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive-selected.png index c3246a49..4d662a5c 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive-selected.png and b/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive-selected.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive.png b/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive.png index 48dde1f2..c4062a17 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive.png and b/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-insensitive.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-selected.png b/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-selected.png index 61be37e6..261fc5ef 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-selected.png and b/src/assets/gtk-3.0/common-assets/assets/radio-unchecked-selected.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked.png b/src/assets/gtk-3.0/common-assets/assets/radio-unchecked.png index 2c052af5..3bb68990 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/radio-unchecked.png and b/src/assets/gtk-3.0/common-assets/assets/radio-unchecked.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/setting-dark.png b/src/assets/gtk-3.0/common-assets/assets/setting-dark.png index 97e91c07..6f981219 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/setting-dark.png and b/src/assets/gtk-3.0/common-assets/assets/setting-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/setting-icon-dark.png b/src/assets/gtk-3.0/common-assets/assets/setting-icon-dark.png index 74eecf06..50e707cd 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/setting-icon-dark.png and b/src/assets/gtk-3.0/common-assets/assets/setting-icon-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/setting-icon.png b/src/assets/gtk-3.0/common-assets/assets/setting-icon.png index 9ec17227..81b267c2 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/setting-icon.png and b/src/assets/gtk-3.0/common-assets/assets/setting-icon.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/setting.png b/src/assets/gtk-3.0/common-assets/assets/setting.png index 405fcfb4..78274891 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/setting.png and b/src/assets/gtk-3.0/common-assets/assets/setting.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-active.png b/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-active.png index d9afcaa6..494db636 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-active.png and b/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-active.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-hover.png b/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-hover.png index bf64e001..868650f1 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-hover.png and b/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-hover.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-insensitive.png b/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-insensitive.png index 99abe092..97b995d8 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-insensitive.png and b/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above-insensitive.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above.png b/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above.png index e8d35528..7e9d4d19 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above.png and b/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-above.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-active.png b/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-active.png index f820560b..5502303f 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-active.png and b/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-active.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-hover.png b/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-hover.png index 4027e143..d8a29e88 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-hover.png and b/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-hover.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-insensitive.png b/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-insensitive.png index 2998eeab..76e3a863 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-insensitive.png and b/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below-insensitive.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below.png b/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below.png index 502ef94f..b85a9855 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below.png and b/src/assets/gtk-3.0/common-assets/assets/slider-horz-scale-has-marks-below.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-active.png b/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-active.png index 4685393d..e92c9fe9 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-active.png and b/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-active.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-hover.png b/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-hover.png index 01c2d05e..5812aafc 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-hover.png and b/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-hover.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-insensitive.png b/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-insensitive.png index bf19a038..e2d1f05a 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-insensitive.png and b/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above-insensitive.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above.png b/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above.png index 90dc7223..8b5c591e 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above.png and b/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-above.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-active.png b/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-active.png index bf5c972e..410e5b09 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-active.png and b/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-active.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-hover.png b/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-hover.png index f3531e94..154f1ec5 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-hover.png and b/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-hover.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-insensitive.png b/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-insensitive.png index b68dae4e..70734ab9 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-insensitive.png and b/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below-insensitive.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below.png b/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below.png index 7bdf0c29..f957b0b1 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below.png and b/src/assets/gtk-3.0/common-assets/assets/slider-vert-scale-has-marks-below.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/switch-active-hover.png b/src/assets/gtk-3.0/common-assets/assets/switch-active-hover.png index abcb59a7..d0641586 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/switch-active-hover.png and b/src/assets/gtk-3.0/common-assets/assets/switch-active-hover.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/switch-active-insensitive.png b/src/assets/gtk-3.0/common-assets/assets/switch-active-insensitive.png index b8965854..2d39b1dc 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/switch-active-insensitive.png and b/src/assets/gtk-3.0/common-assets/assets/switch-active-insensitive.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/switch-active-insensitive@2.png b/src/assets/gtk-3.0/common-assets/assets/switch-active-insensitive@2.png index 6c1eacd6..30765e03 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/switch-active-insensitive@2.png and b/src/assets/gtk-3.0/common-assets/assets/switch-active-insensitive@2.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/switch-active.png b/src/assets/gtk-3.0/common-assets/assets/switch-active.png index 8a6fc8d1..adb6c174 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/switch-active.png and b/src/assets/gtk-3.0/common-assets/assets/switch-active.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/switch-hover.png b/src/assets/gtk-3.0/common-assets/assets/switch-hover.png index e55bcd7a..fc50dbd9 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/switch-hover.png and b/src/assets/gtk-3.0/common-assets/assets/switch-hover.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/switch-insensitive-dark.png b/src/assets/gtk-3.0/common-assets/assets/switch-insensitive-dark.png index 20d8a6e5..678b783b 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/switch-insensitive-dark.png and b/src/assets/gtk-3.0/common-assets/assets/switch-insensitive-dark.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/switch-insensitive.png b/src/assets/gtk-3.0/common-assets/assets/switch-insensitive.png index 3056d659..e40787a9 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/switch-insensitive.png and b/src/assets/gtk-3.0/common-assets/assets/switch-insensitive.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/switch.png b/src/assets/gtk-3.0/common-assets/assets/switch.png index c0909c48..acb6fae7 100644 Binary files a/src/assets/gtk-3.0/common-assets/assets/switch.png and b/src/assets/gtk-3.0/common-assets/assets/switch.png differ diff --git a/src/assets/gtk-3.0/common-assets/assets/toggle-off-disabled.png b/src/assets/gtk-3.0/common-assets/assets/toggle-off-disabled.png deleted file mode 100644 index 40f456d4..00000000 Binary files a/src/assets/gtk-3.0/common-assets/assets/toggle-off-disabled.png and /dev/null differ diff --git a/src/assets/gtk-3.0/common-assets/assets/toggle-off-disabled@2.png b/src/assets/gtk-3.0/common-assets/assets/toggle-off-disabled@2.png deleted file mode 100644 index 71d6e37e..00000000 Binary files a/src/assets/gtk-3.0/common-assets/assets/toggle-off-disabled@2.png and /dev/null differ diff --git a/src/assets/gtk-3.0/common-assets/assets/toggle-off.png b/src/assets/gtk-3.0/common-assets/assets/toggle-off.png deleted file mode 100644 index 2c651cb7..00000000 Binary files a/src/assets/gtk-3.0/common-assets/assets/toggle-off.png and /dev/null differ diff --git a/src/assets/gtk-3.0/common-assets/assets/toggle-off@2.png b/src/assets/gtk-3.0/common-assets/assets/toggle-off@2.png deleted file mode 100644 index 9c543a4e..00000000 Binary files a/src/assets/gtk-3.0/common-assets/assets/toggle-off@2.png and /dev/null differ diff --git a/src/assets/gtk-3.0/common-assets/assets/toggle-on-disabled.png b/src/assets/gtk-3.0/common-assets/assets/toggle-on-disabled.png deleted file mode 100644 index e1919b3e..00000000 Binary files a/src/assets/gtk-3.0/common-assets/assets/toggle-on-disabled.png and /dev/null differ diff --git a/src/assets/gtk-3.0/common-assets/assets/toggle-on-disabled@2.png b/src/assets/gtk-3.0/common-assets/assets/toggle-on-disabled@2.png deleted file mode 100644 index b8f408d4..00000000 Binary files a/src/assets/gtk-3.0/common-assets/assets/toggle-on-disabled@2.png and /dev/null differ diff --git a/src/assets/gtk-3.0/common-assets/assets/toggle-on.png b/src/assets/gtk-3.0/common-assets/assets/toggle-on.png deleted file mode 100644 index 3f7e18bf..00000000 Binary files a/src/assets/gtk-3.0/common-assets/assets/toggle-on.png and /dev/null differ diff --git a/src/assets/gtk-3.0/common-assets/assets/toggle-on@2.png b/src/assets/gtk-3.0/common-assets/assets/toggle-on@2.png deleted file mode 100644 index ee39ca24..00000000 Binary files a/src/assets/gtk-3.0/common-assets/assets/toggle-on@2.png and /dev/null differ diff --git a/src/assets/gtk-3.0/common-assets/render-assets.sh b/src/assets/gtk-3.0/common-assets/render-assets.sh index 037b1d6a..0d3af934 100755 --- a/src/assets/gtk-3.0/common-assets/render-assets.sh +++ b/src/assets/gtk-3.0/common-assets/render-assets.sh @@ -7,6 +7,7 @@ SRC_FILE="assets.svg" ASSETS_DIR="assets" INDEX="assets.txt" +[[ -d $ASSETS_DIR ]] && rm -rf $ASSETS_DIR mkdir -p $ASSETS_DIR for i in `cat $INDEX` diff --git a/src/assets/gtk-3.0/common-assets/render-sidebar-assets.sh b/src/assets/gtk-3.0/common-assets/render-sidebar-assets.sh index 5c184896..307abcc8 100755 --- a/src/assets/gtk-3.0/common-assets/render-sidebar-assets.sh +++ b/src/assets/gtk-3.0/common-assets/render-sidebar-assets.sh @@ -7,6 +7,7 @@ SRC_FILE="sidebar-assets.svg" ASSETS_DIR="sidebar-assets" INDEX="sidebar-assets.txt" +[[ -d $ASSETS_DIR ]] && rm -rf $ASSETS_DIR mkdir -p $ASSETS_DIR for i in `cat $INDEX` diff --git a/src/assets/gtk-3.0/render-thumbnails.sh b/src/assets/gtk-3.0/render-thumbnails.sh new file mode 100755 index 00000000..46c279f0 --- /dev/null +++ b/src/assets/gtk-3.0/render-thumbnails.sh @@ -0,0 +1,19 @@ +#! /bin/bash + +INKSCAPE="/usr/bin/inkscape" +OPTIPNG="/usr/bin/optipng" + +SRC_FILE="thumbnail.svg" + +[[ -f thumbnail-light.png ]] && rm -rf thumbnail-light.png +echo Rendering thumbnail-light.png + +$INKSCAPE --export-id=thumbnail-light --export-id-only --export-filename=thumbnail-light.png $SRC_FILE >/dev/null +$OPTIPNG -o7 --quiet thumbnail-light.png + +[[ -f thumbnail-dark.png ]] && rm -rf thumbnail-dark.png +echo Rendering thumbnail-dark.png +$INKSCAPE --export-id=thumbnail-dark --export-id-only --export-filename=thumbnail-dark.png $SRC_FILE >/dev/null +$OPTIPNG -o7 --quiet thumbnail-dark.png + +exit 0 diff --git a/src/assets/gtk-3.0/thumbnail-dark.png b/src/assets/gtk-3.0/thumbnail-dark.png index 1c51a25b..0a217696 100644 Binary files a/src/assets/gtk-3.0/thumbnail-dark.png and b/src/assets/gtk-3.0/thumbnail-dark.png differ diff --git a/src/assets/gtk-3.0/thumbnail-light.png b/src/assets/gtk-3.0/thumbnail-light.png index 41b6c229..3606470c 100644 Binary files a/src/assets/gtk-3.0/thumbnail-light.png and b/src/assets/gtk-3.0/thumbnail-light.png differ diff --git a/src/assets/gtk-3.0/thumbnail.svg b/src/assets/gtk-3.0/thumbnail.svg index cf81a60b..86e403e8 100644 --- a/src/assets/gtk-3.0/thumbnail.svg +++ b/src/assets/gtk-3.0/thumbnail.svg @@ -1,142 +1,111 @@ - + - + - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/assets/close.png b/src/assets/metacity-1/assets/close.png index 67c9820a..db6b8594 100644 Binary files a/src/assets/metacity-1/assets/close.png and b/src/assets/metacity-1/assets/close.png differ diff --git a/src/assets/metacity-1/assets/close_focused_prelight.png b/src/assets/metacity-1/assets/close_focused_prelight.png index ef18ebe4..5b202cd1 100644 Binary files a/src/assets/metacity-1/assets/close_focused_prelight.png and b/src/assets/metacity-1/assets/close_focused_prelight.png differ diff --git a/src/assets/metacity-1/assets/close_focused_pressed.png b/src/assets/metacity-1/assets/close_focused_pressed.png index 2597ab36..7b1b7a6a 100644 Binary files a/src/assets/metacity-1/assets/close_focused_pressed.png and b/src/assets/metacity-1/assets/close_focused_pressed.png differ diff --git a/src/assets/metacity-1/assets/close_unfocused.png b/src/assets/metacity-1/assets/close_unfocused.png index 6090befc..1dccc91d 100644 Binary files a/src/assets/metacity-1/assets/close_unfocused.png and b/src/assets/metacity-1/assets/close_unfocused.png differ diff --git a/src/assets/metacity-1/assets/maximize.png b/src/assets/metacity-1/assets/maximize.png index 0c902019..e8950698 100644 Binary files a/src/assets/metacity-1/assets/maximize.png and b/src/assets/metacity-1/assets/maximize.png differ diff --git a/src/assets/metacity-1/assets/maximize_focused_prelight.png b/src/assets/metacity-1/assets/maximize_focused_prelight.png index b40a5ebe..3c171a58 100644 Binary files a/src/assets/metacity-1/assets/maximize_focused_prelight.png and b/src/assets/metacity-1/assets/maximize_focused_prelight.png differ diff --git a/src/assets/metacity-1/assets/maximize_focused_pressed.png b/src/assets/metacity-1/assets/maximize_focused_pressed.png index 7f3bb40c..17518274 100644 Binary files a/src/assets/metacity-1/assets/maximize_focused_pressed.png and b/src/assets/metacity-1/assets/maximize_focused_pressed.png differ diff --git a/src/assets/metacity-1/assets/maximize_unfocused.png b/src/assets/metacity-1/assets/maximize_unfocused.png index 6090befc..1dccc91d 100644 Binary files a/src/assets/metacity-1/assets/maximize_unfocused.png and b/src/assets/metacity-1/assets/maximize_unfocused.png differ diff --git a/src/assets/metacity-1/assets/menu.png b/src/assets/metacity-1/assets/menu.png index 6090befc..1dccc91d 100644 Binary files a/src/assets/metacity-1/assets/menu.png and b/src/assets/metacity-1/assets/menu.png differ diff --git a/src/assets/metacity-1/assets/menu_focused_prelight.png b/src/assets/metacity-1/assets/menu_focused_prelight.png index d7960ebe..c05ffaa2 100644 Binary files a/src/assets/metacity-1/assets/menu_focused_prelight.png and b/src/assets/metacity-1/assets/menu_focused_prelight.png differ diff --git a/src/assets/metacity-1/assets/menu_focused_pressed.png b/src/assets/metacity-1/assets/menu_focused_pressed.png index 79baac05..0088522f 100644 Binary files a/src/assets/metacity-1/assets/menu_focused_pressed.png and b/src/assets/metacity-1/assets/menu_focused_pressed.png differ diff --git a/src/assets/metacity-1/assets/menu_unfocused.png b/src/assets/metacity-1/assets/menu_unfocused.png index 6090befc..1dccc91d 100644 Binary files a/src/assets/metacity-1/assets/menu_unfocused.png and b/src/assets/metacity-1/assets/menu_unfocused.png differ diff --git a/src/assets/metacity-1/assets/minimize.png b/src/assets/metacity-1/assets/minimize.png index 682950aa..a6a9393f 100644 Binary files a/src/assets/metacity-1/assets/minimize.png and b/src/assets/metacity-1/assets/minimize.png differ diff --git a/src/assets/metacity-1/assets/minimize_focused_prelight.png b/src/assets/metacity-1/assets/minimize_focused_prelight.png index dba6e23f..dfb60fcb 100644 Binary files a/src/assets/metacity-1/assets/minimize_focused_prelight.png and b/src/assets/metacity-1/assets/minimize_focused_prelight.png differ diff --git a/src/assets/metacity-1/assets/minimize_focused_pressed.png b/src/assets/metacity-1/assets/minimize_focused_pressed.png index f49c5d7a..d2d30d6f 100644 Binary files a/src/assets/metacity-1/assets/minimize_focused_pressed.png and b/src/assets/metacity-1/assets/minimize_focused_pressed.png differ diff --git a/src/assets/metacity-1/assets/minimize_unfocused.png b/src/assets/metacity-1/assets/minimize_unfocused.png index 6090befc..1dccc91d 100644 Binary files a/src/assets/metacity-1/assets/minimize_unfocused.png and b/src/assets/metacity-1/assets/minimize_unfocused.png differ diff --git a/src/assets/metacity-1/assets/shade.png b/src/assets/metacity-1/assets/shade.png index a21f4c30..983b42c3 100644 Binary files a/src/assets/metacity-1/assets/shade.png and b/src/assets/metacity-1/assets/shade.png differ diff --git a/src/assets/metacity-1/assets/shade_focused_prelight.png b/src/assets/metacity-1/assets/shade_focused_prelight.png index d1676d26..046e5208 100644 Binary files a/src/assets/metacity-1/assets/shade_focused_prelight.png and b/src/assets/metacity-1/assets/shade_focused_prelight.png differ diff --git a/src/assets/metacity-1/assets/shade_focused_pressed.png b/src/assets/metacity-1/assets/shade_focused_pressed.png index 0e8e1740..161058cc 100644 Binary files a/src/assets/metacity-1/assets/shade_focused_pressed.png and b/src/assets/metacity-1/assets/shade_focused_pressed.png differ diff --git a/src/assets/metacity-1/assets/shade_unfocused.png b/src/assets/metacity-1/assets/shade_unfocused.png index 6090befc..1dccc91d 100644 Binary files a/src/assets/metacity-1/assets/shade_unfocused.png and b/src/assets/metacity-1/assets/shade_unfocused.png differ diff --git a/src/assets/metacity-1/assets/unmaximize.png b/src/assets/metacity-1/assets/unmaximize.png index 0c902019..e8950698 100644 Binary files a/src/assets/metacity-1/assets/unmaximize.png and b/src/assets/metacity-1/assets/unmaximize.png differ diff --git a/src/assets/metacity-1/assets/unmaximize_focused_prelight.png b/src/assets/metacity-1/assets/unmaximize_focused_prelight.png index 3c71eb5f..3d02b21e 100644 Binary files a/src/assets/metacity-1/assets/unmaximize_focused_prelight.png and b/src/assets/metacity-1/assets/unmaximize_focused_prelight.png differ diff --git a/src/assets/metacity-1/assets/unmaximize_focused_pressed.png b/src/assets/metacity-1/assets/unmaximize_focused_pressed.png index 9c379eae..489715ab 100644 Binary files a/src/assets/metacity-1/assets/unmaximize_focused_pressed.png and b/src/assets/metacity-1/assets/unmaximize_focused_pressed.png differ diff --git a/src/assets/metacity-1/assets/unmaximize_unfocused.png b/src/assets/metacity-1/assets/unmaximize_unfocused.png index 6090befc..1dccc91d 100644 Binary files a/src/assets/metacity-1/assets/unmaximize_unfocused.png and b/src/assets/metacity-1/assets/unmaximize_unfocused.png differ diff --git a/src/assets/metacity-1/assets/unshade.png b/src/assets/metacity-1/assets/unshade.png index a21f4c30..983b42c3 100644 Binary files a/src/assets/metacity-1/assets/unshade.png and b/src/assets/metacity-1/assets/unshade.png differ diff --git a/src/assets/metacity-1/assets/unshade_focused_prelight.png b/src/assets/metacity-1/assets/unshade_focused_prelight.png index 2b335ecd..1df38449 100644 Binary files a/src/assets/metacity-1/assets/unshade_focused_prelight.png and b/src/assets/metacity-1/assets/unshade_focused_prelight.png differ diff --git a/src/assets/metacity-1/assets/unshade_focused_pressed.png b/src/assets/metacity-1/assets/unshade_focused_pressed.png index 3312c277..b43b54da 100644 Binary files a/src/assets/metacity-1/assets/unshade_focused_pressed.png and b/src/assets/metacity-1/assets/unshade_focused_pressed.png differ diff --git a/src/assets/metacity-1/assets/unshade_unfocused.png b/src/assets/metacity-1/assets/unshade_unfocused.png index 6090befc..1dccc91d 100644 Binary files a/src/assets/metacity-1/assets/unshade_unfocused.png and b/src/assets/metacity-1/assets/unshade_unfocused.png differ diff --git a/src/assets/metacity-1/render-assets.sh b/src/assets/metacity-1/render-assets.sh index 7f6371bc..08b6752c 100755 --- a/src/assets/metacity-1/render-assets.sh +++ b/src/assets/metacity-1/render-assets.sh @@ -7,6 +7,7 @@ SRC_FILE="assets.svg" ASSETS_DIR="assets" INDEX="assets.txt" +[[ -d $ASSETS_DIR ]] && rm -rf $ASSETS_DIR mkdir -p $ASSETS_DIR for i in `cat $INDEX` @@ -18,7 +19,7 @@ else echo Rendering $ASSETS_DIR/$i.png $INKSCAPE --export-id=$i \ --export-id-only \ - --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null #\ + --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null #\ # && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png fi done diff --git a/src/assets/xfwm4/assets-dark/bottom-active.png b/src/assets/xfwm4/assets-dark/bottom-active.png index 9cf94573..dc64dd99 100644 Binary files a/src/assets/xfwm4/assets-dark/bottom-active.png and b/src/assets/xfwm4/assets-dark/bottom-active.png differ diff --git a/src/assets/xfwm4/assets-dark/bottom-inactive.png b/src/assets/xfwm4/assets-dark/bottom-inactive.png index 9cf94573..dc64dd99 100644 Binary files a/src/assets/xfwm4/assets-dark/bottom-inactive.png and b/src/assets/xfwm4/assets-dark/bottom-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/bottom-left-active.png b/src/assets/xfwm4/assets-dark/bottom-left-active.png index 97f1d2b2..332adbaa 100644 Binary files a/src/assets/xfwm4/assets-dark/bottom-left-active.png and b/src/assets/xfwm4/assets-dark/bottom-left-active.png differ diff --git a/src/assets/xfwm4/assets-dark/bottom-left-inactive.png b/src/assets/xfwm4/assets-dark/bottom-left-inactive.png index 97f1d2b2..332adbaa 100644 Binary files a/src/assets/xfwm4/assets-dark/bottom-left-inactive.png and b/src/assets/xfwm4/assets-dark/bottom-left-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/bottom-right-active.png b/src/assets/xfwm4/assets-dark/bottom-right-active.png index be365ea7..915445ac 100644 Binary files a/src/assets/xfwm4/assets-dark/bottom-right-active.png and b/src/assets/xfwm4/assets-dark/bottom-right-active.png differ diff --git a/src/assets/xfwm4/assets-dark/bottom-right-inactive.png b/src/assets/xfwm4/assets-dark/bottom-right-inactive.png index f2ff6bfb..51501fd2 100644 Binary files a/src/assets/xfwm4/assets-dark/bottom-right-inactive.png and b/src/assets/xfwm4/assets-dark/bottom-right-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/close-active.png b/src/assets/xfwm4/assets-dark/close-active.png index 3fde2132..97975d24 100644 Binary files a/src/assets/xfwm4/assets-dark/close-active.png and b/src/assets/xfwm4/assets-dark/close-active.png differ diff --git a/src/assets/xfwm4/assets-dark/close-inactive.png b/src/assets/xfwm4/assets-dark/close-inactive.png index fbb5f631..76211a8e 100644 Binary files a/src/assets/xfwm4/assets-dark/close-inactive.png and b/src/assets/xfwm4/assets-dark/close-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/close-prelight.png b/src/assets/xfwm4/assets-dark/close-prelight.png index 6b369e3a..83d74141 100644 Binary files a/src/assets/xfwm4/assets-dark/close-prelight.png and b/src/assets/xfwm4/assets-dark/close-prelight.png differ diff --git a/src/assets/xfwm4/assets-dark/close-pressed.png b/src/assets/xfwm4/assets-dark/close-pressed.png index 58289d43..94b257ba 100644 Binary files a/src/assets/xfwm4/assets-dark/close-pressed.png and b/src/assets/xfwm4/assets-dark/close-pressed.png differ diff --git a/src/assets/xfwm4/assets-dark/hide-active.png b/src/assets/xfwm4/assets-dark/hide-active.png index d019664f..8d4443c7 100644 Binary files a/src/assets/xfwm4/assets-dark/hide-active.png and b/src/assets/xfwm4/assets-dark/hide-active.png differ diff --git a/src/assets/xfwm4/assets-dark/hide-inactive.png b/src/assets/xfwm4/assets-dark/hide-inactive.png index fbb5f631..76211a8e 100644 Binary files a/src/assets/xfwm4/assets-dark/hide-inactive.png and b/src/assets/xfwm4/assets-dark/hide-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/hide-prelight.png b/src/assets/xfwm4/assets-dark/hide-prelight.png index 25311d36..64ca1235 100644 Binary files a/src/assets/xfwm4/assets-dark/hide-prelight.png and b/src/assets/xfwm4/assets-dark/hide-prelight.png differ diff --git a/src/assets/xfwm4/assets-dark/hide-pressed.png b/src/assets/xfwm4/assets-dark/hide-pressed.png index 34ae4ae9..69a182c5 100644 Binary files a/src/assets/xfwm4/assets-dark/hide-pressed.png and b/src/assets/xfwm4/assets-dark/hide-pressed.png differ diff --git a/src/assets/xfwm4/assets-dark/left-active.png b/src/assets/xfwm4/assets-dark/left-active.png index a47e034e..b22507fa 100644 Binary files a/src/assets/xfwm4/assets-dark/left-active.png and b/src/assets/xfwm4/assets-dark/left-active.png differ diff --git a/src/assets/xfwm4/assets-dark/left-inactive.png b/src/assets/xfwm4/assets-dark/left-inactive.png index a47e034e..b22507fa 100644 Binary files a/src/assets/xfwm4/assets-dark/left-inactive.png and b/src/assets/xfwm4/assets-dark/left-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/maximize-active.png b/src/assets/xfwm4/assets-dark/maximize-active.png index 3b114983..7b095c2c 100644 Binary files a/src/assets/xfwm4/assets-dark/maximize-active.png and b/src/assets/xfwm4/assets-dark/maximize-active.png differ diff --git a/src/assets/xfwm4/assets-dark/maximize-inactive.png b/src/assets/xfwm4/assets-dark/maximize-inactive.png index fbb5f631..76211a8e 100644 Binary files a/src/assets/xfwm4/assets-dark/maximize-inactive.png and b/src/assets/xfwm4/assets-dark/maximize-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/maximize-prelight.png b/src/assets/xfwm4/assets-dark/maximize-prelight.png index 90e35589..a2c8aed6 100644 Binary files a/src/assets/xfwm4/assets-dark/maximize-prelight.png and b/src/assets/xfwm4/assets-dark/maximize-prelight.png differ diff --git a/src/assets/xfwm4/assets-dark/maximize-pressed.png b/src/assets/xfwm4/assets-dark/maximize-pressed.png index 3e833d20..6ae0dee7 100644 Binary files a/src/assets/xfwm4/assets-dark/maximize-pressed.png and b/src/assets/xfwm4/assets-dark/maximize-pressed.png differ diff --git a/src/assets/xfwm4/assets-dark/maximize-toggled-active.png b/src/assets/xfwm4/assets-dark/maximize-toggled-active.png index 3b114983..7b095c2c 100644 Binary files a/src/assets/xfwm4/assets-dark/maximize-toggled-active.png and b/src/assets/xfwm4/assets-dark/maximize-toggled-active.png differ diff --git a/src/assets/xfwm4/assets-dark/maximize-toggled-inactive.png b/src/assets/xfwm4/assets-dark/maximize-toggled-inactive.png index fbb5f631..76211a8e 100644 Binary files a/src/assets/xfwm4/assets-dark/maximize-toggled-inactive.png and b/src/assets/xfwm4/assets-dark/maximize-toggled-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/maximize-toggled-prelight.png b/src/assets/xfwm4/assets-dark/maximize-toggled-prelight.png index 7861f4f6..b6c3dfe4 100644 Binary files a/src/assets/xfwm4/assets-dark/maximize-toggled-prelight.png and b/src/assets/xfwm4/assets-dark/maximize-toggled-prelight.png differ diff --git a/src/assets/xfwm4/assets-dark/maximize-toggled-pressed.png b/src/assets/xfwm4/assets-dark/maximize-toggled-pressed.png index f62f8471..00ec718b 100644 Binary files a/src/assets/xfwm4/assets-dark/maximize-toggled-pressed.png and b/src/assets/xfwm4/assets-dark/maximize-toggled-pressed.png differ diff --git a/src/assets/xfwm4/assets-dark/menu-active.png b/src/assets/xfwm4/assets-dark/menu-active.png index b413ea51..4559e073 100644 Binary files a/src/assets/xfwm4/assets-dark/menu-active.png and b/src/assets/xfwm4/assets-dark/menu-active.png differ diff --git a/src/assets/xfwm4/assets-dark/menu-inactive.png b/src/assets/xfwm4/assets-dark/menu-inactive.png index 3408e159..f2b10d9c 100644 Binary files a/src/assets/xfwm4/assets-dark/menu-inactive.png and b/src/assets/xfwm4/assets-dark/menu-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/menu-pressed.png b/src/assets/xfwm4/assets-dark/menu-pressed.png index e58ba6c2..bb7674f1 100644 Binary files a/src/assets/xfwm4/assets-dark/menu-pressed.png and b/src/assets/xfwm4/assets-dark/menu-pressed.png differ diff --git a/src/assets/xfwm4/assets-dark/right-active.png b/src/assets/xfwm4/assets-dark/right-active.png index 92a99a7c..b709543f 100644 Binary files a/src/assets/xfwm4/assets-dark/right-active.png and b/src/assets/xfwm4/assets-dark/right-active.png differ diff --git a/src/assets/xfwm4/assets-dark/right-inactive.png b/src/assets/xfwm4/assets-dark/right-inactive.png index 92a99a7c..b709543f 100644 Binary files a/src/assets/xfwm4/assets-dark/right-inactive.png and b/src/assets/xfwm4/assets-dark/right-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/shade-active.png b/src/assets/xfwm4/assets-dark/shade-active.png index 9d8fcc70..ad3e5f40 100644 Binary files a/src/assets/xfwm4/assets-dark/shade-active.png and b/src/assets/xfwm4/assets-dark/shade-active.png differ diff --git a/src/assets/xfwm4/assets-dark/shade-inactive.png b/src/assets/xfwm4/assets-dark/shade-inactive.png index 601c95e4..72e303d8 100644 Binary files a/src/assets/xfwm4/assets-dark/shade-inactive.png and b/src/assets/xfwm4/assets-dark/shade-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/shade-pressed.png b/src/assets/xfwm4/assets-dark/shade-pressed.png index 963dfe44..25e4bb38 100644 Binary files a/src/assets/xfwm4/assets-dark/shade-pressed.png and b/src/assets/xfwm4/assets-dark/shade-pressed.png differ diff --git a/src/assets/xfwm4/assets-dark/stick-active.png b/src/assets/xfwm4/assets-dark/stick-active.png index f267ee24..58f2288d 100644 Binary files a/src/assets/xfwm4/assets-dark/stick-active.png and b/src/assets/xfwm4/assets-dark/stick-active.png differ diff --git a/src/assets/xfwm4/assets-dark/stick-inactive.png b/src/assets/xfwm4/assets-dark/stick-inactive.png index abdf12b3..dd39de2d 100644 Binary files a/src/assets/xfwm4/assets-dark/stick-inactive.png and b/src/assets/xfwm4/assets-dark/stick-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/stick-pressed.png b/src/assets/xfwm4/assets-dark/stick-pressed.png index 017abdf4..c8063392 100644 Binary files a/src/assets/xfwm4/assets-dark/stick-pressed.png and b/src/assets/xfwm4/assets-dark/stick-pressed.png differ diff --git a/src/assets/xfwm4/assets-dark/title-1-active.png b/src/assets/xfwm4/assets-dark/title-1-active.png index f1450547..fb0122e2 100644 Binary files a/src/assets/xfwm4/assets-dark/title-1-active.png and b/src/assets/xfwm4/assets-dark/title-1-active.png differ diff --git a/src/assets/xfwm4/assets-dark/title-1-inactive.png b/src/assets/xfwm4/assets-dark/title-1-inactive.png index f1450547..fb0122e2 100644 Binary files a/src/assets/xfwm4/assets-dark/title-1-inactive.png and b/src/assets/xfwm4/assets-dark/title-1-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/title-2-active.png b/src/assets/xfwm4/assets-dark/title-2-active.png index f1450547..fb0122e2 100644 Binary files a/src/assets/xfwm4/assets-dark/title-2-active.png and b/src/assets/xfwm4/assets-dark/title-2-active.png differ diff --git a/src/assets/xfwm4/assets-dark/title-2-inactive.png b/src/assets/xfwm4/assets-dark/title-2-inactive.png index f1450547..fb0122e2 100644 Binary files a/src/assets/xfwm4/assets-dark/title-2-inactive.png and b/src/assets/xfwm4/assets-dark/title-2-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/title-3-active.png b/src/assets/xfwm4/assets-dark/title-3-active.png index f1450547..fb0122e2 100644 Binary files a/src/assets/xfwm4/assets-dark/title-3-active.png and b/src/assets/xfwm4/assets-dark/title-3-active.png differ diff --git a/src/assets/xfwm4/assets-dark/title-3-inactive.png b/src/assets/xfwm4/assets-dark/title-3-inactive.png index f1450547..fb0122e2 100644 Binary files a/src/assets/xfwm4/assets-dark/title-3-inactive.png and b/src/assets/xfwm4/assets-dark/title-3-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/title-4-active.png b/src/assets/xfwm4/assets-dark/title-4-active.png index f1450547..fb0122e2 100644 Binary files a/src/assets/xfwm4/assets-dark/title-4-active.png and b/src/assets/xfwm4/assets-dark/title-4-active.png differ diff --git a/src/assets/xfwm4/assets-dark/title-4-inactive.png b/src/assets/xfwm4/assets-dark/title-4-inactive.png index f1450547..fb0122e2 100644 Binary files a/src/assets/xfwm4/assets-dark/title-4-inactive.png and b/src/assets/xfwm4/assets-dark/title-4-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/title-5-active.png b/src/assets/xfwm4/assets-dark/title-5-active.png index f1450547..fb0122e2 100644 Binary files a/src/assets/xfwm4/assets-dark/title-5-active.png and b/src/assets/xfwm4/assets-dark/title-5-active.png differ diff --git a/src/assets/xfwm4/assets-dark/title-5-inactive.png b/src/assets/xfwm4/assets-dark/title-5-inactive.png index f1450547..fb0122e2 100644 Binary files a/src/assets/xfwm4/assets-dark/title-5-inactive.png and b/src/assets/xfwm4/assets-dark/title-5-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/top-left-active.png b/src/assets/xfwm4/assets-dark/top-left-active.png index 47326974..81eb2505 100644 Binary files a/src/assets/xfwm4/assets-dark/top-left-active.png and b/src/assets/xfwm4/assets-dark/top-left-active.png differ diff --git a/src/assets/xfwm4/assets-dark/top-left-inactive.png b/src/assets/xfwm4/assets-dark/top-left-inactive.png index 47326974..81eb2505 100644 Binary files a/src/assets/xfwm4/assets-dark/top-left-inactive.png and b/src/assets/xfwm4/assets-dark/top-left-inactive.png differ diff --git a/src/assets/xfwm4/assets-dark/top-right-active.png b/src/assets/xfwm4/assets-dark/top-right-active.png index 2acf9c00..fac1597b 100644 Binary files a/src/assets/xfwm4/assets-dark/top-right-active.png and b/src/assets/xfwm4/assets-dark/top-right-active.png differ diff --git a/src/assets/xfwm4/assets-dark/top-right-inactive.png b/src/assets/xfwm4/assets-dark/top-right-inactive.png index 2acf9c00..fac1597b 100644 Binary files a/src/assets/xfwm4/assets-dark/top-right-inactive.png and b/src/assets/xfwm4/assets-dark/top-right-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/bottom-active.png b/src/assets/xfwm4/assets-light/bottom-active.png index 42beb9fa..adeb45de 100644 Binary files a/src/assets/xfwm4/assets-light/bottom-active.png and b/src/assets/xfwm4/assets-light/bottom-active.png differ diff --git a/src/assets/xfwm4/assets-light/bottom-inactive.png b/src/assets/xfwm4/assets-light/bottom-inactive.png index 42beb9fa..adeb45de 100644 Binary files a/src/assets/xfwm4/assets-light/bottom-inactive.png and b/src/assets/xfwm4/assets-light/bottom-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/bottom-left-active.png b/src/assets/xfwm4/assets-light/bottom-left-active.png index c163b788..76a4b935 100644 Binary files a/src/assets/xfwm4/assets-light/bottom-left-active.png and b/src/assets/xfwm4/assets-light/bottom-left-active.png differ diff --git a/src/assets/xfwm4/assets-light/bottom-left-inactive.png b/src/assets/xfwm4/assets-light/bottom-left-inactive.png index c163b788..76a4b935 100644 Binary files a/src/assets/xfwm4/assets-light/bottom-left-inactive.png and b/src/assets/xfwm4/assets-light/bottom-left-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/bottom-right-active.png b/src/assets/xfwm4/assets-light/bottom-right-active.png index bc78a34a..28d9bb28 100644 Binary files a/src/assets/xfwm4/assets-light/bottom-right-active.png and b/src/assets/xfwm4/assets-light/bottom-right-active.png differ diff --git a/src/assets/xfwm4/assets-light/bottom-right-inactive.png b/src/assets/xfwm4/assets-light/bottom-right-inactive.png index bc78a34a..28d9bb28 100644 Binary files a/src/assets/xfwm4/assets-light/bottom-right-inactive.png and b/src/assets/xfwm4/assets-light/bottom-right-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/close-active.png b/src/assets/xfwm4/assets-light/close-active.png index 05842ee8..bc2c3f18 100644 Binary files a/src/assets/xfwm4/assets-light/close-active.png and b/src/assets/xfwm4/assets-light/close-active.png differ diff --git a/src/assets/xfwm4/assets-light/close-inactive.png b/src/assets/xfwm4/assets-light/close-inactive.png index c4d7b8e5..c4c60656 100644 Binary files a/src/assets/xfwm4/assets-light/close-inactive.png and b/src/assets/xfwm4/assets-light/close-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/close-prelight.png b/src/assets/xfwm4/assets-light/close-prelight.png index f6e85458..11f07e74 100644 Binary files a/src/assets/xfwm4/assets-light/close-prelight.png and b/src/assets/xfwm4/assets-light/close-prelight.png differ diff --git a/src/assets/xfwm4/assets-light/close-pressed.png b/src/assets/xfwm4/assets-light/close-pressed.png index 238faba2..6610987d 100644 Binary files a/src/assets/xfwm4/assets-light/close-pressed.png and b/src/assets/xfwm4/assets-light/close-pressed.png differ diff --git a/src/assets/xfwm4/assets-light/hide-active.png b/src/assets/xfwm4/assets-light/hide-active.png index 40f44fd5..8d2ee95e 100644 Binary files a/src/assets/xfwm4/assets-light/hide-active.png and b/src/assets/xfwm4/assets-light/hide-active.png differ diff --git a/src/assets/xfwm4/assets-light/hide-inactive.png b/src/assets/xfwm4/assets-light/hide-inactive.png index c4d7b8e5..c4c60656 100644 Binary files a/src/assets/xfwm4/assets-light/hide-inactive.png and b/src/assets/xfwm4/assets-light/hide-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/hide-prelight.png b/src/assets/xfwm4/assets-light/hide-prelight.png index 712f61f8..f1d2848b 100644 Binary files a/src/assets/xfwm4/assets-light/hide-prelight.png and b/src/assets/xfwm4/assets-light/hide-prelight.png differ diff --git a/src/assets/xfwm4/assets-light/hide-pressed.png b/src/assets/xfwm4/assets-light/hide-pressed.png index 3c258349..aa6b2bef 100644 Binary files a/src/assets/xfwm4/assets-light/hide-pressed.png and b/src/assets/xfwm4/assets-light/hide-pressed.png differ diff --git a/src/assets/xfwm4/assets-light/left-active.png b/src/assets/xfwm4/assets-light/left-active.png index 3ee5365f..ae20e735 100644 Binary files a/src/assets/xfwm4/assets-light/left-active.png and b/src/assets/xfwm4/assets-light/left-active.png differ diff --git a/src/assets/xfwm4/assets-light/left-inactive.png b/src/assets/xfwm4/assets-light/left-inactive.png index 3ee5365f..ae20e735 100644 Binary files a/src/assets/xfwm4/assets-light/left-inactive.png and b/src/assets/xfwm4/assets-light/left-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/maximize-active.png b/src/assets/xfwm4/assets-light/maximize-active.png index 4c4fcfdc..a85c184b 100644 Binary files a/src/assets/xfwm4/assets-light/maximize-active.png and b/src/assets/xfwm4/assets-light/maximize-active.png differ diff --git a/src/assets/xfwm4/assets-light/maximize-inactive.png b/src/assets/xfwm4/assets-light/maximize-inactive.png index c4d7b8e5..c4c60656 100644 Binary files a/src/assets/xfwm4/assets-light/maximize-inactive.png and b/src/assets/xfwm4/assets-light/maximize-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/maximize-prelight.png b/src/assets/xfwm4/assets-light/maximize-prelight.png index bf04627c..03898337 100644 Binary files a/src/assets/xfwm4/assets-light/maximize-prelight.png and b/src/assets/xfwm4/assets-light/maximize-prelight.png differ diff --git a/src/assets/xfwm4/assets-light/maximize-pressed.png b/src/assets/xfwm4/assets-light/maximize-pressed.png index b5de4008..60e5dfe8 100644 Binary files a/src/assets/xfwm4/assets-light/maximize-pressed.png and b/src/assets/xfwm4/assets-light/maximize-pressed.png differ diff --git a/src/assets/xfwm4/assets-light/maximize-toggled-active.png b/src/assets/xfwm4/assets-light/maximize-toggled-active.png index 4c4fcfdc..a85c184b 100644 Binary files a/src/assets/xfwm4/assets-light/maximize-toggled-active.png and b/src/assets/xfwm4/assets-light/maximize-toggled-active.png differ diff --git a/src/assets/xfwm4/assets-light/maximize-toggled-inactive.png b/src/assets/xfwm4/assets-light/maximize-toggled-inactive.png index c4d7b8e5..c4c60656 100644 Binary files a/src/assets/xfwm4/assets-light/maximize-toggled-inactive.png and b/src/assets/xfwm4/assets-light/maximize-toggled-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/maximize-toggled-prelight.png b/src/assets/xfwm4/assets-light/maximize-toggled-prelight.png index 3b55faa7..3f27fb6a 100644 Binary files a/src/assets/xfwm4/assets-light/maximize-toggled-prelight.png and b/src/assets/xfwm4/assets-light/maximize-toggled-prelight.png differ diff --git a/src/assets/xfwm4/assets-light/maximize-toggled-pressed.png b/src/assets/xfwm4/assets-light/maximize-toggled-pressed.png index 95451f29..c5fcba80 100644 Binary files a/src/assets/xfwm4/assets-light/maximize-toggled-pressed.png and b/src/assets/xfwm4/assets-light/maximize-toggled-pressed.png differ diff --git a/src/assets/xfwm4/assets-light/menu-active.png b/src/assets/xfwm4/assets-light/menu-active.png index 54f11c5f..c584bd7f 100644 Binary files a/src/assets/xfwm4/assets-light/menu-active.png and b/src/assets/xfwm4/assets-light/menu-active.png differ diff --git a/src/assets/xfwm4/assets-light/menu-inactive.png b/src/assets/xfwm4/assets-light/menu-inactive.png index f1765e12..99437655 100644 Binary files a/src/assets/xfwm4/assets-light/menu-inactive.png and b/src/assets/xfwm4/assets-light/menu-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/menu-pressed.png b/src/assets/xfwm4/assets-light/menu-pressed.png index d8547617..95ce7cd6 100644 Binary files a/src/assets/xfwm4/assets-light/menu-pressed.png and b/src/assets/xfwm4/assets-light/menu-pressed.png differ diff --git a/src/assets/xfwm4/assets-light/right-active.png b/src/assets/xfwm4/assets-light/right-active.png index 83005771..e6f044a9 100644 Binary files a/src/assets/xfwm4/assets-light/right-active.png and b/src/assets/xfwm4/assets-light/right-active.png differ diff --git a/src/assets/xfwm4/assets-light/right-inactive.png b/src/assets/xfwm4/assets-light/right-inactive.png index 83005771..e6f044a9 100644 Binary files a/src/assets/xfwm4/assets-light/right-inactive.png and b/src/assets/xfwm4/assets-light/right-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/shade-active.png b/src/assets/xfwm4/assets-light/shade-active.png index d5ce5b06..6d25c4ad 100644 Binary files a/src/assets/xfwm4/assets-light/shade-active.png and b/src/assets/xfwm4/assets-light/shade-active.png differ diff --git a/src/assets/xfwm4/assets-light/shade-inactive.png b/src/assets/xfwm4/assets-light/shade-inactive.png index dcfd6c5d..cbc8cc58 100644 Binary files a/src/assets/xfwm4/assets-light/shade-inactive.png and b/src/assets/xfwm4/assets-light/shade-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/shade-pressed.png b/src/assets/xfwm4/assets-light/shade-pressed.png index f9dba458..0a91b8c3 100644 Binary files a/src/assets/xfwm4/assets-light/shade-pressed.png and b/src/assets/xfwm4/assets-light/shade-pressed.png differ diff --git a/src/assets/xfwm4/assets-light/stick-active.png b/src/assets/xfwm4/assets-light/stick-active.png index e211f61b..1e025453 100644 Binary files a/src/assets/xfwm4/assets-light/stick-active.png and b/src/assets/xfwm4/assets-light/stick-active.png differ diff --git a/src/assets/xfwm4/assets-light/stick-inactive.png b/src/assets/xfwm4/assets-light/stick-inactive.png index 7a33b7bb..d2654acc 100644 Binary files a/src/assets/xfwm4/assets-light/stick-inactive.png and b/src/assets/xfwm4/assets-light/stick-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/stick-pressed.png b/src/assets/xfwm4/assets-light/stick-pressed.png index c232fcc2..385ad477 100644 Binary files a/src/assets/xfwm4/assets-light/stick-pressed.png and b/src/assets/xfwm4/assets-light/stick-pressed.png differ diff --git a/src/assets/xfwm4/assets-light/title-1-active.png b/src/assets/xfwm4/assets-light/title-1-active.png index 794acdc5..fbb1d6bd 100644 Binary files a/src/assets/xfwm4/assets-light/title-1-active.png and b/src/assets/xfwm4/assets-light/title-1-active.png differ diff --git a/src/assets/xfwm4/assets-light/title-1-inactive.png b/src/assets/xfwm4/assets-light/title-1-inactive.png index 794acdc5..fbb1d6bd 100644 Binary files a/src/assets/xfwm4/assets-light/title-1-inactive.png and b/src/assets/xfwm4/assets-light/title-1-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/title-2-active.png b/src/assets/xfwm4/assets-light/title-2-active.png index 794acdc5..fbb1d6bd 100644 Binary files a/src/assets/xfwm4/assets-light/title-2-active.png and b/src/assets/xfwm4/assets-light/title-2-active.png differ diff --git a/src/assets/xfwm4/assets-light/title-2-inactive.png b/src/assets/xfwm4/assets-light/title-2-inactive.png index 794acdc5..fbb1d6bd 100644 Binary files a/src/assets/xfwm4/assets-light/title-2-inactive.png and b/src/assets/xfwm4/assets-light/title-2-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/title-3-active.png b/src/assets/xfwm4/assets-light/title-3-active.png index 794acdc5..fbb1d6bd 100644 Binary files a/src/assets/xfwm4/assets-light/title-3-active.png and b/src/assets/xfwm4/assets-light/title-3-active.png differ diff --git a/src/assets/xfwm4/assets-light/title-3-inactive.png b/src/assets/xfwm4/assets-light/title-3-inactive.png index 794acdc5..fbb1d6bd 100644 Binary files a/src/assets/xfwm4/assets-light/title-3-inactive.png and b/src/assets/xfwm4/assets-light/title-3-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/title-4-active.png b/src/assets/xfwm4/assets-light/title-4-active.png index 794acdc5..fbb1d6bd 100644 Binary files a/src/assets/xfwm4/assets-light/title-4-active.png and b/src/assets/xfwm4/assets-light/title-4-active.png differ diff --git a/src/assets/xfwm4/assets-light/title-4-inactive.png b/src/assets/xfwm4/assets-light/title-4-inactive.png index 794acdc5..fbb1d6bd 100644 Binary files a/src/assets/xfwm4/assets-light/title-4-inactive.png and b/src/assets/xfwm4/assets-light/title-4-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/title-5-active.png b/src/assets/xfwm4/assets-light/title-5-active.png index 794acdc5..fbb1d6bd 100644 Binary files a/src/assets/xfwm4/assets-light/title-5-active.png and b/src/assets/xfwm4/assets-light/title-5-active.png differ diff --git a/src/assets/xfwm4/assets-light/title-5-inactive.png b/src/assets/xfwm4/assets-light/title-5-inactive.png index 794acdc5..fbb1d6bd 100644 Binary files a/src/assets/xfwm4/assets-light/title-5-inactive.png and b/src/assets/xfwm4/assets-light/title-5-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/top-left-active.png b/src/assets/xfwm4/assets-light/top-left-active.png index 58fff69b..b37feae9 100644 Binary files a/src/assets/xfwm4/assets-light/top-left-active.png and b/src/assets/xfwm4/assets-light/top-left-active.png differ diff --git a/src/assets/xfwm4/assets-light/top-left-inactive.png b/src/assets/xfwm4/assets-light/top-left-inactive.png index 58fff69b..b37feae9 100644 Binary files a/src/assets/xfwm4/assets-light/top-left-inactive.png and b/src/assets/xfwm4/assets-light/top-left-inactive.png differ diff --git a/src/assets/xfwm4/assets-light/top-right-active.png b/src/assets/xfwm4/assets-light/top-right-active.png index 7f2b093a..2c15a245 100644 Binary files a/src/assets/xfwm4/assets-light/top-right-active.png and b/src/assets/xfwm4/assets-light/top-right-active.png differ diff --git a/src/assets/xfwm4/assets-light/top-right-inactive.png b/src/assets/xfwm4/assets-light/top-right-inactive.png index 7f2b093a..2c15a245 100644 Binary files a/src/assets/xfwm4/assets-light/top-right-inactive.png and b/src/assets/xfwm4/assets-light/top-right-inactive.png differ diff --git a/src/assets/xfwm4/render-assets.sh b/src/assets/xfwm4/render-assets.sh index 5a85eef5..8a1178c4 100755 --- a/src/assets/xfwm4/render-assets.sh +++ b/src/assets/xfwm4/render-assets.sh @@ -10,6 +10,8 @@ DARK_ASSETS_DIR="assets-dark" INDEX="assets.txt" +[[ -d $ASSETS_DIR ]] && rm -rf $ASSETS_DIR +[[ -d $DARK_ASSETS_DIR ]] && rm -rf $DARK_ASSETS_DIR mkdir -p $ASSETS_DIR && mkdir -p $DARK_ASSETS_DIR for i in `cat $INDEX` @@ -21,7 +23,7 @@ else echo Rendering $ASSETS_DIR/$i.png $INKSCAPE --export-id=$i \ --export-id-only \ - --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \ + --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \ && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png fi if [ -f $DARK_ASSETS_DIR/$i.png ]; then @@ -31,7 +33,7 @@ else echo Rendering $DARK_ASSETS_DIR/$i.png $INKSCAPE --export-id=$i \ --export-id-only \ - --export-png=$DARK_ASSETS_DIR/$i.png $DARK_SRC_FILE >/dev/null \ + --export-filename=$DARK_ASSETS_DIR/$i.png $DARK_SRC_FILE >/dev/null \ && $OPTIPNG -o7 --quiet $DARK_ASSETS_DIR/$i.png fi done diff --git a/src/main/cinnamon/cinnamon-dark-solid.css b/src/main/cinnamon/cinnamon-dark-solid.css index 77731fd5..6259b2d9 100644 --- a/src/main/cinnamon/cinnamon-dark-solid.css +++ b/src/main/cinnamon/cinnamon-dark-solid.css @@ -109,7 +109,7 @@ stage { #menu-search-entry:focus, .notification StEntry:focus, .menu #notification StEntry:focus, .popup-menu #notification StEntry:focus, #notification StEntry:focus, #menu-search-entry:hover, .notification StEntry:hover, .menu #notification StEntry:hover, .popup-menu #notification StEntry:hover, #notification StEntry:hover { color: #dadada; - border: 2px solid rgba(104, 135, 205, 0.75); + border: 2px solid rgba(77, 142, 249, 0.75); background-color: rgba(255, 255, 255, 0.05); } @@ -250,8 +250,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .toggle-switch { - width: 50px; - height: 20px; + width: 40px; + height: 24px; background-size: contain; background-image: url("assets/toggle-off.svg"); } diff --git a/src/main/cinnamon/cinnamon-dark.css b/src/main/cinnamon/cinnamon-dark.css index a5d4f537..e044f9d5 100644 --- a/src/main/cinnamon/cinnamon-dark.css +++ b/src/main/cinnamon/cinnamon-dark.css @@ -109,7 +109,7 @@ stage { #menu-search-entry:focus, .notification StEntry:focus, .menu #notification StEntry:focus, .popup-menu #notification StEntry:focus, #notification StEntry:focus, #menu-search-entry:hover, .notification StEntry:hover, .menu #notification StEntry:hover, .popup-menu #notification StEntry:hover, #notification StEntry:hover { color: #dadada; - border: 2px solid rgba(104, 135, 205, 0.75); + border: 2px solid rgba(77, 142, 249, 0.75); background-color: rgba(255, 255, 255, 0.05); } @@ -250,8 +250,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .toggle-switch { - width: 50px; - height: 20px; + width: 40px; + height: 24px; background-size: contain; background-image: url("assets/toggle-off.svg"); } diff --git a/src/main/cinnamon/cinnamon-light-solid.css b/src/main/cinnamon/cinnamon-light-solid.css index 0c779689..8485bd7a 100644 --- a/src/main/cinnamon/cinnamon-light-solid.css +++ b/src/main/cinnamon/cinnamon-light-solid.css @@ -109,7 +109,7 @@ stage { #menu-search-entry:focus, .notification StEntry:focus, .menu #notification StEntry:focus, .popup-menu #notification StEntry:focus, #notification StEntry:focus, #menu-search-entry:hover, .notification StEntry:hover, .menu #notification StEntry:hover, .popup-menu #notification StEntry:hover, #notification StEntry:hover { color: #363636; - border: 2px solid rgba(103, 164, 233, 0.75); + border: 2px solid rgba(77, 142, 249, 0.75); background-color: rgba(0, 0, 0, 0.05); } @@ -250,8 +250,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .toggle-switch { - width: 50px; - height: 20px; + width: 40px; + height: 24px; background-size: contain; background-image: url("assets/toggle-off.svg"); } diff --git a/src/main/cinnamon/cinnamon-light.css b/src/main/cinnamon/cinnamon-light.css index 6844af99..0e58df41 100644 --- a/src/main/cinnamon/cinnamon-light.css +++ b/src/main/cinnamon/cinnamon-light.css @@ -109,7 +109,7 @@ stage { #menu-search-entry:focus, .notification StEntry:focus, .menu #notification StEntry:focus, .popup-menu #notification StEntry:focus, #notification StEntry:focus, #menu-search-entry:hover, .notification StEntry:hover, .menu #notification StEntry:hover, .popup-menu #notification StEntry:hover, #notification StEntry:hover { color: #363636; - border: 2px solid rgba(103, 164, 233, 0.75); + border: 2px solid rgba(77, 142, 249, 0.75); background-color: rgba(0, 0, 0, 0.05); } @@ -250,8 +250,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .toggle-switch { - width: 50px; - height: 20px; + width: 40px; + height: 24px; background-size: contain; background-image: url("assets/toggle-off.svg"); } diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css index 4df4c777..1ca3deb2 100644 --- a/src/main/gtk-3.0/gtk-dark-solid.css +++ b/src/main/gtk-3.0/gtk-dark-solid.css @@ -211,7 +211,7 @@ entry.contacts-postal-entry, spinbutton entry, .linked > entry:not(:only-child) entry.contacts-postal-entry:focus, spinbutton entry:focus, .linked > entry:focus:not(:only-child) { color: #dadada; background-color: rgba(255, 255, 255, 0.05); - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); transition-duration: 300ms; } @@ -266,7 +266,7 @@ entry:hover { entry:focus { color: #dadada; background-color: rgba(255, 255, 255, 0.05); - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); transition-duration: 300ms; } @@ -357,7 +357,7 @@ entry:drop(active):focus, entry:drop(active) { .osd entry:focus { color: white; - border-color: #5578c7; + border-color: #357ef8; background-color: #0860f2; border-image: none; } @@ -911,7 +911,7 @@ toolbar.inline-toolbar toolbutton:only-child > button.flat { } .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) { - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) { @@ -935,7 +935,7 @@ toolbar.inline-toolbar toolbutton:only-child > button.flat { } .linked.vertical > entry:focus:not(:only-child) { - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .linked.vertical > entry:drop(active):not(:only-child) { @@ -1090,7 +1090,7 @@ button:active:link, button:active:visited, *:link:active { color: #cedffc; } -infobar.info *:link, infobar.question *:link, infobar.warning *:link, infobar.error *:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, button:selected:link, button:selected:visited, *:selected button:link, *:selected button:visited, *:link:selected, *:selected *:link { +infobar.info > revealer > box *:link, infobar.info:hover > revealer > box *:link, infobar.info:backdrop > revealer > box *:link, infobar.question > revealer > box *:link, infobar.question:hover > revealer > box *:link, infobar.question:backdrop > revealer > box *:link, infobar.warning > revealer > box *:link, infobar.warning:hover > revealer > box *:link, infobar.warning:backdrop > revealer > box *:link, infobar.error > revealer > box *:link, infobar.error:hover > revealer > box *:link, infobar.error:backdrop > revealer > box *:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, button:selected:link, button:selected:visited, *:selected button:link, *:selected button:visited, *:link:selected, *:selected *:link { color: #cedffc; } @@ -1115,8 +1115,8 @@ spinbutton entry { } spinbutton entry:focus { - border-color: rgba(104, 135, 205, 0.75); - box-shadow: inset 0 0 0 1px rgba(104, 135, 205, 0.75); + border-color: rgba(77, 142, 249, 0.75); + box-shadow: inset 0 0 0 1px rgba(77, 142, 249, 0.75); } spinbutton entry:drop(active) { @@ -1159,7 +1159,7 @@ spinbutton:not(.vertical) > entry + button:not(:active):hover { } spinbutton:not(.vertical) > entry:focus + button { - border-left-color: rgba(104, 135, 205, 0.75); + border-left-color: rgba(77, 142, 249, 0.75); } spinbutton:not(.vertical) > entry:drop(active) + button { @@ -1182,7 +1182,7 @@ spinbutton:not(.vertical) > entry:drop(active) + button { } .osd spinbutton:not(.vertical) > entry:focus + button { - border-left-color: rgba(104, 135, 205, 0.75); + border-left-color: rgba(77, 142, 249, 0.75); } spinbutton.vertical button, spinbutton.vertical entry { @@ -1196,7 +1196,7 @@ spinbutton.vertical button.up { } spinbutton.vertical > entry:focus + button { - border-top-color: rgba(104, 135, 205, 0.75); + border-top-color: rgba(77, 142, 249, 0.75); } spinbutton.vertical > entry:drop(active) + button { @@ -1231,6 +1231,7 @@ combobox arrow { margin: 2px -10px 2px 0; border-radius: 5px; border: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.15), 0 1px 2px 0 rgba(0, 0, 0, 0.05); } combobox decoration, @@ -1470,7 +1471,7 @@ headerbar .linked:not(.vertical) > entry:focus { border-radius: 6px; background-image: none; background-color: rgba(255, 255, 255, 0.05); - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } headerbar .linked:not(.vertical) > entry:disabled { @@ -1528,17 +1529,17 @@ headerbar.titlebar headerbar:not(.titlebar) { .selection-mode headerbar, headerbar.selection-mode { color: white; - background-color: #6887cd; - border-color: #597bc8; + background-color: #4d8ef9; + border-color: #3a81f8; box-shadow: none; background-image: none; text-shadow: none; } .selection-mode headerbar:backdrop, headerbar.selection-mode:backdrop { - background-color: #6887cd; + background-color: #4d8ef9; color: rgba(255, 255, 255, 0.6); - border-color: #597bc8; + border-color: #3a81f8; } .selection-mode headerbar button, headerbar.selection-mode button { @@ -1563,7 +1564,7 @@ headerbar.titlebar headerbar:not(.titlebar) { } .maximized .selection-mode headerbar, .maximized headerbar.selection-mode { - background-color: #6887cd; + background-color: #4d8ef9; } .tiled headerbar, .tiled headerbar:backdrop, .maximized headerbar, .maximized headerbar:backdrop { @@ -1742,7 +1743,7 @@ headerbar entry, .titlebar entry { .nemo-window .primary-toolbar entry:focus, headerbar entry:focus { background-image: none; background-color: rgba(255, 255, 255, 0.05); - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .nemo-window .primary-toolbar entry:disabled { @@ -4188,40 +4189,54 @@ paned.vertical > separator.wide { infobar { border-style: none; - background-color: #333333; } -infobar.info { +infobar.info > revealer > box, infobar.info:backdrop > revealer > box { background-color: #0860f2; } -infobar.question { +infobar.info > revealer > box selection, infobar.info:backdrop > revealer > box selection { + color: #0860f2; +} + +infobar.question > revealer > box, infobar.question:backdrop > revealer > box { background-color: #3484e2; } -infobar.warning { +infobar.question > revealer > box selection, infobar.question:backdrop > revealer > box selection { + color: #3484e2; +} + +infobar.warning > revealer > box, infobar.warning:backdrop > revealer > box { background-color: #F27835; } -infobar.error { +infobar.warning > revealer > box selection, infobar.warning:backdrop > revealer > box selection { + color: #F27835; +} + +infobar.error > revealer > box, infobar.error:backdrop > revealer > box { background-color: #FC4138; } -infobar.info, infobar.question, infobar.warning, infobar.error { +infobar.error > revealer > box selection, infobar.error:backdrop > revealer > box selection { + color: #FC4138; +} + +infobar.info > revealer > box, infobar.info:hover > revealer > box, infobar.info:backdrop > revealer > box, infobar.question > revealer > box, infobar.question:hover > revealer > box, infobar.question:backdrop > revealer > box, infobar.warning > revealer > box, infobar.warning:hover > revealer > box, infobar.warning:backdrop > revealer > box, infobar.error > revealer > box, infobar.error:hover > revealer > box, infobar.error:backdrop > revealer > box { color: white; caret-color: currentColor; } -infobar.info button, infobar.question button, infobar.warning button, infobar.error button { +infobar.info > revealer > box button, infobar.info:hover > revealer > box button, infobar.info:backdrop > revealer > box button, infobar.question > revealer > box button, infobar.question:hover > revealer > box button, infobar.question:backdrop > revealer > box button, infobar.warning > revealer > box button, infobar.warning:hover > revealer > box button, infobar.warning:backdrop > revealer > box button, infobar.error > revealer > box button, infobar.error:hover > revealer > box button, infobar.error:backdrop > revealer > box button { min-height: 28px; } -infobar.info selection, infobar.question selection, infobar.warning selection, infobar.error selection { - color: #0860f2; +infobar.info > revealer > box selection, infobar.info:hover > revealer > box selection, infobar.info:backdrop > revealer > box selection, infobar.question > revealer > box selection, infobar.question:hover > revealer > box selection, infobar.question:backdrop > revealer > box selection, infobar.warning > revealer > box selection, infobar.warning:hover > revealer > box selection, infobar.warning:backdrop > revealer > box selection, infobar.error > revealer > box selection, infobar.error:hover > revealer > box selection, infobar.error:backdrop > revealer > box selection { background-color: white; } -.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button, .nemo-window .floating-bar button, .nautilus-window .floating-bar button, .selection-mode headerbar button, headerbar.selection-mode button, infobar.info button, infobar.question button, infobar.warning button, infobar.error button { +.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button, .nemo-window .floating-bar button, .nautilus-window .floating-bar button, .selection-mode headerbar button, headerbar.selection-mode button, infobar.info > revealer > box button, infobar.info:hover > revealer > box button, infobar.info:backdrop > revealer > box button, infobar.question > revealer > box button, infobar.question:hover > revealer > box button, infobar.question:backdrop > revealer > box button, infobar.warning > revealer > box button, infobar.warning:hover > revealer > box button, infobar.warning:backdrop > revealer > box button, infobar.error > revealer > box button, infobar.error:hover > revealer > box button, infobar.error:backdrop > revealer > box button { color: white; background-color: rgba(255, 255, 255, 0); border-color: rgba(255, 255, 255, 0.5); @@ -4229,7 +4244,7 @@ infobar.info selection, infobar.question selection, infobar.warning selection, i box-shadow: none; } -.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.flat.image-button, .nemo-window .floating-bar button.flat, .nautilus-window .floating-bar button.flat, .selection-mode headerbar button.flat, headerbar.selection-mode button.flat, infobar.info button.flat, infobar.question button.flat, infobar.warning button.flat, infobar.error button.flat { +.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.flat.image-button, .nemo-window .floating-bar button.flat, .nautilus-window .floating-bar button.flat, .selection-mode headerbar button.flat, headerbar.selection-mode button.flat, infobar.info > revealer > box button.flat, infobar.question > revealer > box button.flat, infobar.warning > revealer > box button.flat, infobar.error > revealer > box button.flat { border-color: transparent; background-color: transparent; background-image: none; @@ -4243,14 +4258,14 @@ infobar.info selection, infobar.question selection, infobar.warning selection, i color: rgba(255, 255, 255, 0.4); } -.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:hover, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:hover, .nemo-window .floating-bar button:hover, .nautilus-window .floating-bar button:hover, .selection-mode headerbar button:hover, headerbar.selection-mode button:hover, infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover { +.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:hover, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:hover, .nemo-window .floating-bar button:hover, .nautilus-window .floating-bar button:hover, .selection-mode headerbar button:hover, headerbar.selection-mode button:hover, infobar.info > revealer > box button:hover, infobar.question > revealer > box button:hover, infobar.warning > revealer > box button:hover, infobar.error > revealer > box button:hover { color: white; background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.5); box-shadow: none; } -.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:active, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:active, .nemo-window .floating-bar button:active, .nautilus-window .floating-bar button:active, .selection-mode headerbar button:active, headerbar.selection-mode button:active, infobar.info button:active, infobar.question button:active, infobar.warning button:active, infobar.error button:active, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:active:hover, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:checked, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:checked, .nemo-window .floating-bar button:checked, .nautilus-window .floating-bar button:checked, .selection-mode headerbar button:checked, headerbar.selection-mode button:checked, infobar.info button:checked, infobar.question button:checked, infobar.warning button:checked, infobar.error button:checked { +.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:active, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:active, .nemo-window .floating-bar button:active, .nautilus-window .floating-bar button:active, .selection-mode headerbar button:active, headerbar.selection-mode button:active, infobar.info > revealer > box button:active, infobar.question > revealer > box button:active, infobar.warning > revealer > box button:active, infobar.error > revealer > box button:active, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:active:hover, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:checked, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:checked, .nemo-window .floating-bar button:checked, .nautilus-window .floating-bar button:checked, .selection-mode headerbar button:checked, headerbar.selection-mode button:checked, infobar.info > revealer > box button:checked, infobar.question > revealer > box button:checked, infobar.warning > revealer > box button:checked, infobar.error > revealer > box button:checked { color: white; background-color: rgba(255, 255, 255, 0.4); border-color: rgba(255, 255, 255, 0.5); @@ -5420,17 +5435,6 @@ window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned s background: none; } -workbench.csd > stack.titlebar:not(headerbar) { - padding: 0; - background: none; - border: none; - box-shadow: none; -} - -workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child { - border-radius: 14px 14px 0 0; -} - editortweak .linked > entry.search:focus + .gb-linked-scroller { border-top-color: #0860f2; } @@ -5534,13 +5538,6 @@ popover.popover-selector list row image { margin-right: 10px; } -entry.search.preferences-search { - border: none; - border-right: 1px solid rgba(255, 255, 255, 0.12); - border-bottom: 1px solid rgba(255, 255, 255, 0.12); - border-radius: 0; -} - preferences stacksidebar.sidebar list { background-image: linear-gradient(to bottom, #242424, #242424); } @@ -5584,6 +5581,10 @@ omnibar.linked > entry:not(:only-child):backdrop image, omnibar.linked > entry:n entry.search.preferences-search { box-shadow: none; + border: none; + border-right: 1px solid rgba(255, 255, 255, 0.12); + border-bottom: 1px solid rgba(255, 255, 255, 0.12); + border-radius: 0; } entry.search.preferences-search:focus { @@ -5592,7 +5593,7 @@ entry.search.preferences-search:focus { } preferencesbin spinbutton { - border-radius: 14px; + border-radius: 6px; border: 1px solid rgba(255, 255, 255, 0.12); background-color: #333333; } @@ -5615,6 +5616,30 @@ preferencesbin entry.search { margin: 2px; } +dzlpreferencesview stacksidebar.sidebar { + border-bottom-left-radius: 14px; +} + +dzlpreferencesview stacksidebar.sidebar > scrolledwindow > viewport.frame > list { + border-bottom-left-radius: 14px; +} + +dzldockbin#buildui.buildui list.sidebar { + border-bottom-left-radius: 14px; +} + +dzldockbin#editor > ideeditorsidebar.left.pinned.dzldockbinedge { + border-bottom-left-radius: 14px; +} + +dzldockbin#editor > ideeditorsidebar.left.pinned.dzldockbinedge > dzldockpaned treeview.view.project-tree.i-wanna-be-list-box:not(:hover):not(:selected) { + background: none; +} + +ideeditorutilities.bottom.pinned.dzldockbinedge { + border-bottom-right-radius: 14px; +} + gstyleslidein #scale_box button.toggle:checked, gstyleslidein #strings_controls button.toggle:checked, gstyleslidein #palette_controls button.toggle:checked, @@ -5630,6 +5655,29 @@ configurationview list { border-width: 0; } +dzldockbin actionbar { + border-radius: 0 0 14px 14px; +} + +workbench.csd > stack.titlebar:not(headerbar) { + padding: 0; + background: none; + border: none; + box-shadow: none; +} + +workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child { + border-radius: 14px 14px 0 0; +} + +window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar > headerbar > omnibar > .linked > entry { + min-height: 0; +} + +window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar > headerbar > omnibar > .linked > entry > overlay > box.horizontal > box.vertical.pan > button { + min-height: 0; +} + window.org-gnome-Builder.workspace > popover.dzlmenubutton > box.vertical > dzlmenubuttonsection.vertical > box.vertical > button.dzlmenubuttonitem { color: #afafaf; } @@ -5643,14 +5691,6 @@ window.org-gnome-Builder.workspace > popover.dzlmenubutton > box.vertical > dzlm color: #dedede; } -window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar > headerbar > omnibar > .linked > entry { - min-height: 0; -} - -window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar > headerbar > omnibar > .linked > entry > overlay > box.horizontal > box.vertical.pan > button { - min-height: 0; -} - window.background > box.vertical box.horizontal list.categories { border-radius: 0 0 0 14px; } @@ -6096,11 +6136,11 @@ window.background.csd > overlay > leaflet > overlay > scrolledwindow > viewport. } entry.contacts-postal-entry:focus { - box-shadow: inset 0 0 0 1px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 1px rgba(77, 142, 249, 0.75); } entry.contacts-postal-entry:focus + entry.contacts-postal-entry { - border-top-color: rgba(104, 135, 205, 0.75); + border-top-color: rgba(77, 142, 249, 0.75); } stack#titlebar_container.titlebar > stack > headerbar, @@ -6400,7 +6440,7 @@ headerbar.titlebar.incognito-mode entry image, headerbar.titlebar.incognito-mode headerbar.titlebar.incognito-mode entry:focus { background-image: none; background-color: rgba(255, 255, 255, 0.05); - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } headerbar.titlebar.incognito-mode entry:disabled { @@ -6425,7 +6465,7 @@ notebook > box > stack > box.vertical > paned.vertical > overlay > .floating-bar .background headerbar entry.starred:focus, .background headerbar entry.non-starred:focus { background-image: none; background-color: rgba(255, 255, 255, 0.05); - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .background headerbar entry.starred:disabled, .background headerbar label:disabled selection.starred, label:disabled .background headerbar selection.starred, .background headerbar entry.non-starred:disabled, .background headerbar label:disabled selection.non-starred, label:disabled .background headerbar selection.non-starred { @@ -7245,8 +7285,8 @@ window.background:not(.csd) > widget .entry { window.background:not(.csd) > widget > entry:focus, window.background:not(.csd) > widget .entry:focus { - border-color: #6887cd; - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + border-color: #4d8ef9; + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } window.background:not(.csd) > widget > spinbutton { @@ -7882,7 +7922,7 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { .marlin-pathbar.pathbar:focus { background-image: none; background-color: rgba(255, 255, 255, 0.05); - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .marlin-pathbar.pathbar:disabled, label:disabled selection.pathbar { @@ -9277,35 +9317,35 @@ popover.background.places-menu row { } .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher { - border-image: radial-gradient(circle closest-corner at center calc(1px), #6887cd 0%, transparent 0%) 0 0 0 0/0 0 0 0; + border-image: radial-gradient(circle closest-corner at center calc(1px), #4d8ef9 0%, transparent 0%) 0 0 0 0/0 0 0 0; } .top #tasklist-button:checked, .top .budgie-panel button.flat.launcher:checked, .budgie-panel .top button.flat.launcher:checked { - border-image: radial-gradient(circle closest-corner at center calc(1px), #6887cd 100%, transparent 0%) 3 0 0 0/3px 0 0 0; + border-image: radial-gradient(circle closest-corner at center calc(1px), #4d8ef9 100%, transparent 0%) 3 0 0 0/3px 0 0 0; } .bottom #tasklist-button, .bottom .budgie-panel button.flat.launcher, .budgie-panel .bottom button.flat.launcher { - border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #6887cd 0%, transparent 0%) 0 0 0 0/0 0 0 0; + border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4d8ef9 0%, transparent 0%) 0 0 0 0/0 0 0 0; } .bottom #tasklist-button:checked, .bottom .budgie-panel button.flat.launcher:checked, .budgie-panel .bottom button.flat.launcher:checked { - border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #6887cd 100%, transparent 0%) 0 0 3 0/0 0 3px 0; + border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4d8ef9 100%, transparent 0%) 0 0 3 0/0 0 3px 0; } .left #tasklist-button, .left .budgie-panel button.flat.launcher, .budgie-panel .left button.flat.launcher { - border-image: radial-gradient(circle closest-corner at calc(1px) center, #6887cd 0%, transparent 0%) 0 0 0 0/0 0 0 0; + border-image: radial-gradient(circle closest-corner at calc(1px) center, #4d8ef9 0%, transparent 0%) 0 0 0 0/0 0 0 0; } .left #tasklist-button:checked, .left .budgie-panel button.flat.launcher:checked, .budgie-panel .left button.flat.launcher:checked { - border-image: radial-gradient(circle closest-corner at calc(1px) center, #6887cd 100%, transparent 0%) 0 0 0 3/0 0 0 3px; + border-image: radial-gradient(circle closest-corner at calc(1px) center, #4d8ef9 100%, transparent 0%) 0 0 0 3/0 0 0 3px; } .right #tasklist-button, .right .budgie-panel button.flat.launcher, .budgie-panel .right button.flat.launcher { - border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #6887cd 0%, transparent 0%) 0 0 0 0/0 0 0 0; + border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #4d8ef9 0%, transparent 0%) 0 0 0 0/0 0 0 0; } .right #tasklist-button:checked, .right .budgie-panel button.flat.launcher:checked, .budgie-panel .right button.flat.launcher:checked { - border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #6887cd 100%, transparent 0%) 0 3 0 0/0 3px 0 0; + border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #4d8ef9 100%, transparent 0%) 0 3 0 0/0 3px 0 0; } #tasklist-button { diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css index d5a56696..451948f4 100644 --- a/src/main/gtk-3.0/gtk-dark.css +++ b/src/main/gtk-3.0/gtk-dark.css @@ -211,7 +211,7 @@ entry.contacts-postal-entry, spinbutton entry, .linked > entry:not(:only-child) entry.contacts-postal-entry:focus, spinbutton entry:focus, .linked > entry:focus:not(:only-child) { color: #dadada; background-color: rgba(255, 255, 255, 0.05); - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); transition-duration: 300ms; } @@ -266,7 +266,7 @@ entry:hover { entry:focus { color: #dadada; background-color: rgba(255, 255, 255, 0.05); - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); transition-duration: 300ms; } @@ -357,7 +357,7 @@ entry:drop(active):focus, entry:drop(active) { .osd entry:focus { color: white; - border-color: #5578c7; + border-color: #357ef8; background-color: #0860f2; border-image: none; } @@ -911,7 +911,7 @@ toolbar.inline-toolbar toolbutton:only-child > button.flat { } .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) { - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) { @@ -935,7 +935,7 @@ toolbar.inline-toolbar toolbutton:only-child > button.flat { } .linked.vertical > entry:focus:not(:only-child) { - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .linked.vertical > entry:drop(active):not(:only-child) { @@ -1090,7 +1090,7 @@ button:active:link, button:active:visited, *:link:active { color: #cedffc; } -infobar.info *:link, infobar.question *:link, infobar.warning *:link, infobar.error *:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, button:selected:link, button:selected:visited, *:selected button:link, *:selected button:visited, *:link:selected, *:selected *:link { +infobar.info > revealer > box *:link, infobar.info:hover > revealer > box *:link, infobar.info:backdrop > revealer > box *:link, infobar.question > revealer > box *:link, infobar.question:hover > revealer > box *:link, infobar.question:backdrop > revealer > box *:link, infobar.warning > revealer > box *:link, infobar.warning:hover > revealer > box *:link, infobar.warning:backdrop > revealer > box *:link, infobar.error > revealer > box *:link, infobar.error:hover > revealer > box *:link, infobar.error:backdrop > revealer > box *:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, button:selected:link, button:selected:visited, *:selected button:link, *:selected button:visited, *:link:selected, *:selected *:link { color: #cedffc; } @@ -1115,8 +1115,8 @@ spinbutton entry { } spinbutton entry:focus { - border-color: rgba(104, 135, 205, 0.75); - box-shadow: inset 0 0 0 1px rgba(104, 135, 205, 0.75); + border-color: rgba(77, 142, 249, 0.75); + box-shadow: inset 0 0 0 1px rgba(77, 142, 249, 0.75); } spinbutton entry:drop(active) { @@ -1159,7 +1159,7 @@ spinbutton:not(.vertical) > entry + button:not(:active):hover { } spinbutton:not(.vertical) > entry:focus + button { - border-left-color: rgba(104, 135, 205, 0.75); + border-left-color: rgba(77, 142, 249, 0.75); } spinbutton:not(.vertical) > entry:drop(active) + button { @@ -1182,7 +1182,7 @@ spinbutton:not(.vertical) > entry:drop(active) + button { } .osd spinbutton:not(.vertical) > entry:focus + button { - border-left-color: rgba(104, 135, 205, 0.75); + border-left-color: rgba(77, 142, 249, 0.75); } spinbutton.vertical button, spinbutton.vertical entry { @@ -1196,7 +1196,7 @@ spinbutton.vertical button.up { } spinbutton.vertical > entry:focus + button { - border-top-color: rgba(104, 135, 205, 0.75); + border-top-color: rgba(77, 142, 249, 0.75); } spinbutton.vertical > entry:drop(active) + button { @@ -1231,6 +1231,7 @@ combobox arrow { margin: 2px -10px 2px 0; border-radius: 5px; border: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.15), 0 1px 2px 0 rgba(0, 0, 0, 0.05); } combobox decoration, @@ -1470,7 +1471,7 @@ headerbar .linked:not(.vertical) > entry:focus { border-radius: 6px; background-image: none; background-color: rgba(255, 255, 255, 0.05); - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } headerbar .linked:not(.vertical) > entry:disabled { @@ -1528,17 +1529,17 @@ headerbar.titlebar headerbar:not(.titlebar) { .selection-mode headerbar, headerbar.selection-mode { color: white; - background-color: #6887cd; - border-color: #597bc8; + background-color: #4d8ef9; + border-color: #3a81f8; box-shadow: none; background-image: none; text-shadow: none; } .selection-mode headerbar:backdrop, headerbar.selection-mode:backdrop { - background-color: #6887cd; + background-color: #4d8ef9; color: rgba(255, 255, 255, 0.6); - border-color: #597bc8; + border-color: #3a81f8; } .selection-mode headerbar button, headerbar.selection-mode button { @@ -1563,7 +1564,7 @@ headerbar.titlebar headerbar:not(.titlebar) { } .maximized .selection-mode headerbar, .maximized headerbar.selection-mode { - background-color: #6887cd; + background-color: #4d8ef9; } .tiled headerbar, .tiled headerbar:backdrop, .maximized headerbar, .maximized headerbar:backdrop { @@ -1742,7 +1743,7 @@ headerbar entry, .titlebar entry { .nemo-window .primary-toolbar entry:focus, headerbar entry:focus { background-image: none; background-color: rgba(255, 255, 255, 0.05); - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .nemo-window .primary-toolbar entry:disabled { @@ -4188,40 +4189,54 @@ paned.vertical > separator.wide { infobar { border-style: none; - background-color: #333333; } -infobar.info { +infobar.info > revealer > box, infobar.info:backdrop > revealer > box { background-color: #0860f2; } -infobar.question { +infobar.info > revealer > box selection, infobar.info:backdrop > revealer > box selection { + color: #0860f2; +} + +infobar.question > revealer > box, infobar.question:backdrop > revealer > box { background-color: #3484e2; } -infobar.warning { +infobar.question > revealer > box selection, infobar.question:backdrop > revealer > box selection { + color: #3484e2; +} + +infobar.warning > revealer > box, infobar.warning:backdrop > revealer > box { background-color: #F27835; } -infobar.error { +infobar.warning > revealer > box selection, infobar.warning:backdrop > revealer > box selection { + color: #F27835; +} + +infobar.error > revealer > box, infobar.error:backdrop > revealer > box { background-color: #FC4138; } -infobar.info, infobar.question, infobar.warning, infobar.error { +infobar.error > revealer > box selection, infobar.error:backdrop > revealer > box selection { + color: #FC4138; +} + +infobar.info > revealer > box, infobar.info:hover > revealer > box, infobar.info:backdrop > revealer > box, infobar.question > revealer > box, infobar.question:hover > revealer > box, infobar.question:backdrop > revealer > box, infobar.warning > revealer > box, infobar.warning:hover > revealer > box, infobar.warning:backdrop > revealer > box, infobar.error > revealer > box, infobar.error:hover > revealer > box, infobar.error:backdrop > revealer > box { color: white; caret-color: currentColor; } -infobar.info button, infobar.question button, infobar.warning button, infobar.error button { +infobar.info > revealer > box button, infobar.info:hover > revealer > box button, infobar.info:backdrop > revealer > box button, infobar.question > revealer > box button, infobar.question:hover > revealer > box button, infobar.question:backdrop > revealer > box button, infobar.warning > revealer > box button, infobar.warning:hover > revealer > box button, infobar.warning:backdrop > revealer > box button, infobar.error > revealer > box button, infobar.error:hover > revealer > box button, infobar.error:backdrop > revealer > box button { min-height: 28px; } -infobar.info selection, infobar.question selection, infobar.warning selection, infobar.error selection { - color: #0860f2; +infobar.info > revealer > box selection, infobar.info:hover > revealer > box selection, infobar.info:backdrop > revealer > box selection, infobar.question > revealer > box selection, infobar.question:hover > revealer > box selection, infobar.question:backdrop > revealer > box selection, infobar.warning > revealer > box selection, infobar.warning:hover > revealer > box selection, infobar.warning:backdrop > revealer > box selection, infobar.error > revealer > box selection, infobar.error:hover > revealer > box selection, infobar.error:backdrop > revealer > box selection { background-color: white; } -.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button, .nemo-window .floating-bar button, .nautilus-window .floating-bar button, .selection-mode headerbar button, headerbar.selection-mode button, infobar.info button, infobar.question button, infobar.warning button, infobar.error button { +.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button, .nemo-window .floating-bar button, .nautilus-window .floating-bar button, .selection-mode headerbar button, headerbar.selection-mode button, infobar.info > revealer > box button, infobar.info:hover > revealer > box button, infobar.info:backdrop > revealer > box button, infobar.question > revealer > box button, infobar.question:hover > revealer > box button, infobar.question:backdrop > revealer > box button, infobar.warning > revealer > box button, infobar.warning:hover > revealer > box button, infobar.warning:backdrop > revealer > box button, infobar.error > revealer > box button, infobar.error:hover > revealer > box button, infobar.error:backdrop > revealer > box button { color: white; background-color: rgba(255, 255, 255, 0); border-color: rgba(255, 255, 255, 0.5); @@ -4229,7 +4244,7 @@ infobar.info selection, infobar.question selection, infobar.warning selection, i box-shadow: none; } -.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.flat.image-button, .nemo-window .floating-bar button.flat, .nautilus-window .floating-bar button.flat, .selection-mode headerbar button.flat, headerbar.selection-mode button.flat, infobar.info button.flat, infobar.question button.flat, infobar.warning button.flat, infobar.error button.flat { +.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.flat.image-button, .nemo-window .floating-bar button.flat, .nautilus-window .floating-bar button.flat, .selection-mode headerbar button.flat, headerbar.selection-mode button.flat, infobar.info > revealer > box button.flat, infobar.question > revealer > box button.flat, infobar.warning > revealer > box button.flat, infobar.error > revealer > box button.flat { border-color: transparent; background-color: transparent; background-image: none; @@ -4243,14 +4258,14 @@ infobar.info selection, infobar.question selection, infobar.warning selection, i color: rgba(255, 255, 255, 0.4); } -.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:hover, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:hover, .nemo-window .floating-bar button:hover, .nautilus-window .floating-bar button:hover, .selection-mode headerbar button:hover, headerbar.selection-mode button:hover, infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover { +.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:hover, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:hover, .nemo-window .floating-bar button:hover, .nautilus-window .floating-bar button:hover, .selection-mode headerbar button:hover, headerbar.selection-mode button:hover, infobar.info > revealer > box button:hover, infobar.question > revealer > box button:hover, infobar.warning > revealer > box button:hover, infobar.error > revealer > box button:hover { color: white; background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.5); box-shadow: none; } -.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:active, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:active, .nemo-window .floating-bar button:active, .nautilus-window .floating-bar button:active, .selection-mode headerbar button:active, headerbar.selection-mode button:active, infobar.info button:active, infobar.question button:active, infobar.warning button:active, infobar.error button:active, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:active:hover, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:checked, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:checked, .nemo-window .floating-bar button:checked, .nautilus-window .floating-bar button:checked, .selection-mode headerbar button:checked, headerbar.selection-mode button:checked, infobar.info button:checked, infobar.question button:checked, infobar.warning button:checked, infobar.error button:checked { +.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:active, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:active, .nemo-window .floating-bar button:active, .nautilus-window .floating-bar button:active, .selection-mode headerbar button:active, headerbar.selection-mode button:active, infobar.info > revealer > box button:active, infobar.question > revealer > box button:active, infobar.warning > revealer > box button:active, infobar.error > revealer > box button:active, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:active:hover, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:checked, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:checked, .nemo-window .floating-bar button:checked, .nautilus-window .floating-bar button:checked, .selection-mode headerbar button:checked, headerbar.selection-mode button:checked, infobar.info > revealer > box button:checked, infobar.question > revealer > box button:checked, infobar.warning > revealer > box button:checked, infobar.error > revealer > box button:checked { color: white; background-color: rgba(255, 255, 255, 0.4); border-color: rgba(255, 255, 255, 0.5); @@ -5416,17 +5431,6 @@ window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned s background: none; } -workbench.csd > stack.titlebar:not(headerbar) { - padding: 0; - background: none; - border: none; - box-shadow: none; -} - -workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child { - border-radius: 14px 14px 0 0; -} - editortweak .linked > entry.search:focus + .gb-linked-scroller { border-top-color: #0860f2; } @@ -5530,13 +5534,6 @@ popover.popover-selector list row image { margin-right: 10px; } -entry.search.preferences-search { - border: none; - border-right: 1px solid rgba(255, 255, 255, 0.12); - border-bottom: 1px solid rgba(255, 255, 255, 0.12); - border-radius: 0; -} - preferences stacksidebar.sidebar list { background-image: linear-gradient(to bottom, #242424, #242424); } @@ -5580,6 +5577,10 @@ omnibar.linked > entry:not(:only-child):backdrop image, omnibar.linked > entry:n entry.search.preferences-search { box-shadow: none; + border: none; + border-right: 1px solid rgba(255, 255, 255, 0.12); + border-bottom: 1px solid rgba(255, 255, 255, 0.12); + border-radius: 0; } entry.search.preferences-search:focus { @@ -5588,7 +5589,7 @@ entry.search.preferences-search:focus { } preferencesbin spinbutton { - border-radius: 14px; + border-radius: 6px; border: 1px solid rgba(255, 255, 255, 0.12); background-color: #333333; } @@ -5611,6 +5612,30 @@ preferencesbin entry.search { margin: 2px; } +dzlpreferencesview stacksidebar.sidebar { + border-bottom-left-radius: 14px; +} + +dzlpreferencesview stacksidebar.sidebar > scrolledwindow > viewport.frame > list { + border-bottom-left-radius: 14px; +} + +dzldockbin#buildui.buildui list.sidebar { + border-bottom-left-radius: 14px; +} + +dzldockbin#editor > ideeditorsidebar.left.pinned.dzldockbinedge { + border-bottom-left-radius: 14px; +} + +dzldockbin#editor > ideeditorsidebar.left.pinned.dzldockbinedge > dzldockpaned treeview.view.project-tree.i-wanna-be-list-box:not(:hover):not(:selected) { + background: none; +} + +ideeditorutilities.bottom.pinned.dzldockbinedge { + border-bottom-right-radius: 14px; +} + gstyleslidein #scale_box button.toggle:checked, gstyleslidein #strings_controls button.toggle:checked, gstyleslidein #palette_controls button.toggle:checked, @@ -5626,6 +5651,29 @@ configurationview list { border-width: 0; } +dzldockbin actionbar { + border-radius: 0 0 14px 14px; +} + +workbench.csd > stack.titlebar:not(headerbar) { + padding: 0; + background: none; + border: none; + box-shadow: none; +} + +workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child { + border-radius: 14px 14px 0 0; +} + +window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar > headerbar > omnibar > .linked > entry { + min-height: 0; +} + +window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar > headerbar > omnibar > .linked > entry > overlay > box.horizontal > box.vertical.pan > button { + min-height: 0; +} + window.org-gnome-Builder.workspace > popover.dzlmenubutton > box.vertical > dzlmenubuttonsection.vertical > box.vertical > button.dzlmenubuttonitem { color: #afafaf; } @@ -5639,14 +5687,6 @@ window.org-gnome-Builder.workspace > popover.dzlmenubutton > box.vertical > dzlm color: #dedede; } -window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar > headerbar > omnibar > .linked > entry { - min-height: 0; -} - -window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar > headerbar > omnibar > .linked > entry > overlay > box.horizontal > box.vertical.pan > button { - min-height: 0; -} - window.background > box.vertical box.horizontal list.categories { border-radius: 0 0 0 14px; } @@ -6092,11 +6132,11 @@ window.background.csd > overlay > leaflet > overlay > scrolledwindow > viewport. } entry.contacts-postal-entry:focus { - box-shadow: inset 0 0 0 1px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 1px rgba(77, 142, 249, 0.75); } entry.contacts-postal-entry:focus + entry.contacts-postal-entry { - border-top-color: rgba(104, 135, 205, 0.75); + border-top-color: rgba(77, 142, 249, 0.75); } stack#titlebar_container.titlebar > stack > headerbar, @@ -6396,7 +6436,7 @@ headerbar.titlebar.incognito-mode entry image, headerbar.titlebar.incognito-mode headerbar.titlebar.incognito-mode entry:focus { background-image: none; background-color: rgba(255, 255, 255, 0.05); - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } headerbar.titlebar.incognito-mode entry:disabled { @@ -6421,7 +6461,7 @@ notebook > box > stack > box.vertical > paned.vertical > overlay > .floating-bar .background headerbar entry.starred:focus, .background headerbar entry.non-starred:focus { background-image: none; background-color: rgba(255, 255, 255, 0.05); - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .background headerbar entry.starred:disabled, .background headerbar label:disabled selection.starred, label:disabled .background headerbar selection.starred, .background headerbar entry.non-starred:disabled, .background headerbar label:disabled selection.non-starred, label:disabled .background headerbar selection.non-starred { @@ -7241,8 +7281,8 @@ window.background:not(.csd) > widget .entry { window.background:not(.csd) > widget > entry:focus, window.background:not(.csd) > widget .entry:focus { - border-color: #6887cd; - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + border-color: #4d8ef9; + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } window.background:not(.csd) > widget > spinbutton { @@ -7878,7 +7918,7 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { .marlin-pathbar.pathbar:focus { background-image: none; background-color: rgba(255, 255, 255, 0.05); - box-shadow: inset 0 0 0 2px rgba(104, 135, 205, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .marlin-pathbar.pathbar:disabled, label:disabled selection.pathbar { @@ -9273,35 +9313,35 @@ popover.background.places-menu row { } .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher { - border-image: radial-gradient(circle closest-corner at center calc(1px), #6887cd 0%, transparent 0%) 0 0 0 0/0 0 0 0; + border-image: radial-gradient(circle closest-corner at center calc(1px), #4d8ef9 0%, transparent 0%) 0 0 0 0/0 0 0 0; } .top #tasklist-button:checked, .top .budgie-panel button.flat.launcher:checked, .budgie-panel .top button.flat.launcher:checked { - border-image: radial-gradient(circle closest-corner at center calc(1px), #6887cd 100%, transparent 0%) 3 0 0 0/3px 0 0 0; + border-image: radial-gradient(circle closest-corner at center calc(1px), #4d8ef9 100%, transparent 0%) 3 0 0 0/3px 0 0 0; } .bottom #tasklist-button, .bottom .budgie-panel button.flat.launcher, .budgie-panel .bottom button.flat.launcher { - border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #6887cd 0%, transparent 0%) 0 0 0 0/0 0 0 0; + border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4d8ef9 0%, transparent 0%) 0 0 0 0/0 0 0 0; } .bottom #tasklist-button:checked, .bottom .budgie-panel button.flat.launcher:checked, .budgie-panel .bottom button.flat.launcher:checked { - border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #6887cd 100%, transparent 0%) 0 0 3 0/0 0 3px 0; + border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4d8ef9 100%, transparent 0%) 0 0 3 0/0 0 3px 0; } .left #tasklist-button, .left .budgie-panel button.flat.launcher, .budgie-panel .left button.flat.launcher { - border-image: radial-gradient(circle closest-corner at calc(1px) center, #6887cd 0%, transparent 0%) 0 0 0 0/0 0 0 0; + border-image: radial-gradient(circle closest-corner at calc(1px) center, #4d8ef9 0%, transparent 0%) 0 0 0 0/0 0 0 0; } .left #tasklist-button:checked, .left .budgie-panel button.flat.launcher:checked, .budgie-panel .left button.flat.launcher:checked { - border-image: radial-gradient(circle closest-corner at calc(1px) center, #6887cd 100%, transparent 0%) 0 0 0 3/0 0 0 3px; + border-image: radial-gradient(circle closest-corner at calc(1px) center, #4d8ef9 100%, transparent 0%) 0 0 0 3/0 0 0 3px; } .right #tasklist-button, .right .budgie-panel button.flat.launcher, .budgie-panel .right button.flat.launcher { - border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #6887cd 0%, transparent 0%) 0 0 0 0/0 0 0 0; + border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #4d8ef9 0%, transparent 0%) 0 0 0 0/0 0 0 0; } .right #tasklist-button:checked, .right .budgie-panel button.flat.launcher:checked, .budgie-panel .right button.flat.launcher:checked { - border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #6887cd 100%, transparent 0%) 0 3 0 0/0 3px 0 0; + border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #4d8ef9 100%, transparent 0%) 0 3 0 0/0 3px 0 0; } #tasklist-button { diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css index 508f324d..bf7e85c1 100644 --- a/src/main/gtk-3.0/gtk-light-solid.css +++ b/src/main/gtk-3.0/gtk-light-solid.css @@ -211,7 +211,7 @@ entry.contacts-postal-entry, spinbutton entry, .linked > entry:not(:only-child) entry.contacts-postal-entry:focus, spinbutton entry:focus, .linked > entry:focus:not(:only-child) { color: #363636; background-color: rgba(0, 0, 0, 0.05); - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); transition-duration: 300ms; } @@ -266,7 +266,7 @@ entry:hover { entry:focus { color: #363636; background-color: rgba(0, 0, 0, 0.05); - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); transition-duration: 300ms; } @@ -357,7 +357,7 @@ entry:drop(active):focus, entry:drop(active) { .osd entry:focus { color: white; - border-color: #5578c7; + border-color: #357ef8; background-color: #0860f2; border-image: none; } @@ -919,7 +919,7 @@ toolbar.inline-toolbar toolbutton:only-child > button.flat { } .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) { - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) { @@ -943,7 +943,7 @@ toolbar.inline-toolbar toolbutton:only-child > button.flat { } .linked.vertical > entry:focus:not(:only-child) { - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .linked.vertical > entry:drop(active):not(:only-child) { @@ -1098,7 +1098,7 @@ button:active:link, button:active:visited, *:link:active { color: #cedffc; } -infobar.info *:link, infobar.question *:link, infobar.warning *:link, infobar.error *:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, button:selected:link, button:selected:visited, *:selected button:link, *:selected button:visited, *:link:selected, *:selected *:link { +infobar.info > revealer > box *:link, infobar.info:hover > revealer > box *:link, infobar.info:backdrop > revealer > box *:link, infobar.question > revealer > box *:link, infobar.question:hover > revealer > box *:link, infobar.question:backdrop > revealer > box *:link, infobar.warning > revealer > box *:link, infobar.warning:hover > revealer > box *:link, infobar.warning:backdrop > revealer > box *:link, infobar.error > revealer > box *:link, infobar.error:hover > revealer > box *:link, infobar.error:backdrop > revealer > box *:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, button:selected:link, button:selected:visited, *:selected button:link, *:selected button:visited, *:link:selected, *:selected *:link { color: #cedffc; } @@ -1123,8 +1123,8 @@ spinbutton entry { } spinbutton entry:focus { - border-color: rgba(103, 164, 233, 0.75); - box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px rgba(103, 164, 233, 0.75); + border-color: rgba(77, 142, 249, 0.75); + box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px rgba(77, 142, 249, 0.75); } spinbutton entry:drop(active) { @@ -1167,7 +1167,7 @@ spinbutton:not(.vertical) > entry + button:not(:active):hover { } spinbutton:not(.vertical) > entry:focus + button { - border-left-color: rgba(103, 164, 233, 0.75); + border-left-color: rgba(77, 142, 249, 0.75); } spinbutton:not(.vertical) > entry:drop(active) + button { @@ -1190,7 +1190,7 @@ spinbutton:not(.vertical) > entry:drop(active) + button { } .osd spinbutton:not(.vertical) > entry:focus + button { - border-left-color: rgba(103, 164, 233, 0.75); + border-left-color: rgba(77, 142, 249, 0.75); } spinbutton.vertical button, spinbutton.vertical entry { @@ -1204,7 +1204,7 @@ spinbutton.vertical button.up { } spinbutton.vertical > entry:focus + button { - border-top-color: rgba(103, 164, 233, 0.75); + border-top-color: rgba(77, 142, 249, 0.75); } spinbutton.vertical > entry:drop(active) + button { @@ -1479,7 +1479,7 @@ headerbar .linked:not(.vertical) > entry:focus { border-radius: 6px; background-image: none; background-color: rgba(0, 0, 0, 0.05); - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } headerbar .linked:not(.vertical) > entry:disabled { @@ -1537,17 +1537,17 @@ headerbar.titlebar headerbar:not(.titlebar) { .selection-mode headerbar, headerbar.selection-mode { color: white; - background-color: #6887cd; - border-color: #597bc8; + background-color: #4d8ef9; + border-color: #3a81f8; box-shadow: none; background-image: none; text-shadow: none; } .selection-mode headerbar:backdrop, headerbar.selection-mode:backdrop { - background-color: #6887cd; + background-color: #4d8ef9; color: rgba(255, 255, 255, 0.6); - border-color: #597bc8; + border-color: #3a81f8; } .selection-mode headerbar button, headerbar.selection-mode button { @@ -1572,7 +1572,7 @@ headerbar.titlebar headerbar:not(.titlebar) { } .maximized .selection-mode headerbar, .maximized headerbar.selection-mode { - background-color: #6887cd; + background-color: #4d8ef9; } .tiled headerbar, .tiled headerbar:backdrop, .maximized headerbar, .maximized headerbar:backdrop { @@ -1751,7 +1751,7 @@ headerbar entry, .titlebar entry { .nemo-window .primary-toolbar entry:focus, headerbar entry:focus { background-image: none; background-color: rgba(0, 0, 0, 0.05); - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .nemo-window .primary-toolbar entry:disabled { @@ -4200,40 +4200,54 @@ paned.vertical > separator.wide { infobar { border-style: none; - background-color: #f5f5f5; } -infobar.info { +infobar.info > revealer > box, infobar.info:backdrop > revealer > box { background-color: #0860f2; } -infobar.question { +infobar.info > revealer > box selection, infobar.info:backdrop > revealer > box selection { + color: #0860f2; +} + +infobar.question > revealer > box, infobar.question:backdrop > revealer > box { background-color: #3484e2; } -infobar.warning { +infobar.question > revealer > box selection, infobar.question:backdrop > revealer > box selection { + color: #3484e2; +} + +infobar.warning > revealer > box, infobar.warning:backdrop > revealer > box { background-color: #F27835; } -infobar.error { +infobar.warning > revealer > box selection, infobar.warning:backdrop > revealer > box selection { + color: #F27835; +} + +infobar.error > revealer > box, infobar.error:backdrop > revealer > box { background-color: #FC4138; } -infobar.info, infobar.question, infobar.warning, infobar.error { +infobar.error > revealer > box selection, infobar.error:backdrop > revealer > box selection { + color: #FC4138; +} + +infobar.info > revealer > box, infobar.info:hover > revealer > box, infobar.info:backdrop > revealer > box, infobar.question > revealer > box, infobar.question:hover > revealer > box, infobar.question:backdrop > revealer > box, infobar.warning > revealer > box, infobar.warning:hover > revealer > box, infobar.warning:backdrop > revealer > box, infobar.error > revealer > box, infobar.error:hover > revealer > box, infobar.error:backdrop > revealer > box { color: white; caret-color: currentColor; } -infobar.info button, infobar.question button, infobar.warning button, infobar.error button { +infobar.info > revealer > box button, infobar.info:hover > revealer > box button, infobar.info:backdrop > revealer > box button, infobar.question > revealer > box button, infobar.question:hover > revealer > box button, infobar.question:backdrop > revealer > box button, infobar.warning > revealer > box button, infobar.warning:hover > revealer > box button, infobar.warning:backdrop > revealer > box button, infobar.error > revealer > box button, infobar.error:hover > revealer > box button, infobar.error:backdrop > revealer > box button { min-height: 28px; } -infobar.info selection, infobar.question selection, infobar.warning selection, infobar.error selection { - color: #0860f2; +infobar.info > revealer > box selection, infobar.info:hover > revealer > box selection, infobar.info:backdrop > revealer > box selection, infobar.question > revealer > box selection, infobar.question:hover > revealer > box selection, infobar.question:backdrop > revealer > box selection, infobar.warning > revealer > box selection, infobar.warning:hover > revealer > box selection, infobar.warning:backdrop > revealer > box selection, infobar.error > revealer > box selection, infobar.error:hover > revealer > box selection, infobar.error:backdrop > revealer > box selection { background-color: white; } -.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button, .nemo-window .floating-bar button, .nautilus-window .floating-bar button, .selection-mode headerbar button, headerbar.selection-mode button, infobar.info button, infobar.question button, infobar.warning button, infobar.error button { +.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button, .nemo-window .floating-bar button, .nautilus-window .floating-bar button, .selection-mode headerbar button, headerbar.selection-mode button, infobar.info > revealer > box button, infobar.info:hover > revealer > box button, infobar.info:backdrop > revealer > box button, infobar.question > revealer > box button, infobar.question:hover > revealer > box button, infobar.question:backdrop > revealer > box button, infobar.warning > revealer > box button, infobar.warning:hover > revealer > box button, infobar.warning:backdrop > revealer > box button, infobar.error > revealer > box button, infobar.error:hover > revealer > box button, infobar.error:backdrop > revealer > box button { color: white; background-color: rgba(255, 255, 255, 0); border-color: rgba(255, 255, 255, 0.5); @@ -4241,7 +4255,7 @@ infobar.info selection, infobar.question selection, infobar.warning selection, i box-shadow: none; } -.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.flat.image-button, .nemo-window .floating-bar button.flat, .nautilus-window .floating-bar button.flat, .selection-mode headerbar button.flat, headerbar.selection-mode button.flat, infobar.info button.flat, infobar.question button.flat, infobar.warning button.flat, infobar.error button.flat { +.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.flat.image-button, .nemo-window .floating-bar button.flat, .nautilus-window .floating-bar button.flat, .selection-mode headerbar button.flat, headerbar.selection-mode button.flat, infobar.info > revealer > box button.flat, infobar.question > revealer > box button.flat, infobar.warning > revealer > box button.flat, infobar.error > revealer > box button.flat { border-color: transparent; background-color: transparent; background-image: none; @@ -4255,14 +4269,14 @@ infobar.info selection, infobar.question selection, infobar.warning selection, i color: rgba(255, 255, 255, 0.4); } -.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:hover, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:hover, .nemo-window .floating-bar button:hover, .nautilus-window .floating-bar button:hover, .selection-mode headerbar button:hover, headerbar.selection-mode button:hover, infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover { +.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:hover, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:hover, .nemo-window .floating-bar button:hover, .nautilus-window .floating-bar button:hover, .selection-mode headerbar button:hover, headerbar.selection-mode button:hover, infobar.info > revealer > box button:hover, infobar.question > revealer > box button:hover, infobar.warning > revealer > box button:hover, infobar.error > revealer > box button:hover { color: white; background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.5); box-shadow: none; } -.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:active, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:active, .nemo-window .floating-bar button:active, .nautilus-window .floating-bar button:active, .selection-mode headerbar button:active, headerbar.selection-mode button:active, infobar.info button:active, infobar.question button:active, infobar.warning button:active, infobar.error button:active, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:active:hover, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:checked, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:checked, .nemo-window .floating-bar button:checked, .nautilus-window .floating-bar button:checked, .selection-mode headerbar button:checked, headerbar.selection-mode button:checked, infobar.info button:checked, infobar.question button:checked, infobar.warning button:checked, infobar.error button:checked { +.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:active, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:active, .nemo-window .floating-bar button:active, .nautilus-window .floating-bar button:active, .selection-mode headerbar button:active, headerbar.selection-mode button:active, infobar.info > revealer > box button:active, infobar.question > revealer > box button:active, infobar.warning > revealer > box button:active, infobar.error > revealer > box button:active, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:active:hover, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:checked, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:checked, .nemo-window .floating-bar button:checked, .nautilus-window .floating-bar button:checked, .selection-mode headerbar button:checked, headerbar.selection-mode button:checked, infobar.info > revealer > box button:checked, infobar.question > revealer > box button:checked, infobar.warning > revealer > box button:checked, infobar.error > revealer > box button:checked { color: white; background-color: rgba(255, 255, 255, 0.4); border-color: rgba(255, 255, 255, 0.5); @@ -5214,7 +5228,7 @@ filechooser paned > separator:hover, } .nemo-window .nemo-window-pane widget.entry { - border: 2px solid rgba(103, 164, 233, 0.75); + border: 2px solid rgba(77, 142, 249, 0.75); background-color: rgba(0, 0, 0, 0.05); border-radius: 6px; box-shadow: none; @@ -5444,17 +5458,6 @@ window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned s background: none; } -workbench.csd > stack.titlebar:not(headerbar) { - padding: 0; - background: none; - border: none; - box-shadow: none; -} - -workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child { - border-radius: 14px 14px 0 0; -} - editortweak .linked > entry.search:focus + .gb-linked-scroller { border-top-color: #0860f2; } @@ -5558,13 +5561,6 @@ popover.popover-selector list row image { margin-right: 10px; } -entry.search.preferences-search { - border: none; - border-right: 1px solid rgba(0, 0, 0, 0.12); - border-bottom: 1px solid rgba(0, 0, 0, 0.12); - border-radius: 0; -} - preferences stacksidebar.sidebar list { background-image: linear-gradient(to bottom, #ffffff, #ffffff); } @@ -5608,6 +5604,10 @@ omnibar.linked > entry:not(:only-child):backdrop image, omnibar.linked > entry:n entry.search.preferences-search { box-shadow: none; + border: none; + border-right: 1px solid rgba(0, 0, 0, 0.12); + border-bottom: 1px solid rgba(0, 0, 0, 0.12); + border-radius: 0; } entry.search.preferences-search:focus { @@ -5616,7 +5616,7 @@ entry.search.preferences-search:focus { } preferencesbin spinbutton { - border-radius: 14px; + border-radius: 6px; border: 1px solid rgba(0, 0, 0, 0.12); background-color: #f5f5f5; } @@ -5639,6 +5639,30 @@ preferencesbin entry.search { margin: 2px; } +dzlpreferencesview stacksidebar.sidebar { + border-bottom-left-radius: 14px; +} + +dzlpreferencesview stacksidebar.sidebar > scrolledwindow > viewport.frame > list { + border-bottom-left-radius: 14px; +} + +dzldockbin#buildui.buildui list.sidebar { + border-bottom-left-radius: 14px; +} + +dzldockbin#editor > ideeditorsidebar.left.pinned.dzldockbinedge { + border-bottom-left-radius: 14px; +} + +dzldockbin#editor > ideeditorsidebar.left.pinned.dzldockbinedge > dzldockpaned treeview.view.project-tree.i-wanna-be-list-box:not(:hover):not(:selected) { + background: none; +} + +ideeditorutilities.bottom.pinned.dzldockbinedge { + border-bottom-right-radius: 14px; +} + gstyleslidein #scale_box button.toggle:checked, gstyleslidein #strings_controls button.toggle:checked, gstyleslidein #palette_controls button.toggle:checked, @@ -5654,6 +5678,29 @@ configurationview list { border-width: 0; } +dzldockbin actionbar { + border-radius: 0 0 14px 14px; +} + +workbench.csd > stack.titlebar:not(headerbar) { + padding: 0; + background: none; + border: none; + box-shadow: none; +} + +workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child { + border-radius: 14px 14px 0 0; +} + +window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar > headerbar > omnibar > .linked > entry { + min-height: 0; +} + +window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar > headerbar > omnibar > .linked > entry > overlay > box.horizontal > box.vertical.pan > button { + min-height: 0; +} + window.org-gnome-Builder.workspace > popover.dzlmenubutton > box.vertical > dzlmenubuttonsection.vertical > box.vertical > button.dzlmenubuttonitem { color: #424242; } @@ -5667,14 +5714,6 @@ window.org-gnome-Builder.workspace > popover.dzlmenubutton > box.vertical > dzlm color: #242424; } -window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar > headerbar > omnibar > .linked > entry { - min-height: 0; -} - -window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar > headerbar > omnibar > .linked > entry > overlay > box.horizontal > box.vertical.pan > button { - min-height: 0; -} - window.background > box.vertical box.horizontal list.categories { border-radius: 0 0 0 14px; } @@ -6120,11 +6159,11 @@ window.background.csd > overlay > leaflet > overlay > scrolledwindow > viewport. } entry.contacts-postal-entry:focus { - box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px rgba(103, 164, 233, 0.75); + box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px rgba(77, 142, 249, 0.75); } entry.contacts-postal-entry:focus + entry.contacts-postal-entry { - border-top-color: rgba(103, 164, 233, 0.75); + border-top-color: rgba(77, 142, 249, 0.75); } stack#titlebar_container.titlebar > stack > headerbar, @@ -6416,7 +6455,7 @@ headerbar.titlebar.incognito-mode entry image, headerbar.titlebar.incognito-mode headerbar.titlebar.incognito-mode entry:focus { background-image: none; background-color: rgba(0, 0, 0, 0.05); - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } headerbar.titlebar.incognito-mode entry:disabled { @@ -6441,7 +6480,7 @@ notebook > box > stack > box.vertical > paned.vertical > overlay > .floating-bar .background headerbar entry.starred:focus, .background headerbar entry.non-starred:focus { background-image: none; background-color: rgba(0, 0, 0, 0.05); - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .background headerbar entry.starred:disabled, .background headerbar label:disabled selection.starred, label:disabled .background headerbar selection.starred, .background headerbar entry.non-starred:disabled, .background headerbar label:disabled selection.non-starred, label:disabled .background headerbar selection.non-starred { @@ -7262,8 +7301,8 @@ window.background:not(.csd) > widget .entry { window.background:not(.csd) > widget > entry:focus, window.background:not(.csd) > widget .entry:focus { - border-color: #6887cd; - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + border-color: #4d8ef9; + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } window.background:not(.csd) > widget > spinbutton { @@ -7911,7 +7950,7 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { .marlin-pathbar.pathbar:focus { background-image: none; background-color: rgba(0, 0, 0, 0.05); - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .marlin-pathbar.pathbar:disabled, label:disabled selection.pathbar { @@ -9316,35 +9355,35 @@ popover.background.places-menu row { } .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher { - border-image: radial-gradient(circle closest-corner at center calc(1px), #6887cd 0%, transparent 0%) 0 0 0 0/0 0 0 0; + border-image: radial-gradient(circle closest-corner at center calc(1px), #4d8ef9 0%, transparent 0%) 0 0 0 0/0 0 0 0; } .top #tasklist-button:checked, .top .budgie-panel button.flat.launcher:checked, .budgie-panel .top button.flat.launcher:checked { - border-image: radial-gradient(circle closest-corner at center calc(1px), #6887cd 100%, transparent 0%) 3 0 0 0/3px 0 0 0; + border-image: radial-gradient(circle closest-corner at center calc(1px), #4d8ef9 100%, transparent 0%) 3 0 0 0/3px 0 0 0; } .bottom #tasklist-button, .bottom .budgie-panel button.flat.launcher, .budgie-panel .bottom button.flat.launcher { - border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #6887cd 0%, transparent 0%) 0 0 0 0/0 0 0 0; + border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4d8ef9 0%, transparent 0%) 0 0 0 0/0 0 0 0; } .bottom #tasklist-button:checked, .bottom .budgie-panel button.flat.launcher:checked, .budgie-panel .bottom button.flat.launcher:checked { - border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #6887cd 100%, transparent 0%) 0 0 3 0/0 0 3px 0; + border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4d8ef9 100%, transparent 0%) 0 0 3 0/0 0 3px 0; } .left #tasklist-button, .left .budgie-panel button.flat.launcher, .budgie-panel .left button.flat.launcher { - border-image: radial-gradient(circle closest-corner at calc(1px) center, #6887cd 0%, transparent 0%) 0 0 0 0/0 0 0 0; + border-image: radial-gradient(circle closest-corner at calc(1px) center, #4d8ef9 0%, transparent 0%) 0 0 0 0/0 0 0 0; } .left #tasklist-button:checked, .left .budgie-panel button.flat.launcher:checked, .budgie-panel .left button.flat.launcher:checked { - border-image: radial-gradient(circle closest-corner at calc(1px) center, #6887cd 100%, transparent 0%) 0 0 0 3/0 0 0 3px; + border-image: radial-gradient(circle closest-corner at calc(1px) center, #4d8ef9 100%, transparent 0%) 0 0 0 3/0 0 0 3px; } .right #tasklist-button, .right .budgie-panel button.flat.launcher, .budgie-panel .right button.flat.launcher { - border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #6887cd 0%, transparent 0%) 0 0 0 0/0 0 0 0; + border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #4d8ef9 0%, transparent 0%) 0 0 0 0/0 0 0 0; } .right #tasklist-button:checked, .right .budgie-panel button.flat.launcher:checked, .budgie-panel .right button.flat.launcher:checked { - border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #6887cd 100%, transparent 0%) 0 3 0 0/0 3px 0 0; + border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #4d8ef9 100%, transparent 0%) 0 3 0 0/0 3px 0 0; } #tasklist-button { diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css index 76d2efee..27ede5ae 100644 --- a/src/main/gtk-3.0/gtk-light.css +++ b/src/main/gtk-3.0/gtk-light.css @@ -211,7 +211,7 @@ entry.contacts-postal-entry, spinbutton entry, .linked > entry:not(:only-child) entry.contacts-postal-entry:focus, spinbutton entry:focus, .linked > entry:focus:not(:only-child) { color: #363636; background-color: rgba(0, 0, 0, 0.05); - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); transition-duration: 300ms; } @@ -266,7 +266,7 @@ entry:hover { entry:focus { color: #363636; background-color: rgba(0, 0, 0, 0.05); - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); transition-duration: 300ms; } @@ -357,7 +357,7 @@ entry:drop(active):focus, entry:drop(active) { .osd entry:focus { color: white; - border-color: #5578c7; + border-color: #357ef8; background-color: #0860f2; border-image: none; } @@ -919,7 +919,7 @@ toolbar.inline-toolbar toolbutton:only-child > button.flat { } .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) { - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .linked:not(.vertical):not(.path-bar) > entry:drop(active):not(:only-child) { @@ -943,7 +943,7 @@ toolbar.inline-toolbar toolbutton:only-child > button.flat { } .linked.vertical > entry:focus:not(:only-child) { - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .linked.vertical > entry:drop(active):not(:only-child) { @@ -1098,7 +1098,7 @@ button:active:link, button:active:visited, *:link:active { color: #cedffc; } -infobar.info *:link, infobar.question *:link, infobar.warning *:link, infobar.error *:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, button:selected:link, button:selected:visited, *:selected button:link, *:selected button:visited, *:link:selected, *:selected *:link { +infobar.info > revealer > box *:link, infobar.info:hover > revealer > box *:link, infobar.info:backdrop > revealer > box *:link, infobar.question > revealer > box *:link, infobar.question:hover > revealer > box *:link, infobar.question:backdrop > revealer > box *:link, infobar.warning > revealer > box *:link, infobar.warning:hover > revealer > box *:link, infobar.warning:backdrop > revealer > box *:link, infobar.error > revealer > box *:link, infobar.error:hover > revealer > box *:link, infobar.error:backdrop > revealer > box *:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, button:selected:link, button:selected:visited, *:selected button:link, *:selected button:visited, *:link:selected, *:selected *:link { color: #cedffc; } @@ -1123,8 +1123,8 @@ spinbutton entry { } spinbutton entry:focus { - border-color: rgba(103, 164, 233, 0.75); - box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px rgba(103, 164, 233, 0.75); + border-color: rgba(77, 142, 249, 0.75); + box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px rgba(77, 142, 249, 0.75); } spinbutton entry:drop(active) { @@ -1167,7 +1167,7 @@ spinbutton:not(.vertical) > entry + button:not(:active):hover { } spinbutton:not(.vertical) > entry:focus + button { - border-left-color: rgba(103, 164, 233, 0.75); + border-left-color: rgba(77, 142, 249, 0.75); } spinbutton:not(.vertical) > entry:drop(active) + button { @@ -1190,7 +1190,7 @@ spinbutton:not(.vertical) > entry:drop(active) + button { } .osd spinbutton:not(.vertical) > entry:focus + button { - border-left-color: rgba(103, 164, 233, 0.75); + border-left-color: rgba(77, 142, 249, 0.75); } spinbutton.vertical button, spinbutton.vertical entry { @@ -1204,7 +1204,7 @@ spinbutton.vertical button.up { } spinbutton.vertical > entry:focus + button { - border-top-color: rgba(103, 164, 233, 0.75); + border-top-color: rgba(77, 142, 249, 0.75); } spinbutton.vertical > entry:drop(active) + button { @@ -1479,7 +1479,7 @@ headerbar .linked:not(.vertical) > entry:focus { border-radius: 6px; background-image: none; background-color: rgba(0, 0, 0, 0.05); - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } headerbar .linked:not(.vertical) > entry:disabled { @@ -1537,17 +1537,17 @@ headerbar.titlebar headerbar:not(.titlebar) { .selection-mode headerbar, headerbar.selection-mode { color: white; - background-color: #6887cd; - border-color: #597bc8; + background-color: #4d8ef9; + border-color: #3a81f8; box-shadow: none; background-image: none; text-shadow: none; } .selection-mode headerbar:backdrop, headerbar.selection-mode:backdrop { - background-color: #6887cd; + background-color: #4d8ef9; color: rgba(255, 255, 255, 0.6); - border-color: #597bc8; + border-color: #3a81f8; } .selection-mode headerbar button, headerbar.selection-mode button { @@ -1572,7 +1572,7 @@ headerbar.titlebar headerbar:not(.titlebar) { } .maximized .selection-mode headerbar, .maximized headerbar.selection-mode { - background-color: #6887cd; + background-color: #4d8ef9; } .tiled headerbar, .tiled headerbar:backdrop, .maximized headerbar, .maximized headerbar:backdrop { @@ -1751,7 +1751,7 @@ headerbar entry, .titlebar entry { .nemo-window .primary-toolbar entry:focus, headerbar entry:focus { background-image: none; background-color: rgba(0, 0, 0, 0.05); - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .nemo-window .primary-toolbar entry:disabled { @@ -4200,40 +4200,54 @@ paned.vertical > separator.wide { infobar { border-style: none; - background-color: #f5f5f5; } -infobar.info { +infobar.info > revealer > box, infobar.info:backdrop > revealer > box { background-color: #0860f2; } -infobar.question { +infobar.info > revealer > box selection, infobar.info:backdrop > revealer > box selection { + color: #0860f2; +} + +infobar.question > revealer > box, infobar.question:backdrop > revealer > box { background-color: #3484e2; } -infobar.warning { +infobar.question > revealer > box selection, infobar.question:backdrop > revealer > box selection { + color: #3484e2; +} + +infobar.warning > revealer > box, infobar.warning:backdrop > revealer > box { background-color: #F27835; } -infobar.error { +infobar.warning > revealer > box selection, infobar.warning:backdrop > revealer > box selection { + color: #F27835; +} + +infobar.error > revealer > box, infobar.error:backdrop > revealer > box { background-color: #FC4138; } -infobar.info, infobar.question, infobar.warning, infobar.error { +infobar.error > revealer > box selection, infobar.error:backdrop > revealer > box selection { + color: #FC4138; +} + +infobar.info > revealer > box, infobar.info:hover > revealer > box, infobar.info:backdrop > revealer > box, infobar.question > revealer > box, infobar.question:hover > revealer > box, infobar.question:backdrop > revealer > box, infobar.warning > revealer > box, infobar.warning:hover > revealer > box, infobar.warning:backdrop > revealer > box, infobar.error > revealer > box, infobar.error:hover > revealer > box, infobar.error:backdrop > revealer > box { color: white; caret-color: currentColor; } -infobar.info button, infobar.question button, infobar.warning button, infobar.error button { +infobar.info > revealer > box button, infobar.info:hover > revealer > box button, infobar.info:backdrop > revealer > box button, infobar.question > revealer > box button, infobar.question:hover > revealer > box button, infobar.question:backdrop > revealer > box button, infobar.warning > revealer > box button, infobar.warning:hover > revealer > box button, infobar.warning:backdrop > revealer > box button, infobar.error > revealer > box button, infobar.error:hover > revealer > box button, infobar.error:backdrop > revealer > box button { min-height: 28px; } -infobar.info selection, infobar.question selection, infobar.warning selection, infobar.error selection { - color: #0860f2; +infobar.info > revealer > box selection, infobar.info:hover > revealer > box selection, infobar.info:backdrop > revealer > box selection, infobar.question > revealer > box selection, infobar.question:hover > revealer > box selection, infobar.question:backdrop > revealer > box selection, infobar.warning > revealer > box selection, infobar.warning:hover > revealer > box selection, infobar.warning:backdrop > revealer > box selection, infobar.error > revealer > box selection, infobar.error:hover > revealer > box selection, infobar.error:backdrop > revealer > box selection { background-color: white; } -.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button, .nemo-window .floating-bar button, .nautilus-window .floating-bar button, .selection-mode headerbar button, headerbar.selection-mode button, infobar.info button, infobar.question button, infobar.warning button, infobar.error button { +.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button, .nemo-window .floating-bar button, .nautilus-window .floating-bar button, .selection-mode headerbar button, headerbar.selection-mode button, infobar.info > revealer > box button, infobar.info:hover > revealer > box button, infobar.info:backdrop > revealer > box button, infobar.question > revealer > box button, infobar.question:hover > revealer > box button, infobar.question:backdrop > revealer > box button, infobar.warning > revealer > box button, infobar.warning:hover > revealer > box button, infobar.warning:backdrop > revealer > box button, infobar.error > revealer > box button, infobar.error:hover > revealer > box button, infobar.error:backdrop > revealer > box button { color: white; background-color: rgba(255, 255, 255, 0); border-color: rgba(255, 255, 255, 0.5); @@ -4241,7 +4255,7 @@ infobar.info selection, infobar.question selection, infobar.warning selection, i box-shadow: none; } -.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.flat.image-button, .nemo-window .floating-bar button.flat, .nautilus-window .floating-bar button.flat, .selection-mode headerbar button.flat, headerbar.selection-mode button.flat, infobar.info button.flat, infobar.question button.flat, infobar.warning button.flat, infobar.error button.flat { +.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.flat.image-button, .nemo-window .floating-bar button.flat, .nautilus-window .floating-bar button.flat, .selection-mode headerbar button.flat, headerbar.selection-mode button.flat, infobar.info > revealer > box button.flat, infobar.question > revealer > box button.flat, infobar.warning > revealer > box button.flat, infobar.error > revealer > box button.flat { border-color: transparent; background-color: transparent; background-image: none; @@ -4255,14 +4269,14 @@ infobar.info selection, infobar.question selection, infobar.warning selection, i color: rgba(255, 255, 255, 0.4); } -.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:hover, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:hover, .nemo-window .floating-bar button:hover, .nautilus-window .floating-bar button:hover, .selection-mode headerbar button:hover, headerbar.selection-mode button:hover, infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover { +.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:hover, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:hover, .nemo-window .floating-bar button:hover, .nautilus-window .floating-bar button:hover, .selection-mode headerbar button:hover, headerbar.selection-mode button:hover, infobar.info > revealer > box button:hover, infobar.question > revealer > box button:hover, infobar.warning > revealer > box button:hover, infobar.error > revealer > box button:hover { color: white; background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.5); box-shadow: none; } -.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:active, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:active, .nemo-window .floating-bar button:active, .nautilus-window .floating-bar button:active, .selection-mode headerbar button:active, headerbar.selection-mode button:active, infobar.info button:active, infobar.question button:active, infobar.warning button:active, infobar.error button:active, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:active:hover, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:checked, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:checked, .nemo-window .floating-bar button:checked, .nautilus-window .floating-bar button:checked, .selection-mode headerbar button:checked, headerbar.selection-mode button:checked, infobar.info button:checked, infobar.question button:checked, infobar.warning button:checked, infobar.error button:checked { +.raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:active, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:active, .nemo-window .floating-bar button:active, .nautilus-window .floating-bar button:active, .selection-mode headerbar button:active, headerbar.selection-mode button:active, infobar.info > revealer > box button:active, infobar.question > revealer > box button:active, infobar.warning > revealer > box button:active, infobar.error > revealer > box button:active, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:active:hover, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child button.flat:checked, .raven scrolledwindow > .frame > box.vertical > box.vertical:last-child .raven-background .raven-mpris button.image-button:checked, .nemo-window .floating-bar button:checked, .nautilus-window .floating-bar button:checked, .selection-mode headerbar button:checked, headerbar.selection-mode button:checked, infobar.info > revealer > box button:checked, infobar.question > revealer > box button:checked, infobar.warning > revealer > box button:checked, infobar.error > revealer > box button:checked { color: white; background-color: rgba(255, 255, 255, 0.4); border-color: rgba(255, 255, 255, 0.5); @@ -5210,7 +5224,7 @@ filechooser paned > separator:hover, } .nemo-window .nemo-window-pane widget.entry { - border: 2px solid rgba(103, 164, 233, 0.75); + border: 2px solid rgba(77, 142, 249, 0.75); background-color: rgba(0, 0, 0, 0.05); border-radius: 6px; box-shadow: none; @@ -5440,17 +5454,6 @@ window.org-gnome-gedit > overlay > box.vertical > paned.gedit-side-panel-paned s background: none; } -workbench.csd > stack.titlebar:not(headerbar) { - padding: 0; - background: none; - border: none; - box-shadow: none; -} - -workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child { - border-radius: 14px 14px 0 0; -} - editortweak .linked > entry.search:focus + .gb-linked-scroller { border-top-color: #0860f2; } @@ -5554,13 +5557,6 @@ popover.popover-selector list row image { margin-right: 10px; } -entry.search.preferences-search { - border: none; - border-right: 1px solid rgba(0, 0, 0, 0.12); - border-bottom: 1px solid rgba(0, 0, 0, 0.12); - border-radius: 0; -} - preferences stacksidebar.sidebar list { background-image: linear-gradient(to bottom, #ffffff, #ffffff); } @@ -5604,6 +5600,10 @@ omnibar.linked > entry:not(:only-child):backdrop image, omnibar.linked > entry:n entry.search.preferences-search { box-shadow: none; + border: none; + border-right: 1px solid rgba(0, 0, 0, 0.12); + border-bottom: 1px solid rgba(0, 0, 0, 0.12); + border-radius: 0; } entry.search.preferences-search:focus { @@ -5612,7 +5612,7 @@ entry.search.preferences-search:focus { } preferencesbin spinbutton { - border-radius: 14px; + border-radius: 6px; border: 1px solid rgba(0, 0, 0, 0.12); background-color: #f5f5f5; } @@ -5635,6 +5635,30 @@ preferencesbin entry.search { margin: 2px; } +dzlpreferencesview stacksidebar.sidebar { + border-bottom-left-radius: 14px; +} + +dzlpreferencesview stacksidebar.sidebar > scrolledwindow > viewport.frame > list { + border-bottom-left-radius: 14px; +} + +dzldockbin#buildui.buildui list.sidebar { + border-bottom-left-radius: 14px; +} + +dzldockbin#editor > ideeditorsidebar.left.pinned.dzldockbinedge { + border-bottom-left-radius: 14px; +} + +dzldockbin#editor > ideeditorsidebar.left.pinned.dzldockbinedge > dzldockpaned treeview.view.project-tree.i-wanna-be-list-box:not(:hover):not(:selected) { + background: none; +} + +ideeditorutilities.bottom.pinned.dzldockbinedge { + border-bottom-right-radius: 14px; +} + gstyleslidein #scale_box button.toggle:checked, gstyleslidein #strings_controls button.toggle:checked, gstyleslidein #palette_controls button.toggle:checked, @@ -5650,6 +5674,29 @@ configurationview list { border-width: 0; } +dzldockbin actionbar { + border-radius: 0 0 14px 14px; +} + +workbench.csd > stack.titlebar:not(headerbar) { + padding: 0; + background: none; + border: none; + box-shadow: none; +} + +workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child { + border-radius: 14px 14px 0 0; +} + +window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar > headerbar > omnibar > .linked > entry { + min-height: 0; +} + +window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar > headerbar > omnibar > .linked > entry > overlay > box.horizontal > box.vertical.pan > button { + min-height: 0; +} + window.org-gnome-Builder.workspace > popover.dzlmenubutton > box.vertical > dzlmenubuttonsection.vertical > box.vertical > button.dzlmenubuttonitem { color: #424242; } @@ -5663,14 +5710,6 @@ window.org-gnome-Builder.workspace > popover.dzlmenubutton > box.vertical > dzlm color: #242424; } -window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar > headerbar > omnibar > .linked > entry { - min-height: 0; -} - -window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar > headerbar > omnibar > .linked > entry > overlay > box.horizontal > box.vertical.pan > button { - min-height: 0; -} - window.background > box.vertical box.horizontal list.categories { border-radius: 0 0 0 14px; } @@ -6116,11 +6155,11 @@ window.background.csd > overlay > leaflet > overlay > scrolledwindow > viewport. } entry.contacts-postal-entry:focus { - box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px rgba(103, 164, 233, 0.75); + box-shadow: 0 1px 1px 0 transparent, inset 0 0 0 1px rgba(77, 142, 249, 0.75); } entry.contacts-postal-entry:focus + entry.contacts-postal-entry { - border-top-color: rgba(103, 164, 233, 0.75); + border-top-color: rgba(77, 142, 249, 0.75); } stack#titlebar_container.titlebar > stack > headerbar, @@ -6412,7 +6451,7 @@ headerbar.titlebar.incognito-mode entry image, headerbar.titlebar.incognito-mode headerbar.titlebar.incognito-mode entry:focus { background-image: none; background-color: rgba(0, 0, 0, 0.05); - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } headerbar.titlebar.incognito-mode entry:disabled { @@ -6437,7 +6476,7 @@ notebook > box > stack > box.vertical > paned.vertical > overlay > .floating-bar .background headerbar entry.starred:focus, .background headerbar entry.non-starred:focus { background-image: none; background-color: rgba(0, 0, 0, 0.05); - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .background headerbar entry.starred:disabled, .background headerbar label:disabled selection.starred, label:disabled .background headerbar selection.starred, .background headerbar entry.non-starred:disabled, .background headerbar label:disabled selection.non-starred, label:disabled .background headerbar selection.non-starred { @@ -7258,8 +7297,8 @@ window.background:not(.csd) > widget .entry { window.background:not(.csd) > widget > entry:focus, window.background:not(.csd) > widget .entry:focus { - border-color: #6887cd; - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + border-color: #4d8ef9; + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } window.background:not(.csd) > widget > spinbutton { @@ -7907,7 +7946,7 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { .marlin-pathbar.pathbar:focus { background-image: none; background-color: rgba(0, 0, 0, 0.05); - box-shadow: inset 0 0 0 2px rgba(103, 164, 233, 0.75); + box-shadow: inset 0 0 0 2px rgba(77, 142, 249, 0.75); } .marlin-pathbar.pathbar:disabled, label:disabled selection.pathbar { @@ -9312,35 +9351,35 @@ popover.background.places-menu row { } .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher { - border-image: radial-gradient(circle closest-corner at center calc(1px), #6887cd 0%, transparent 0%) 0 0 0 0/0 0 0 0; + border-image: radial-gradient(circle closest-corner at center calc(1px), #4d8ef9 0%, transparent 0%) 0 0 0 0/0 0 0 0; } .top #tasklist-button:checked, .top .budgie-panel button.flat.launcher:checked, .budgie-panel .top button.flat.launcher:checked { - border-image: radial-gradient(circle closest-corner at center calc(1px), #6887cd 100%, transparent 0%) 3 0 0 0/3px 0 0 0; + border-image: radial-gradient(circle closest-corner at center calc(1px), #4d8ef9 100%, transparent 0%) 3 0 0 0/3px 0 0 0; } .bottom #tasklist-button, .bottom .budgie-panel button.flat.launcher, .budgie-panel .bottom button.flat.launcher { - border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #6887cd 0%, transparent 0%) 0 0 0 0/0 0 0 0; + border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4d8ef9 0%, transparent 0%) 0 0 0 0/0 0 0 0; } .bottom #tasklist-button:checked, .bottom .budgie-panel button.flat.launcher:checked, .budgie-panel .bottom button.flat.launcher:checked { - border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #6887cd 100%, transparent 0%) 0 0 3 0/0 0 3px 0; + border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #4d8ef9 100%, transparent 0%) 0 0 3 0/0 0 3px 0; } .left #tasklist-button, .left .budgie-panel button.flat.launcher, .budgie-panel .left button.flat.launcher { - border-image: radial-gradient(circle closest-corner at calc(1px) center, #6887cd 0%, transparent 0%) 0 0 0 0/0 0 0 0; + border-image: radial-gradient(circle closest-corner at calc(1px) center, #4d8ef9 0%, transparent 0%) 0 0 0 0/0 0 0 0; } .left #tasklist-button:checked, .left .budgie-panel button.flat.launcher:checked, .budgie-panel .left button.flat.launcher:checked { - border-image: radial-gradient(circle closest-corner at calc(1px) center, #6887cd 100%, transparent 0%) 0 0 0 3/0 0 0 3px; + border-image: radial-gradient(circle closest-corner at calc(1px) center, #4d8ef9 100%, transparent 0%) 0 0 0 3/0 0 0 3px; } .right #tasklist-button, .right .budgie-panel button.flat.launcher, .budgie-panel .right button.flat.launcher { - border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #6887cd 0%, transparent 0%) 0 0 0 0/0 0 0 0; + border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #4d8ef9 0%, transparent 0%) 0 0 0 0/0 0 0 0; } .right #tasklist-button:checked, .right .budgie-panel button.flat.launcher:checked, .budgie-panel .right button.flat.launcher:checked { - border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #6887cd 100%, transparent 0%) 0 3 0 0/0 3px 0 0; + border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #4d8ef9 100%, transparent 0%) 0 3 0 0/0 3px 0 0; } #tasklist-button { diff --git a/src/main/gtk-3.0/gtk.gresource.xml b/src/main/gtk-3.0/gtk.gresource.xml index 468fde31..44fe7b54 100644 --- a/src/main/gtk-3.0/gtk.gresource.xml +++ b/src/main/gtk-3.0/gtk.gresource.xml @@ -143,14 +143,6 @@ assets/paned-separator@2.png assets/paned-separator-dark.png assets/paned-separator-dark@2.png - assets/toggle-on.png - assets/toggle-on@2.png - assets/toggle-off.png - assets/toggle-off@2.png - assets/toggle-on-disabled.png - assets/toggle-on-disabled@2.png - assets/toggle-off-disabled.png - assets/toggle-off-disabled@2.png assets/sidebar-view-hover-200px.png assets/sidebar-view-hover-200px@2.png assets/sidebar-view-active-200px.png diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss index 0a7928b6..5e3844ea 100644 --- a/src/sass/_colors.scss +++ b/src/sass/_colors.scss @@ -26,7 +26,7 @@ $light_track_color: rgba(white, 0.30); $light_divider_color: rgba(white, 0.15); $selected_fg_color: $light_fg_color; -$selected_bg_color: if($variant == 'light', #0860f2, #0860f2); +$selected_bg_color: #0860f2; $primary_color: $selected_bg_color; $selected_borders_color: darken($selected_bg_color, 10%); @@ -48,7 +48,7 @@ $link_color: #3484e2; $link_visited_color: if($variant == 'light', lighten($text_color, 10%), darken($text_color, 15%)); // Theme colors -$selection_mode_bg: #6887cd; +$selection_mode_bg: lighten($selected_bg_color, 15%); $warning_color: #F27835; $error_color: #FC4138; $success_color: #30D158; @@ -131,7 +131,7 @@ $panel_border_color: if($variant == 'light', rgba(white, 0.22), r $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)); +$entry_highlight: rgba($selection_mode_bg, 0.75); // Button colors $button_bg: if($variant == 'light', white, #656565); diff --git a/src/sass/cinnamon/_common.scss b/src/sass/cinnamon/_common.scss index c43825ec..5ba86dd4 100644 --- a/src/sass/cinnamon/_common.scss +++ b/src/sass/cinnamon/_common.scss @@ -223,8 +223,8 @@ StScrollBar { // Switches // .toggle-switch { - width: 50px; - height: 20px; + width: 40px; + height: 24px; background-size: contain; background-image: url("#{$asset_path}/toggle-off.svg"); diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss index 51291985..e0bedcc5 100644 --- a/src/sass/gtk/_applications.scss +++ b/src/sass/gtk/_applications.scss @@ -783,21 +783,6 @@ window.org-gnome-gedit { background: none; } -workbench.csd > stack.titlebar:not(headerbar) { - padding: 0; - background: none; - border: none; - box-shadow: none; - - headerbar { - &, - &:first-child, - &:last-child { - border-radius: $wm_radius $wm_radius 0 0; - } - } -} - editortweak .linked > entry.search:focus + .gb-linked-scroller { border-top-color: $selected_bg_color; } @@ -909,13 +894,6 @@ popover.popover-selector { } } -entry.search.preferences-search { - border: none; - border-right: 1px solid $borders_color; - border-bottom: 1px solid $borders_color; - border-radius: 0; -} - preferences stacksidebar.sidebar { list { background-image: _solid($base_color); @@ -951,6 +929,10 @@ omnibar.linked > entry:not(:only-child) { entry.search.preferences-search { // preferences-search box-shadow: none; + border: none; + border-right: 1px solid $borders_color; + border-bottom: 1px solid $borders_color; + border-radius: 0; &:focus { box-shadow: none; @@ -960,7 +942,7 @@ entry.search.preferences-search { // preferences-search preferencesbin { spinbutton { - border-radius: $wm_radius; + border-radius: $bt_radius; border: 1px solid $borders_color; background-color: $bg_color; @@ -981,6 +963,32 @@ preferencesbin { entry.search { margin: 2px; } } +dzlpreferencesview stacksidebar.sidebar { + border-bottom-left-radius: $wm_radius; + + > scrolledwindow > viewport.frame > list { + border-bottom-left-radius: $wm_radius; + } +} + +dzldockbin#buildui.buildui list.sidebar { + border-bottom-left-radius: $wm_radius; +} + +dzldockbin#editor > ideeditorsidebar.left.pinned.dzldockbinedge { + border-bottom-left-radius: $wm_radius; + + > dzldockpaned { + treeview.view.project-tree.i-wanna-be-list-box:not(:hover):not(:selected) { + background: none; + } + } +} + +ideeditorutilities.bottom.pinned.dzldockbinedge { + border-bottom-right-radius: $wm_radius; +} + gstyleslidein { #scale_box, #strings_controls, @@ -1002,38 +1010,60 @@ configurationview { } } -window.org-gnome-Builder.workspace > popover.dzlmenubutton { - > box.vertical > dzlmenubuttonsection.vertical { - > box.vertical > button.dzlmenubuttonitem { - color: $alt_fg_color; +dzldockbin actionbar { + border-radius: 0 0 $wm_radius $wm_radius; +} - &:active, &:checked { - color: $fg_color; - background-color: rgba($fg_color, 0.25); +workbench.csd > stack.titlebar:not(headerbar) { + padding: 0; + background: none; + border: none; + box-shadow: none; + + headerbar { + &, + &:first-child, + &:last-child { + border-radius: $wm_radius $wm_radius 0 0; + } + } +} + +window.org-gnome-Builder.workspace { + > stack#titlebar_container.titlebar { + > headerbar > omnibar { + > .linked > entry { + min-height: 0; + + > overlay > box.horizontal > box.vertical.pan { + > button { + min-height: 0; + } + } } + } + } - > box.horizontal > box.horizontal { - > label.title { + > popover.dzlmenubutton { + > box.vertical > dzlmenubuttonsection.vertical { + > box.vertical > button.dzlmenubuttonitem { + color: $alt_fg_color; + + &:active, &:checked { color: $fg_color; + background-color: rgba($fg_color, 0.25); + } + + > box.horizontal > box.horizontal { + > label.title { + color: $fg_color; + } } } } } } -window.org-gnome-Builder.workspace > stack#titlebar_container.titlebar { - > headerbar > omnibar { - > .linked > entry { - min-height: 0; - - > overlay > box.horizontal > box.vertical.pan { - > button { - min-height: 0; - } - } - } - } -} // // Gnome-Logs diff --git a/src/sass/gtk/_budgie.scss b/src/sass/gtk/_budgie.scss index 54c595f6..5aa0c47d 100644 --- a/src/sass/gtk/_budgie.scss +++ b/src/sass/gtk/_budgie.scss @@ -1135,12 +1135,7 @@ window.budgie-switcher-window { background-image: none; // draw actual backgrounds and shadows - .drop-shadow { - @extend %drop-shadow; - - // label.budgie-switcher-title { // bottom label for app titles - // } - } + .drop-shadow { @extend %drop-shadow; } flowboxchild { // icon-tiles margin: 2px; diff --git a/src/sass/gtk/_common.scss b/src/sass/gtk/_common.scss index 2eb11f61..03e0352a 100644 --- a/src/sass/gtk/_common.scss +++ b/src/sass/gtk/_common.scss @@ -1010,6 +1010,10 @@ combobox { margin: 2px -10px 2px 0; border-radius: $bt_radius - 1px; border: none; + + @if $variant == 'dark' { + box-shadow: inset 0 1px $button_highlight, 0 0 0 1px $dark_borders_color, 0 1px 2px 0 rgba(black, 0.05); + } } // .background & menu arrow { // Reset menu overflow arrow @@ -3571,31 +3575,60 @@ paned { infobar { border-style: none; - background-color: $bg_color; - &.info { background-color: $selected_bg_color; } - &.question { background-color: $suggested_color; } - &.warning { background-color: $warning_color; } - &.error { background-color: $error_color; } + &.info { + & > revealer > box, + &:backdrop > revealer > box { + background-color: $selected_bg_color; + selection { color: $selected_bg_color; } + } + } + + &.question { + & > revealer > box, + &:backdrop > revealer > box { + background-color: $suggested_color; + selection { color: $suggested_color; } + } + } + + &.warning { + & > revealer > box, + &:backdrop > revealer > box { + background-color: $warning_color; + selection { color: $warning_color; } + } + } + + &.error { + & > revealer > box, + &:backdrop > revealer > box { + background-color: $error_color; + selection { color: $error_color; } + } + } &.info, &.question, &.warning, &.error { - color: $selected_fg_color; - caret-color: currentColor; + & > revealer > box, + &:hover > revealer > box, + &:backdrop > revealer > box { + color: $selected_fg_color; + caret-color: currentColor; - button { - min-height: 28px; - @extend %selected-button; + button { + min-height: 28px; + @extend %selected-button; + } + + selection { + background-color: $selected_fg_color; + } + + *:link { @extend %link_selected; } } - - selection { - color: $selected_bg_color; - background-color: $selected_fg_color; - } - - *:link { @extend %link_selected; } } }