diff --git a/AUTHORS b/AUTHORS index 4fb529a..f8dbd3c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,2 @@ See a list of contributors here -https://github.com/horst3180/Arc-theme/graphs/contributors +https://github.com/Nabile-Rahmani/Arc-39-theme/graphs/contributors diff --git a/Arc-39 logo.svg b/Arc-39 logo.svg new file mode 100644 index 0000000..f201480 --- /dev/null +++ b/Arc-39 logo.svg @@ -0,0 +1,73 @@ + + + + + + + + image/svg+xml + + + + + + + + + Arc-39 + diff --git a/README.arc-theme.md b/README.arc-theme.md new file mode 100644 index 0000000..8c90cfb --- /dev/null +++ b/README.arc-theme.md @@ -0,0 +1,159 @@ +# Arc Theme + +Arc is a flat theme with transparent elements for GTK 3, GTK 2 and GNOME Shell which supports GTK 3 and GTK 2 based desktop environments like GNOME, Unity, Pantheon, Xfce, MATE, Cinnamon (>=3.4), Budgie Desktop (10.4 for GTK+3.22) etc. + +The NicoHood/arc-theme repository is a fork of the horst3180/arc-theme repository which as been umaintained since March 2017. +Its aim is to continue the maintenance of arc-theme. The two maintainers are the Arch-Linux and Debian & Ubuntu packaging maintainers. + +It is strongly encouraged to submit pull-requests to suggest fixes and enhancements. + +## Arc is available in three variants + +##### Arc + +![A screenshot of the Arc theme](http://i.imgur.com/Ph5ObOa.png) + +##### Arc-Darker + +![A screenshot of the Arc-Darker theme](http://i.imgur.com/NC6dqyl.png) + +##### Arc-Dark + +![A screenshot of the Arc-Dark theme](http://i.imgur.com/5AGlCnA.png) + +## Installation + +### Packages + +|Distro|Package Name/Link| +|:----:|:----:| +| Arch Linux | [`arc-gtk-theme`](https://www.archlinux.org/packages/community/any/arc-gtk-theme/), [`arc-solid-gtk-theme`](https://www.archlinux.org/packages/community/any/arc-solid-gtk-theme/) | +| Debian | `arc-theme` | +| Fedora | `arc-theme` | +| Gentoo/Funtoo | `x11-themes/arc-theme` from the [Scriptkitties Overlay][sk-overlay] | +| Sabayon | `arc-theme` +| Solus | `arc-gtk-theme` | +| Ubuntu 16.10 and later | `arc-theme` +| Ubuntu 16.04 and later | `arc-theme` from [fossfreedom/arc-gtk-theme-daily](https://launchpad.net/~fossfreedom/+archive/ubuntu/arc-gtk-theme-daily) | +| FreeBSD | `x11-themes/gtk-arc-themes` | + +-- + +### Manual Installation + +To build the theme the following packages are required +* `autoconf` +* `automake` +* `sassc` for GTK 3, Cinnamon, or GNOME Shell +* `pkg-config` or `pkgconfig` for Fedora +* `git` to clone the source directory +* `optipng` for GTK 2, GTK 3, or XFWM +* `inkscape` for GTK 2, GTK 3, or XFWM + +The following packages are optionally required +* `gnome-shell`for auto-detecting the GNOME Shell version +* `libgtk-3-dev` for Debian based distros or `gtk3-devel` for RPM based distros, for auto-detecting the GTK3 version + +**Note:** For distributions which don't ship separate development packages, just the GTK 3 package is needed instead of the `-dev` packages. + +For the theme to function properly, install the following +* GNOME Shell 3.18 - 3.32, GTK 3.18 - 3.24 +* The `gnome-themes-extra` package +* The murrine engine. This has different names depending on the distro. + * `gtk-engine-murrine` (Arch Linux) + * `gtk2-engines-murrine` (Debian, Ubuntu, elementary OS) + * `gtk-murrine-engine` (Fedora) + * `gtk2-engine-murrine` (openSUSE) + * `gtk-engines-murrine` (Gentoo) + +Install the theme with the following commands + +#### 1. Get the source + +Clone the git repository with + + git clone https://github.com/NicoHood/arc-theme --depth 1 && cd arc-theme + +#### 2. Build and install the theme + + ./autogen.sh --prefix=/usr + sudo make install + +Other options to pass to autogen.sh are + + --disable-transparency disable transparency in the GTK3 theme + --disable-light disable Arc Light support + --disable-darker disable Arc Darker support + --disable-dark disable Arc Dark support + --disable-cinnamon disable Cinnamon support + --disable-gnome-shell disable GNOME Shell support + --disable-gtk2 disable GTK2 support + --disable-gtk3 disable GTK3 support + --disable-metacity disable Metacity support + --disable-unity disable Unity support + --disable-xfwm disable XFWM support + --disable-plank disable Plank theme support + --disable-openbox disable Openbox support + + --with-gnome-shell= build the gnome-shell theme for a specific version + --with-gtk3= build the GTK3 theme for a specific version + Note: Normally the correct version is detected automatically + and these options should not be needed. + +After the installation is complete the theme can be activated with `gnome-tweak-tool` or a similar program by selecting `Arc`, `Arc-Darker` or `Arc-Dark` as Window/GTK+ theme and `Arc` or `Arc-Dark` as GNOME Shell/Cinnamon theme. + +If the `--disable-transparency` option was used, the theme will be installed as `Arc-solid`, `Arc-Darker-solid` and `Arc-Dark-solid`. + +## Uninstall + +Run + + sudo make uninstall + +from the cloned git repository, or + + sudo rm -rf /usr/share/themes/{Arc,Arc-Darker,Arc-Dark} + +## Extras + +### Arc KDE +A port of Arc for the Plasma 5 desktop with a few additions and extras. Available [here](https://github.com/PapirusDevelopmentTeam/arc-kde). + +### Arc icon theme +The Arc icon theme is available at https://github.com/NicoHood/arc-icon-theme + +### Plank theme +As of version `20180114` the plank theme will be installed along with the normal arc gtk theme. You can disable the install by passing `disable-plank` to the autogen command. +Now open the Plank preferences window by executing `plank --preferences` from a terminal and select `Gtk+` as the theme. + +### FirefoxColor theme +Arc color palettes for FirefoxColor testpilot project + +1.[Arc](https://color.firefox.com/?theme=XQAAAALsAAAAAAAAAABBqYhm849SCiazH1KEGccwS-xNVAWBveAusLC2VAlvlSjJ6UJSeqAgCYbdusEoPO6gs3O7v6uHbeft01vfMj--IcmWccV5ZVhbS5pAY21H4rQoo83UfS5UcAgLsFRnmMUloj0SFmW1HehCUMDfDxPPF1kUuA9qWMRgNi28lIsiXLMPZZcTMJdrmyjo335zNimxUcokvCK-KCKaas3H1WasbB4OVMJidW2cC2pVrAp_-pQmAA) + +2.[Arc-Dark](https://color.firefox.com/?theme=XQAAAALsAAAAAAAAAABBqYhm849SCiazH1KEGccwS-xNVAVYwOBtiY0uPWyYE7WQD-5SgdZ71r2F-lXEQxrGAEzv_buK8bCyok70SsUy0GeciWa6veHgAFpeOvR5esr0TgHrmzAVtbaluSV2pYGKFkF03u_F69WpX-5y0OWddI2Y12nn6XZrfhTCe6wjAGRgrpfgKzbG8oTgp9v362NBpHcLnPzzzzC_3PGq4PfhQJimy-2PSgzHFoG6322X_-hAUAA) + +3.[Arc-Darker](https://color.firefox.com/?theme=XQAAAALsAAAAAAAAAABBqYhm849SCiazH1KEGccwS-xNVAWBveAusLC2VAlvlSjJ6UJSeqAgCYbdusEoPO6gs3O7v6uHbeft01vfMkT1y4Tf1nzX1xYaRp0u6XBPage606lAwQt0F0O7Q6pf8R-lAjw8ljDMgG2fgvNk2K-ZUhapxWWNnKLb0LTrm1yLUWJYMgTx2cr9o4MWazvWLg9DPQcdumiH0qiUFROpAtIMassKweMS9iAEenpp0qT_Et_AAA) + +### Arc-Dark for Ubuntu Software Center +The Arc Dark theme for the Ubuntu Software Center by [mervick](https://github.com/mervick) can be installed from [here](https://github.com/mervick/arc-dark-software-center). It solves readability issues with Arc Dark and the Ubuntu Software Center. + +## Troubleshooting + +If you get artifacts like black or invisible backgrounds under Unity, disable overlay scrollbars with + + gsettings set com.canonical.desktop.interface scrollbar-mode normal + + +## Bugs +If you find a bug, please report it at https://github.com/NicoHood/arc-theme/issues + +## License +Arc is available under the terms of the GPL-3.0. See `COPYING` for details. + +## Full Preview +![A full screenshot of the Arc theme](http://i.imgur.com/tD1OBQ3.png) +Screenshot Details: Icons: [Arc](https://github.com/NicoHood/arc-icon-theme) | Launcher Icons based on [White Pixel Icons](http://darkdawg.deviantart.com/art/White-Pixel-Icons-252310560) | [Wallpaper](https://pixabay.com/photo-869593/) | Font: Futura Bk bt + +[sk-overlay]: https://github.com/fkmclane/overlay/tree/master/x11-themes/arc-theme +[NicoHood-fossfreedom]: https://launchpad.net/~fossfreedom/+archive/ubuntu/arc-gtk-theme-daily diff --git a/README.md b/README.md index 8c90cfb..6a9cb1b 100644 --- a/README.md +++ b/README.md @@ -1,159 +1,55 @@ -# Arc Theme +

+logo +

-Arc is a flat theme with transparent elements for GTK 3, GTK 2 and GNOME Shell which supports GTK 3 and GTK 2 based desktop environments like GNOME, Unity, Pantheon, Xfce, MATE, Cinnamon (>=3.4), Budgie Desktop (10.4 for GTK+3.22) etc. +# Arc-39 -The NicoHood/arc-theme repository is a fork of the horst3180/arc-theme repository which as been umaintained since March 2017. -Its aim is to continue the maintenance of arc-theme. The two maintainers are the Arch-Linux and Debian & Ubuntu packaging maintainers. +Arc-39 is a Miku-styled theme for the Linux desktop. -It is strongly encouraged to submit pull-requests to suggest fixes and enhancements. +This theme is based on [Arc Theme](https://github.com/arc-design/arc-theme). -## Arc is available in three variants +### Screenshots -##### Arc +![](https://nabile.duckdns.org/Arc-39/images/gtk3-widget-factory-page-1.png) -![A screenshot of the Arc theme](http://i.imgur.com/Ph5ObOa.png) +![](https://nabile.duckdns.org/Arc-39/images/gtk3-widget-factory-page-2.png) -##### Arc-Darker +## Building -![A screenshot of the Arc-Darker theme](http://i.imgur.com/NC6dqyl.png) +First, [ensure that you have the required packages installed, and review the autogen.sh options available](README.arc-theme.md#manual-installation). -##### Arc-Dark +I build the theme using the following commands: -![A screenshot of the Arc-Dark theme](http://i.imgur.com/5AGlCnA.png) +- `./autogen.sh --prefix=$HOME/.local --with-gtk3=3.22 --disable-light --disable-darker --disable-cinnamon --disable-metacity --disable-unity --disable-xfwm --disable-plank --disable-openbox` +- `make install` -## Installation +At this time, I have only themed the dark variant of GTK 3.20, GTK 2, and GNOME Shell 3.22. -### Packages +This should be compatible with GTK 2, GTK 3.20+, and GNOME Shell 3.18 through 3.24. -|Distro|Package Name/Link| -|:----:|:----:| -| Arch Linux | [`arc-gtk-theme`](https://www.archlinux.org/packages/community/any/arc-gtk-theme/), [`arc-solid-gtk-theme`](https://www.archlinux.org/packages/community/any/arc-solid-gtk-theme/) | -| Debian | `arc-theme` | -| Fedora | `arc-theme` | -| Gentoo/Funtoo | `x11-themes/arc-theme` from the [Scriptkitties Overlay][sk-overlay] | -| Sabayon | `arc-theme` -| Solus | `arc-gtk-theme` | -| Ubuntu 16.10 and later | `arc-theme` -| Ubuntu 16.04 and later | `arc-theme` from [fossfreedom/arc-gtk-theme-daily](https://launchpad.net/~fossfreedom/+archive/ubuntu/arc-gtk-theme-daily) | -| FreeBSD | `x11-themes/gtk-arc-themes` | +### Notes --- +- Since GTK 2 only looks at `~/.themes` for user theme files, you'll want to do either of these things: -### Manual Installation + - `ln -s ~/.local/share/themes ~/.themes` to symlink the XDG themes folder to the user's folder. + - Rebuild with `./autogen.sh --prefix=$HOME/.themes` to move the theme's destination to where GTK 2 will check for files. -To build the theme the following packages are required -* `autoconf` -* `automake` -* `sassc` for GTK 3, Cinnamon, or GNOME Shell -* `pkg-config` or `pkgconfig` for Fedora -* `git` to clone the source directory -* `optipng` for GTK 2, GTK 3, or XFWM -* `inkscape` for GTK 2, GTK 3, or XFWM +- The generated makefiles don't seem to watch for `.scss` changes to update the `.css` files when rebuilding. -The following packages are optionally required -* `gnome-shell`for auto-detecting the GNOME Shell version -* `libgtk-3-dev` for Debian based distros or `gtk3-devel` for RPM based distros, for auto-detecting the GTK3 version + In order to quickly prototype stylesheet edits, remove all `.css` files from the `common` directory, then `make install`. -**Note:** For distributions which don't ship separate development packages, just the GTK 3 package is needed instead of the `-dev` packages. +- Unlike `gtk-3.0`'s `assets.svg` from which resources are automatically generated from, `gnome-shell`'s are individual `.svg` files contained within the `*-assets` folders. -For the theme to function properly, install the following -* GNOME Shell 3.18 - 3.32, GTK 3.18 - 3.24 -* The `gnome-themes-extra` package -* The murrine engine. This has different names depending on the distro. - * `gtk-engine-murrine` (Arch Linux) - * `gtk2-engines-murrine` (Debian, Ubuntu, elementary OS) - * `gtk-murrine-engine` (Fedora) - * `gtk2-engine-murrine` (openSUSE) - * `gtk-engines-murrine` (Gentoo) + To make your life easier, identify common hexadecimal colour codes to modify, and use sed to globally replace the values instead of editing the elements one by one (i.e.: `find common/gnome-shell/3.22 -type f -print0 | xargs -0 sed -i -e 's/#AAAAAA/#BBBBBB/g'`). -Install the theme with the following commands +## Design -#### 1. Get the source +The design is straightforward: -Clone the git repository with +- Background elements (including some of the text) had their red channel zeroed out. This produces a turquoise palette. +- Foreground elements and text are tinted green, like leek. +- Selected elements are tinted pink. - git clone https://github.com/NicoHood/arc-theme --depth 1 && cd arc-theme +## Credits -#### 2. Build and install the theme - - ./autogen.sh --prefix=/usr - sudo make install - -Other options to pass to autogen.sh are - - --disable-transparency disable transparency in the GTK3 theme - --disable-light disable Arc Light support - --disable-darker disable Arc Darker support - --disable-dark disable Arc Dark support - --disable-cinnamon disable Cinnamon support - --disable-gnome-shell disable GNOME Shell support - --disable-gtk2 disable GTK2 support - --disable-gtk3 disable GTK3 support - --disable-metacity disable Metacity support - --disable-unity disable Unity support - --disable-xfwm disable XFWM support - --disable-plank disable Plank theme support - --disable-openbox disable Openbox support - - --with-gnome-shell= build the gnome-shell theme for a specific version - --with-gtk3= build the GTK3 theme for a specific version - Note: Normally the correct version is detected automatically - and these options should not be needed. - -After the installation is complete the theme can be activated with `gnome-tweak-tool` or a similar program by selecting `Arc`, `Arc-Darker` or `Arc-Dark` as Window/GTK+ theme and `Arc` or `Arc-Dark` as GNOME Shell/Cinnamon theme. - -If the `--disable-transparency` option was used, the theme will be installed as `Arc-solid`, `Arc-Darker-solid` and `Arc-Dark-solid`. - -## Uninstall - -Run - - sudo make uninstall - -from the cloned git repository, or - - sudo rm -rf /usr/share/themes/{Arc,Arc-Darker,Arc-Dark} - -## Extras - -### Arc KDE -A port of Arc for the Plasma 5 desktop with a few additions and extras. Available [here](https://github.com/PapirusDevelopmentTeam/arc-kde). - -### Arc icon theme -The Arc icon theme is available at https://github.com/NicoHood/arc-icon-theme - -### Plank theme -As of version `20180114` the plank theme will be installed along with the normal arc gtk theme. You can disable the install by passing `disable-plank` to the autogen command. -Now open the Plank preferences window by executing `plank --preferences` from a terminal and select `Gtk+` as the theme. - -### FirefoxColor theme -Arc color palettes for FirefoxColor testpilot project - -1.[Arc](https://color.firefox.com/?theme=XQAAAALsAAAAAAAAAABBqYhm849SCiazH1KEGccwS-xNVAWBveAusLC2VAlvlSjJ6UJSeqAgCYbdusEoPO6gs3O7v6uHbeft01vfMj--IcmWccV5ZVhbS5pAY21H4rQoo83UfS5UcAgLsFRnmMUloj0SFmW1HehCUMDfDxPPF1kUuA9qWMRgNi28lIsiXLMPZZcTMJdrmyjo335zNimxUcokvCK-KCKaas3H1WasbB4OVMJidW2cC2pVrAp_-pQmAA) - -2.[Arc-Dark](https://color.firefox.com/?theme=XQAAAALsAAAAAAAAAABBqYhm849SCiazH1KEGccwS-xNVAVYwOBtiY0uPWyYE7WQD-5SgdZ71r2F-lXEQxrGAEzv_buK8bCyok70SsUy0GeciWa6veHgAFpeOvR5esr0TgHrmzAVtbaluSV2pYGKFkF03u_F69WpX-5y0OWddI2Y12nn6XZrfhTCe6wjAGRgrpfgKzbG8oTgp9v362NBpHcLnPzzzzC_3PGq4PfhQJimy-2PSgzHFoG6322X_-hAUAA) - -3.[Arc-Darker](https://color.firefox.com/?theme=XQAAAALsAAAAAAAAAABBqYhm849SCiazH1KEGccwS-xNVAWBveAusLC2VAlvlSjJ6UJSeqAgCYbdusEoPO6gs3O7v6uHbeft01vfMkT1y4Tf1nzX1xYaRp0u6XBPage606lAwQt0F0O7Q6pf8R-lAjw8ljDMgG2fgvNk2K-ZUhapxWWNnKLb0LTrm1yLUWJYMgTx2cr9o4MWazvWLg9DPQcdumiH0qiUFROpAtIMassKweMS9iAEenpp0qT_Et_AAA) - -### Arc-Dark for Ubuntu Software Center -The Arc Dark theme for the Ubuntu Software Center by [mervick](https://github.com/mervick) can be installed from [here](https://github.com/mervick/arc-dark-software-center). It solves readability issues with Arc Dark and the Ubuntu Software Center. - -## Troubleshooting - -If you get artifacts like black or invisible backgrounds under Unity, disable overlay scrollbars with - - gsettings set com.canonical.desktop.interface scrollbar-mode normal - - -## Bugs -If you find a bug, please report it at https://github.com/NicoHood/arc-theme/issues - -## License -Arc is available under the terms of the GPL-3.0. See `COPYING` for details. - -## Full Preview -![A full screenshot of the Arc theme](http://i.imgur.com/tD1OBQ3.png) -Screenshot Details: Icons: [Arc](https://github.com/NicoHood/arc-icon-theme) | Launcher Icons based on [White Pixel Icons](http://darkdawg.deviantart.com/art/White-Pixel-Icons-252310560) | [Wallpaper](https://pixabay.com/photo-869593/) | Font: Futura Bk bt - -[sk-overlay]: https://github.com/fkmclane/overlay/tree/master/x11-themes/arc-theme -[NicoHood-fossfreedom]: https://launchpad.net/~fossfreedom/+archive/ubuntu/arc-gtk-theme-daily +Credits go to the authors of the excellent [Arc Theme](https://github.com/arc-design/arc-theme). diff --git a/common/gnome-shell/3.18/common-assets/dash/dash-left.svg b/common/gnome-shell/3.18/common-assets/dash/dash-left.svg index 5fb7bf2..656d1b3 100644 --- a/common/gnome-shell/3.18/common-assets/dash/dash-left.svg +++ b/common/gnome-shell/3.18/common-assets/dash/dash-left.svg @@ -58,12 +58,12 @@ id="layer1" transform="translate(0,-1004.3622)"> + style="display:inline;opacity:0.95;fill:#003945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> diff --git a/common/gnome-shell/3.18/common-assets/dash/running1.svg b/common/gnome-shell/3.18/common-assets/dash/running1.svg index 45036e2..6eb9e88 100644 --- a/common/gnome-shell/3.18/common-assets/dash/running1.svg +++ b/common/gnome-shell/3.18/common-assets/dash/running1.svg @@ -81,7 +81,7 @@ id="selected_bg_color" osb:paint="solid"> diff --git a/common/gnome-shell/3.18/common-assets/dash/running2.svg b/common/gnome-shell/3.18/common-assets/dash/running2.svg index 365fa90..4f8f14b 100644 --- a/common/gnome-shell/3.18/common-assets/dash/running2.svg +++ b/common/gnome-shell/3.18/common-assets/dash/running2.svg @@ -81,7 +81,7 @@ id="selected_bg_color" osb:paint="solid"> diff --git a/common/gnome-shell/3.18/common-assets/dash/running3.svg b/common/gnome-shell/3.18/common-assets/dash/running3.svg index 0de3f4b..dd68300 100644 --- a/common/gnome-shell/3.18/common-assets/dash/running3.svg +++ b/common/gnome-shell/3.18/common-assets/dash/running3.svg @@ -81,7 +81,7 @@ id="selected_bg_color" osb:paint="solid"> diff --git a/common/gnome-shell/3.18/common-assets/dash/running4.svg b/common/gnome-shell/3.18/common-assets/dash/running4.svg index 33ec9cf..960c800 100644 --- a/common/gnome-shell/3.18/common-assets/dash/running4.svg +++ b/common/gnome-shell/3.18/common-assets/dash/running4.svg @@ -81,7 +81,7 @@ id="selected_bg_color" osb:paint="solid"> diff --git a/common/gnome-shell/3.18/common-assets/menu/menu-hover.svg b/common/gnome-shell/3.18/common-assets/menu/menu-hover.svg index 4d3f262..ffd2dee 100644 --- a/common/gnome-shell/3.18/common-assets/menu/menu-hover.svg +++ b/common/gnome-shell/3.18/common-assets/menu/menu-hover.svg @@ -24,7 +24,7 @@ id="selected_bg_color" osb:paint="solid"> diff --git a/common/gnome-shell/3.18/common-assets/misc/bg.svg b/common/gnome-shell/3.18/common-assets/misc/bg.svg index feeddea..d2ca73a 100644 --- a/common/gnome-shell/3.18/common-assets/misc/bg.svg +++ b/common/gnome-shell/3.18/common-assets/misc/bg.svg @@ -58,7 +58,7 @@ id="layer1" transform="translate(0,-1020.3622)"> diff --git a/common/gnome-shell/3.18/common-assets/misc/close-active.svg b/common/gnome-shell/3.18/common-assets/misc/close-active.svg index 95822bf..b179211 100644 --- a/common/gnome-shell/3.18/common-assets/misc/close-active.svg +++ b/common/gnome-shell/3.18/common-assets/misc/close-active.svg @@ -74,7 +74,7 @@ cx="9.4545488" cy="10.181814" r="8" /> diff --git a/common/gnome-shell/3.18/common-assets/misc/corner-ripple-rtl.svg b/common/gnome-shell/3.18/common-assets/misc/corner-ripple-rtl.svg index 57176d2..67190fe 100644 --- a/common/gnome-shell/3.18/common-assets/misc/corner-ripple-rtl.svg +++ b/common/gnome-shell/3.18/common-assets/misc/corner-ripple-rtl.svg @@ -34,11 +34,11 @@ id="linearGradient3857"> diff --git a/common/gnome-shell/3.18/common-assets/misc/more-results.svg b/common/gnome-shell/3.18/common-assets/misc/more-results.svg index 8625db8..1d5c298 100644 --- a/common/gnome-shell/3.18/common-assets/misc/more-results.svg +++ b/common/gnome-shell/3.18/common-assets/misc/more-results.svg @@ -31,7 +31,7 @@ id="selected_bg_color" osb:paint="solid"> diff --git a/common/gnome-shell/3.18/common-assets/misc/osd.svg b/common/gnome-shell/3.18/common-assets/misc/osd.svg index df41a00..b9392d9 100644 --- a/common/gnome-shell/3.18/common-assets/misc/osd.svg +++ b/common/gnome-shell/3.18/common-assets/misc/osd.svg @@ -58,7 +58,7 @@ id="layer1" transform="translate(0,-1020.3622)"> diff --git a/common/gnome-shell/3.18/common-assets/panel/activities-active.svg b/common/gnome-shell/3.18/common-assets/panel/activities-active.svg index ae5c602..715f8bf 100644 --- a/common/gnome-shell/3.18/common-assets/panel/activities-active.svg +++ b/common/gnome-shell/3.18/common-assets/panel/activities-active.svg @@ -83,7 +83,7 @@ id="selected_bg_color" osb:paint="solid"> diff --git a/common/gnome-shell/3.18/common-assets/panel/panel-overview.svg b/common/gnome-shell/3.18/common-assets/panel/panel-overview.svg index c955747..24b3c53 100644 --- a/common/gnome-shell/3.18/common-assets/panel/panel-overview.svg +++ b/common/gnome-shell/3.18/common-assets/panel/panel-overview.svg @@ -58,14 +58,14 @@ id="layer1" transform="translate(0,-1025.3622)"> diff --git a/common/gnome-shell/3.18/dark-assets/checkbox/checkbox-checked-focused.svg b/common/gnome-shell/3.18/dark-assets/checkbox/checkbox-checked-focused.svg index 0c2a8ee..bfe1c04 100644 --- a/common/gnome-shell/3.18/dark-assets/checkbox/checkbox-checked-focused.svg +++ b/common/gnome-shell/3.18/dark-assets/checkbox/checkbox-checked-focused.svg @@ -26,7 +26,7 @@ id="selected_bg_color" osb:paint="solid"> @@ -188,7 +188,7 @@ height="1.9999826" width="5" id="rect3977-39-90" - style="fill:#2b303b;fill-opacity:1;stroke:none" /> + style="fill:#00303b;fill-opacity:1;stroke:none" /> + style="fill:#00303b;fill-opacity:1;stroke:none" /> @@ -188,7 +188,7 @@ height="1.9999826" width="5" id="rect3977-39-90" - style="fill:#2b303b;fill-opacity:1;stroke:none" /> + style="fill:#00303b;fill-opacity:1;stroke:none" /> + style="fill:#00303b;fill-opacity:1;stroke:none" /> @@ -145,7 +145,7 @@ id="g5400-2-47"> diff --git a/common/gnome-shell/3.18/dark-assets/misc/calendar-arrow-right-hover.svg b/common/gnome-shell/3.18/dark-assets/misc/calendar-arrow-right-hover.svg index 5586d55..f4596b9 100644 --- a/common/gnome-shell/3.18/dark-assets/misc/calendar-arrow-right-hover.svg +++ b/common/gnome-shell/3.18/dark-assets/misc/calendar-arrow-right-hover.svg @@ -98,7 +98,7 @@ id="selected_bg_color" osb:paint="solid"> diff --git a/common/gnome-shell/3.18/dark-assets/misc/message-active.svg b/common/gnome-shell/3.18/dark-assets/misc/message-active.svg index 26baa11..9b56079 100644 --- a/common/gnome-shell/3.18/dark-assets/misc/message-active.svg +++ b/common/gnome-shell/3.18/dark-assets/misc/message-active.svg @@ -24,7 +24,7 @@ id="selected_bg_color" osb:paint="solid"> diff --git a/common/gnome-shell/3.18/dark-assets/misc/message-close-active.svg b/common/gnome-shell/3.18/dark-assets/misc/message-close-active.svg index 6d6991a..061279d 100644 --- a/common/gnome-shell/3.18/dark-assets/misc/message-close-active.svg +++ b/common/gnome-shell/3.18/dark-assets/misc/message-close-active.svg @@ -32,7 +32,7 @@ id="selected_bg_color" osb:paint="solid"> diff --git a/common/gnome-shell/3.18/dark-assets/misc/message-close-hover.svg b/common/gnome-shell/3.18/dark-assets/misc/message-close-hover.svg index 6ed2ec1..ec9475f 100644 --- a/common/gnome-shell/3.18/dark-assets/misc/message-close-hover.svg +++ b/common/gnome-shell/3.18/dark-assets/misc/message-close-hover.svg @@ -24,7 +24,7 @@ id="selected_bg_color" osb:paint="solid"> diff --git a/common/gnome-shell/3.18/dark-assets/misc/message-hover.svg b/common/gnome-shell/3.18/dark-assets/misc/message-hover.svg index 7ab720c..333e191 100644 --- a/common/gnome-shell/3.18/dark-assets/misc/message-hover.svg +++ b/common/gnome-shell/3.18/dark-assets/misc/message-hover.svg @@ -24,7 +24,7 @@ id="selected_bg_color" osb:paint="solid"> diff --git a/common/gnome-shell/3.18/dark-assets/misc/message.svg b/common/gnome-shell/3.18/dark-assets/misc/message.svg index 7c8f1b6..5d35d54 100644 --- a/common/gnome-shell/3.18/dark-assets/misc/message.svg +++ b/common/gnome-shell/3.18/dark-assets/misc/message.svg @@ -24,7 +24,7 @@ id="selected_bg_color" osb:paint="solid"> diff --git a/common/gnome-shell/3.18/dark-assets/misc/modal.svg b/common/gnome-shell/3.18/dark-assets/misc/modal.svg index daf9c93..335890f 100644 --- a/common/gnome-shell/3.18/dark-assets/misc/modal.svg +++ b/common/gnome-shell/3.18/dark-assets/misc/modal.svg @@ -30,7 +30,7 @@ height="24.500061" width="43" id="rect4156" - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#FF1177;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#003a47;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> diff --git a/common/gnome-shell/3.18/dark-assets/switch/switch-on.svg b/common/gnome-shell/3.18/dark-assets/switch/switch-on.svg index b6a9be9..c99303b 100644 --- a/common/gnome-shell/3.18/dark-assets/switch/switch-on.svg +++ b/common/gnome-shell/3.18/dark-assets/switch/switch-on.svg @@ -23,7 +23,7 @@ id="selected_bg_color" osb:paint="solid"> @@ -203,7 +203,7 @@ ry="11" rx="11" /> + style="display:inline;opacity:1;fill:#003a47;fill-opacity:1;stroke:none" /> + style="display:inline;opacity:1;fill:#003a47;fill-opacity:1;stroke:none" /> diff --git a/common/gnome-shell/3.18/sass/_colors.scss b/common/gnome-shell/3.18/sass/_colors.scss index 8d3a5f2..02e0fdb 100644 --- a/common/gnome-shell/3.18/sass/_colors.scss +++ b/common/gnome-shell/3.18/sass/_colors.scss @@ -1,14 +1,13 @@ // When color definition differs for dark and light variant, // it gets @if ed depending on $variant +$base_color: if($variant =='light', #ffffff, #004552); +$text_color: if($variant == 'light', #5c616c, #B3FFD6); +$bg_color: if($variant =='light', #F5F6F7, #003C4A); +$fg_color: if($variant =='light', #5c616c, #00DAE3); -$base_color: if($variant =='light', #ffffff, #404552); -$text_color: if($variant == 'light', #5c616c, #D3DAE3); -$bg_color: if($variant =='light', #F5F6F7, #383C4A); -$fg_color: if($variant =='light', #5c616c, #D3DAE3); - -$selected_fg_color: #ffffff; -$selected_bg_color: #5294e2; +$selected_fg_color: #FFFFFF; +$selected_bg_color: #FF1177; $selected_borders_color: darken($selected_bg_color, 20%); $borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%)); @@ -19,17 +18,19 @@ $link_visited_color: if($variant == 'light', darken($selected_bg_color,20%), $selection_mode_bg: if($transparency == 'true', transparentize($selected_bg_color, 0.05), $selected_bg_color); $selection_mode_fg: $selected_fg_color; -$warning_color: #F27835; -$error_color: #FC4138; +$warning_color: #FF8833; +$error_color: #EE2244; $warning_fg_color: white; $error_fg_color: white; -$success_color: #73d216; -$destructive_color: #F04A50; -$suggested_color: #4DADD4; +$success_color: #00DD11; +$destructive_color: $error_color; +$suggested_color: #00CEFF; $destructive_fg_color: white; $suggested_fg_color: white; -$drop_target_color: #F08437; +$drop_target_color: $warning_color; + +$control_color: #52E252; // UI controls (except buttons). //insensitive state derived colors $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55)); @@ -38,8 +39,8 @@ $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), $header_bg: red; @if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#e7e8eb, 0.05); } @if $transparency=='false' and $variant=='light' { $header_bg: #e7e8eb; } -@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343f, 0.03); } -@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343f; } +@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#00343F, 0.03); } +@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #00343F; } $header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%)); @@ -48,8 +49,8 @@ $header_border: if($variant == 'light' and $darker=='false', darken($header_bg, $header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%)); $header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg); -$dark_sidebar_bg: if($transparency == 'true', transparentize(#353945, 0.05), #353945); -$dark_sidebar_fg: #BAC3CF; +$dark_sidebar_bg: if($transparency == 'true', transparentize(#003945, 0.05), #003945); +$dark_sidebar_fg: #00C3CF; $dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%)); $osd_fg_color: $dark_sidebar_fg; @@ -83,19 +84,19 @@ $header_button_border: if($darker == 'true' or $variant == 'dark', transparentiz //WM Buttons // Close -$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #cc575d); -$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #d7787d); -$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #be3841); +$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #FF1177); +$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #FF4499); +$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #DD0066); -$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #2f343f); +$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #00343F); // Minimize, Maximize -$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #454C5C); -$wm_button_active_bg: $selected_bg_color; +$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #004C5C); +$wm_button_active_bg: $control_color; -$wm_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #262932); +$wm_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #002932); -$wm_icon_bg: if($variant == 'light' and $darker == 'false', #90949E, #90939B); -$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #666A74); -$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #C4C7CC); +$wm_icon_bg: if($variant == 'light' and $darker == 'false', #90949E, #00939B); +$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #006A74); +$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #00C7CC); $wm_icon_active_bg: $selected_fg_color; diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss index 64432e4..84d1449 100644 --- a/common/gnome-shell/3.18/sass/_common.scss +++ b/common/gnome-shell/3.18/sass/_common.scss @@ -128,7 +128,7 @@ StScrollBar { border: 0px solid; margin: 0px; - &:hover { background-color: mix($fg_color, $bg_color, 30%); } + &:hover { background-color: mix($selected_bg_color, $bg_color, 70%); } &:active { background-color: $selected_bg_color; } } @@ -141,7 +141,7 @@ StScrollBar { -slider-height: 4px; -slider-background-color: $button_border; //background of the trough -slider-border-color: transparentize(black, 1); //trough border color - -slider-active-background-color: $selected_bg_color; //active trough fill + -slider-active-background-color: $control_color; //active trough fill -slider-active-border-color: transparentize(black, 1); //active trough border -slider-border-width: 0; -slider-handle-radius: 0px; @@ -729,10 +729,10 @@ StScrollBar { height: 4px; background-color: transparentize(black, 0.5); border-radius: 2px; - color: $selected_bg_color; + color: $control_color; } .level-bar { - background-color: $selected_bg_color; + background-color: $control_color; border-radius: 2px; } } diff --git a/common/gnome-shell/3.18/sass/_drawing.scss b/common/gnome-shell/3.18/sass/_drawing.scss index c074950..ac172e2 100644 --- a/common/gnome-shell/3.18/sass/_drawing.scss +++ b/common/gnome-shell/3.18/sass/_drawing.scss @@ -104,9 +104,9 @@ // hovered button // color: $fg_color; - background-color: lighten($button_bg, 5%); + background-color: mix($selected_bg_color, $button_bg, 25%); border: 1px solid $button_border; - box-shadow: inset 0 1px transparentize(lighten($button_bg, 5%), 0.95); + box-shadow: inset 0 1px transparentize(mix($selected_bg_color, $button_bg, 25%), 0.95); } @else if $t==active { @@ -145,7 +145,7 @@ // color: $osd_fg_color; border: 1px solid $osd_button_border; - background-color: opacify(lighten($osd_button_bg, 7%), 0.1); + background-color: opacify(mix($selected_bg_color, $osd_button_bg, 25%), 0.1); box-shadow: inset 0 1px transparentize(black, 0.95); } diff --git a/common/gtk-2.0/dark/assets.svg b/common/gtk-2.0/dark/assets.svg index 87238e3..e3befcc 100644 --- a/common/gtk-2.0/dark/assets.svg +++ b/common/gtk-2.0/dark/assets.svg @@ -15,10 +15,46 @@ height="416" id="svg9892" version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="assets-dark.svg"> + inkscape:version="0.92.1 r15371" + sodipodi:docname="assets.svg"> + + + + + + + + + + + + + + + @@ -418,14 +454,14 @@ inkscape:collect="always" xlink:href="#selected_bg_color" id="linearGradient5018" - x1="44.000002" + x1="44.000004" y1="-279.63782" - x2="44.000002" + x2="44.000004" y2="-255.63782" gradientUnits="userSpaceOnUse" /> - - - - - @@ -825,6 +816,51 @@ y="-280.63782" transform="scale(-1,1)" /> + + + + + + id="guide8384" + inkscape:locked="false" /> @@ -904,7 +941,7 @@ height="416" width="507" id="rect18028" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#383c4a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#003c4a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate" transform="scale(1,-1)" /> + style="opacity:1;fill:#005666;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#002e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#004350;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#003440;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#003340;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> + style="opacity:1;fill:#002934;fill-opacity:1;stroke:#cfd6e6;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> @@ -1113,7 +1150,7 @@ inkscape:connector-curvature="0" id="rect21848-3-1" d="m 20.857147,2.375005 c -1.028857,0 -1.857142,0.8282854 -1.857142,1.8571422 l 0,9.2857108 c 0,1.028857 0.828285,1.857142 1.857142,1.857142 l 9.285711,0 C 31.171715,15.375 32,14.546715 32,13.517858 L 32,4.2321472 C 32,3.2032904 31.171715,2.375005 30.142858,2.375005 Z M 21,3.375 l 9,0 c 0.514428,0 1,0.4855716 1,1 l 0,9 c 0,0.514428 -0.485588,1.004019 -1,1 L 20.857142,14.30357 C 20.34273,14.299552 20,13.889428 20,13.375 l 0,-9 c 0,-0.5144284 0.485572,-1 1,-1 z" - style="opacity:1;fill:#262934;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#002934;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> @@ -1221,7 +1258,7 @@ height="1.9999826" width="5" id="rect3977-39-88" - style="fill:#2b303b;fill-opacity:1;stroke:none" /> + style="fill:#00303b;fill-opacity:1;stroke:none" /> + style="fill:#00303b;fill-opacity:1;stroke:none" /> @@ -1271,7 +1308,7 @@ id="g5428-8-1-7-9"> @@ -1462,7 +1499,7 @@ height="5.3846149" width="5.3863964" id="use15101-5-7-2-3" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#2b303b;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#00303b;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;enable-background:accumulate" ry="2.6923075" /> @@ -1549,7 +1586,7 @@ id="g5400-00-1"> + style="fill:#00303b;fill-opacity:1;stroke:none" /> + style="fill:#00303b;fill-opacity:1;stroke:none" /> + style="opacity:1;fill:#002934;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#002934;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> @@ -1945,7 +1982,7 @@ style=""> + style="opacity:1;fill:#003c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#003c4a;fill-opacity:0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#004552;fill-opacity:1;stroke:url(#linearGradient5035);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:url(#linearGradient5082);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:url(#linearGradient5082-2);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> @@ -3367,7 +3404,7 @@ x="-752" width="1" transform="matrix(0,-1,-1,0,0,0)" - style="fill:#9398a2;fill-opacity:1;stroke:none" + style="fill:#00616c;fill-opacity:1;stroke:none" ry="1.3396484" rx="1.2383881" id="rect8399" @@ -3377,7 +3414,7 @@ x="-752" width="1" transform="matrix(0,-1,-1,0,0,0)" - style="fill:#9398a2;fill-opacity:1;stroke:none" + style="fill:#00616c;fill-opacity:1;stroke:none" ry="1.3396484" rx="1.2383881" id="rect8403" @@ -3387,55 +3424,55 @@ + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> @@ -3560,7 +3597,7 @@ x="-752" width="1" transform="matrix(0,-1,-1,0,0,0)" - style="fill:#9398a2;fill-opacity:1;stroke:none" + style="fill:#00616c;fill-opacity:1;stroke:none" ry="1.3396484" rx="1.2383881" id="rect8399-37" @@ -3570,7 +3607,7 @@ x="-752" width="1" transform="matrix(0,-1,-1,0,0,0)" - style="fill:#9398a2;fill-opacity:1;stroke:none" + style="fill:#00616c;fill-opacity:1;stroke:none" ry="1.3396484" rx="1.2383881" id="rect8403-7" @@ -3580,55 +3617,55 @@ + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#52e252;fill-opacity:1" /> + style="fill:#52e252;fill-opacity:1" /> + style="fill:#52e252;fill-opacity:1" /> + style="fill:#52e252;fill-opacity:1" /> + style="fill:#52e252;fill-opacity:1" /> + style="fill:#52e252;fill-opacity:1" /> + style="fill:#52e252;fill-opacity:1" /> + style="fill:#52e252;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> @@ -3869,7 +3906,7 @@ x="-752" width="1" transform="matrix(0,-1,-1,0,0,0)" - style="fill:#9398a2;fill-opacity:1;stroke:none" + style="fill:#00616c;fill-opacity:1;stroke:none" ry="1.3396484" rx="1.2383881" id="rect8399-37-0-5-5" @@ -3879,7 +3916,7 @@ x="-752" width="1" transform="matrix(0,-1,-1,0,0,0)" - style="fill:#9398a2;fill-opacity:1;stroke:none" + style="fill:#00616c;fill-opacity:1;stroke:none" ry="1.3396484" rx="1.2383881" id="rect8403-7-0-1-2" @@ -3889,55 +3926,55 @@ + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> @@ -3946,7 +3983,7 @@ x="-752" width="1" transform="matrix(0,-1,-1,0,0,0)" - style="fill:#9398a2;fill-opacity:1;stroke:none" + style="fill:#00616c;fill-opacity:1;stroke:none" ry="1.3396484" rx="1.2383881" id="rect8399-7" @@ -3956,7 +3993,7 @@ x="-752" width="1" transform="matrix(0,-1,-1,0,0,0)" - style="fill:#9398a2;fill-opacity:1;stroke:none" + style="fill:#00616c;fill-opacity:1;stroke:none" ry="1.3396484" rx="1.2383881" id="rect8403-47" @@ -3966,55 +4003,55 @@ + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#00616c;fill-opacity:1" /> + style="fill:#52e252;fill-opacity:1" /> + style="fill:#52e252;fill-opacity:1" /> + style="fill:#52e252;fill-opacity:1" /> + style="fill:#52e252;fill-opacity:1" /> + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#0098a2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /> + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#0098a2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /> @@ -4689,7 +4726,7 @@ transform="translate(-205,-108)" inkscape:label="#g5704"> + style="opacity:1;fill:#007f8a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#007f8a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#007f8a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:url(#linearGradient5411);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#005762;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#005762;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#005762;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#005762;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#005762;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#005762;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#00303b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#004852;fill-opacity:1;stroke:#004852;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:0.55;fill:#004a58;fill-opacity:1;stroke:#002933;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#00303b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#00303b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#002e39;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:#002e39;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:#002e39;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:#002e39;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="opacity:1;fill:#004552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#004552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#003c4a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#004552;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#08555e;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:url(#linearGradient5417);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#00303b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#00343f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#002932;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#002e39;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#002e39;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#b31e6a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:url(#linearGradient5423);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#007b87;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#b31e6a;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:url(#linearGradient5429);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#007b87;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#00434f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#002e39;fill-opacity:1;stroke:#f7ef45;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#00434f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:#002e39;fill-opacity:1;stroke:#f7ef45;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#005860;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#005860;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> @@ -5949,7 +5986,7 @@ height="23" width="25" id="rect7903-7-31-1" - style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#2b2e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#002e39;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ry="3" /> @@ -5981,7 +6018,7 @@ style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient5018);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:url(#linearGradient5405);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:1;fill:url(#linearGradient6618-1);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> diff --git a/common/gtk-2.0/dark/gtkrc b/common/gtk-2.0/dark/gtkrc index 9f85145..68721c0 100644 --- a/common/gtk-2.0/dark/gtkrc +++ b/common/gtk-2.0/dark/gtkrc @@ -1,17 +1,17 @@ -gtk-color-scheme = "base_color: #404552" -gtk-color-scheme = "text_color: #d3dae3" -gtk-color-scheme = "bg_color: #383c4a" -gtk-color-scheme = "fg_color: #d3dae3" -gtk-color-scheme = "tooltip_bg_color: #4B5162" -gtk-color-scheme = "tooltip_fg_color: #ffffff" -gtk-color-scheme = "selected_bg_color: #5294e2" -gtk-color-scheme = "selected_fg_color: #ffffff" -gtk-color-scheme = "insensitive_bg_color: #3e4350" -gtk-color-scheme = "insensitive_fg_color: #7c818c" -gtk-color-scheme = "notebook_bg: #404552" -gtk-color-scheme = "dark_sidebar_bg: #353945" -gtk-color-scheme = "link_color: #5294e2" -gtk-color-scheme = "menu_bg: #383c4a" +gtk-color-scheme = "base_color: #004552" +gtk-color-scheme = "text_color: #B3FFD6" +gtk-color-scheme = "bg_color: #003C4A" +gtk-color-scheme = "fg_color: #B3FFD6" +gtk-color-scheme = "tooltip_bg_color: #005162" +gtk-color-scheme = "tooltip_fg_color: #B3FFD6" +gtk-color-scheme = "selected_bg_color: #FF1177" +gtk-color-scheme = "selected_fg_color: #FFFFFF" +gtk-color-scheme = "insensitive_bg_color: #004350" +gtk-color-scheme = "insensitive_fg_color: #00DAE3" +gtk-color-scheme = "notebook_bg: #004552" +gtk-color-scheme = "dark_sidebar_bg: #003945" +gtk-color-scheme = "link_color: #EC7AC9" +gtk-color-scheme = "menu_bg: #003c4a" gtk-icon-sizes = "gtk-button=16,16" # This makes button icons smaller. gtk-auto-mnemonics = 1 diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc index baf7f44..50ee163 100644 --- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc +++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc @@ -1,11 +1,11 @@ style "menubar" { - bg[NORMAL] = "#2f343f" - fg[NORMAL] = "#afb8c5" - fg[PRELIGHT] = "#afb8c5" - fg[ACTIVE] = "#afb8c5" + bg[NORMAL] = "#00343f" + fg[NORMAL] = "#00b8c5" + fg[PRELIGHT] = "#00b8c5" + fg[ACTIVE] = "#00b8c5" fg[SELECTED] = @selected_fg_color - fg[INSENSITIVE] = shade(0.7, "#afb8c5") + fg[INSENSITIVE] = shade(0.7, "#00b8c5") xthickness = 0 ythickness = 0 @@ -23,10 +23,10 @@ style "menubar" { style "menubar-borderless" { - bg[NORMAL] = "#2f343f" - fg[NORMAL] = "#afb8c5" + bg[NORMAL] = "#00343f" + fg[NORMAL] = "#00b8c5" fg[SELECTED] = @selected_fg_color - fg[INSENSITIVE] = shade(0.7, "#afb8c5") + fg[INSENSITIVE] = shade(0.7, "#00b8c5") xthickness = 0 ythickness = 0 @@ -72,15 +72,15 @@ style "menubar-text" { style "toolbar_text" { - fg[NORMAL] = "#afb8c5" - fg[PRELIGHT] = "#afb8c5" - fg[INSENSITIVE] = shade(0.7, "#afb8c5") + fg[NORMAL] = "#00b8c5" + fg[PRELIGHT] = "#00b8c5" + fg[INSENSITIVE] = shade(0.7, "#00b8c5") fg[ACTIVE] = "#afb8c5" - text[NORMAL] = "#afb8c5" - text[PRELIGHT] = "#afb8c5" - text[INSENSITIVE] = shade(0.7, "#afb8c5") - text[ACTIVE] = "#afb8c5" + text[NORMAL] = "#00b8c5" + text[PRELIGHT] = "#00b8c5" + text[INSENSITIVE] = shade(0.7, "#00b8c5") + text[ACTIVE] = "#00b8c5" } @@ -127,11 +127,11 @@ style "toolbar_button" { style "toolbar_entry" { - base[NORMAL] = "#404552" - base[ACTIVE] = "#404552" - base[INSENSITIVE] = "#39404d" + base[NORMAL] = "#004552" + base[ACTIVE] = "#004552" + base[INSENSITIVE] = "#00404d" - text[NORMAL] = "#afb8c5" + text[NORMAL] = "#00b8c5" engine "pixmap" { @@ -187,8 +187,8 @@ style "toolbar_entry" { #Chromium style "chrome-gtk-frame" { - ChromeGtkFrame::frame-color = "#2f343f" - ChromeGtkFrame::inactive-frame-color = "#2f343f" + ChromeGtkFrame::frame-color = "#00343f" + ChromeGtkFrame::inactive-frame-color = "#00343f" ChromeGtkFrame::frame-gradient-size = 0 ChromeGtkFrame::frame-gradient-color = shade(0.5, @bg_color) @@ -219,4 +219,3 @@ widget_class "*ThunarWindow**" styl widget_class "*ThunarWindow**" style "toolbar_button" widget_class "*ThunarWindow**" style "toolbar_text" widget_class "*ThunarWindow***" style "menubar-text" - diff --git a/common/gtk-3.0/3.18/assets.svg b/common/gtk-3.0/3.18/assets.svg deleted file mode 100644 index 882a362..0000000 --- a/common/gtk-3.0/3.18/assets.svg +++ /dev/null @@ -1,6548 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/gtk-3.0/3.18/assets.svg b/common/gtk-3.0/3.18/assets.svg new file mode 120000 index 0000000..73ef7d9 --- /dev/null +++ b/common/gtk-3.0/3.18/assets.svg @@ -0,0 +1 @@ +../3.20/assets.svg \ No newline at end of file diff --git a/common/gtk-3.0/3.20/assets.svg b/common/gtk-3.0/3.20/assets.svg index 882a362..38f83c6 100644 --- a/common/gtk-3.0/3.20/assets.svg +++ b/common/gtk-3.0/3.20/assets.svg @@ -15,7 +15,7 @@ height="276" id="svg9892" version="1.1" - inkscape:version="0.92.2 2405546, 2018-03-11" + inkscape:version="0.92.1 r15371" sodipodi:docname="assets.svg"> @@ -38,7 +38,7 @@ id="selected_bg_color" osb:paint="solid"> @@ -504,17 +504,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="10.752075" - inkscape:cx="417.37051" - inkscape:cy="181.59286" + inkscape:zoom="5.3760375" + inkscape:cx="362.17122" + inkscape:cy="207.99167" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" showborder="false" inkscape:window-width="1920" - inkscape:window-height="1018" + inkscape:window-height="1025" inkscape:window-x="0" - inkscape:window-y="34" + inkscape:window-y="27" inkscape:window-maximized="1" inkscape:snap-nodes="true" inkscape:snap-bbox="true" @@ -3753,7 +3753,7 @@ height="138" width="121" id="rect18028-4" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#383c4a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#003c4a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate" transform="scale(1,-1)" /> + style="fill:#00303b;fill-opacity:1;stroke:none" /> + style="fill:#00303b;fill-opacity:1;stroke:none" /> @@ -4118,7 +4118,7 @@ ry="11" rx="11" /> + style="display:inline;opacity:1;fill:#003a47;fill-opacity:1;stroke:none" /> + style="display:inline;opacity:1;fill:#003a47;fill-opacity:1;stroke:none" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#003a47;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="display:inline;opacity:1;fill:#003a47;fill-opacity:1;stroke:none" /> + style="display:inline;opacity:1;fill:#003a47;fill-opacity:1;stroke:none" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#003a47;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="fill:#00303b;fill-opacity:1;stroke:none" /> + style="fill:#00303b;fill-opacity:1;stroke:none" /> @@ -4768,7 +4768,7 @@ style=""> @@ -4869,13 +4869,13 @@ height="31" width="30.999969" id="rect13851-8-3" - style="fill:#2d323d;fill-opacity:1;stroke:#262934;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="fill:#00323d;fill-opacity:1;stroke:#002934;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" rx="2" /> @@ -4891,7 +4891,7 @@ rx="1.9999999" /> + style="display:inline;opacity:1;fill:#00323f;fill-opacity:1;stroke:none" /> + style="display:inline;opacity:1;fill:#00323f;fill-opacity:1;stroke:none" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#00323f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#00323f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> @@ -5256,7 +5256,7 @@ @@ -5287,7 +5287,7 @@ style="display:inline" transform="translate(58,0)"> @@ -5357,69 +5357,69 @@ + style="fill:#00e3ff;fill-opacity:1"> + style="fill:#00e3ff;fill-opacity:1" /> + style="fill:#00e3ff;fill-opacity:1" /> + style="fill:#00e3ff;fill-opacity:1" /> + style="fill:#00e3ff;fill-opacity:1" /> @@ -5444,67 +5444,67 @@ + style="fill:#00e3ff;fill-opacity:1" /> + style="fill:#00e3ff;fill-opacity:1" /> + style="fill:#00e3ff;fill-opacity:1" /> + style="fill:#00e3ff;fill-opacity:1" /> @@ -5537,7 +5537,7 @@ style="display:inline" transform="translate(58,0)"> @@ -6296,12 +6296,12 @@ inkscape:connector-curvature="0" id="path1997" d="m 1400.7995,255 h 3.3818 c 0.4503,0 0.8162,0.36847 0.8187,0.8188 v 3.3817 z" - style="display:inline;opacity:1;fill:#b9bcc2;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + style="display:inline;opacity:1;fill:#00bcc2;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + style="display:inline;opacity:1;fill:#00bcc2;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + style="display:inline;opacity:0.37000002;fill:#00171c;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> @@ -6388,12 +6388,12 @@ inkscape:connector-curvature="0" id="path2013" d="m 84.799705,975 h 3.381737 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 v 3.3817 z" - style="opacity:1;fill:#c4c7cc;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + style="opacity:1;fill:#00c7cc;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + style="opacity:1;fill:#00c7cc;fill-opacity:1;fill-rule:evenodd;stroke:none" /> diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss index 1e32ce3..56e6048 100644 --- a/common/gtk-3.0/3.20/sass/_applications.scss +++ b/common/gtk-3.0/3.20/sass/_applications.scss @@ -104,7 +104,7 @@ terminal-window, @extend %linked; // from .linked:not(.vertical).path-bar > button:hover in _common.scss - &:hover { background-color: lighten($header_button_bg, 15%); } + &:hover { background-color: mix($selected_bg_color, $header_button_bg, 25%); } &:active, &:checked { @include button(header-active); } @@ -212,7 +212,7 @@ $disk_space_free: darken($bg_color, 3%); @include button(header-hover); - &:hover { background-color: lighten($header_button_bg, 15%); } + &:hover { background-color: mix($selected_bg_color, $header_button_bg, 25%); } &:active, &:checked { @include button(header-active); } &:disabled { color: transparentize($header_fg, 0.4); } @@ -286,7 +286,7 @@ $disk_space_free: darken($bg_color, 3%); border-color: $base_color; // disable borders, making them transparent doesn't work for some reason &:hover { - background-color: mix($fg_color, $base_color, 7%); + background-color: mix($selected_bg_color, $base_color, 25%); &:selected { color: $selected_fg_color; diff --git a/common/gtk-3.0/3.20/sass/_colors.scss b/common/gtk-3.0/3.20/sass/_colors.scss index 66f0540..f029afb 100644 --- a/common/gtk-3.0/3.20/sass/_colors.scss +++ b/common/gtk-3.0/3.20/sass/_colors.scss @@ -1,13 +1,13 @@ // When color definition differs for dark and light variant, // it gets @if ed depending on $variant -$base_color: if($variant =='light', #ffffff, #404552); -$text_color: if($variant == 'light', #5c616c, #D3DAE3); -$bg_color: if($variant =='light', #F5F6F7, #383C4A); -$fg_color: if($variant =='light', #5c616c, #D3DAE3); +$base_color: if($variant =='light', #ffffff, #004552); +$text_color: if($variant == 'light', #5c616c, #B3FFD6); +$bg_color: if($variant =='light', #F5F6F7, #003C4A); +$fg_color: if($variant =='light', #5c616c, #00DAE3); -$selected_fg_color: #ffffff; -$selected_bg_color: #5294e2; +$selected_fg_color: #FFFFFF; +$selected_bg_color: #FF1177; $selected_borders_color: darken($selected_bg_color, 20%); $borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%)); $horizontal_separators_color: if($variant == 'light', $borders_color, darken($fg_color,50%)); @@ -19,17 +19,19 @@ $link_visited_color: if($variant == 'light', darken($selected_bg_color,20%), $selection_mode_bg: if($transparency == 'true', transparentize($selected_bg_color, 0.05), $selected_bg_color); $selection_mode_fg: $selected_fg_color; -$warning_color: #F27835; -$error_color: #FC4138; +$warning_color: #FF8833; +$error_color: #EE2244; $warning_fg_color: white; $error_fg_color: white; -$success_color: #73d216; -$destructive_color: #F04A50; -$suggested_color: #4DADD4; +$success_color: #00DD11; +$destructive_color: $error_color; +$suggested_color: #00CEFF; $destructive_fg_color: white; $suggested_fg_color: white; -$drop_target_color: #F08437; +$drop_target_color: $warning_color; + +$control_color: #52E252; // UI controls (except buttons). //insensitive state derived colors $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55)); @@ -38,8 +40,8 @@ $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), $header_bg: red; @if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#e7e8eb, 0.05); } @if $transparency=='false' and $variant=='light' { $header_bg: #e7e8eb; } -@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343f, 0.03); } -@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343f; } +@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#00343F, 0.03); } +@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #00343F; } $header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%)); @@ -48,8 +50,8 @@ $header_border: if($variant == 'light' and $darker=='false', darken($header_bg, $header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%)); $header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg); -$dark_sidebar_bg: if($transparency == 'true', transparentize(#353945, 0.05), #353945); -$dark_sidebar_fg: #BAC3CF; +$dark_sidebar_bg: if($transparency == 'true', transparentize(#003945, 0.05), #003945); +$dark_sidebar_fg: #00C3CF; $dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%)); $osd_fg_color: $dark_sidebar_fg; @@ -83,19 +85,19 @@ $header_button_border: if($darker == 'true' or $variant == 'dark', transparentiz //WM Buttons // Close -$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #cc575d); -$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #d7787d); -$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #be3841); +$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #FF1177); +$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #FF4499); +$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #DD0066); -$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #2f343f); +$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #00343F); // Minimize, Maximize -$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #454C5C); -$wm_button_active_bg: $selected_bg_color; +$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #004C5C); +$wm_button_active_bg: $control_color; -$wm_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #262932); +$wm_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #002932); -$wm_icon_bg: if($variant == 'light' and $darker == 'false', #90949E, #90939B); -$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #666A74); -$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #C4C7CC); +$wm_icon_bg: if($variant == 'light' and $darker == 'false', #90949E, #00939B); +$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #006A74); +$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #00C7CC); $wm_icon_active_bg: $selected_fg_color; diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 483ef18..74f1ebf 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -275,7 +275,7 @@ entry { margin: 0 -6px; border-radius: 0; border-width: 0 0 2px; - border-color: $selected_bg_color; + border-color: $control_color; border-style: solid; background-image: none; background-color: transparent; @@ -735,7 +735,7 @@ modelbutton.flat { @extend %undecorated_button; - &:hover { background-color: if($variant=='light', mix($fg_color,$bg_color,5%), mix($fg_color,$bg_color,10%)); } + &:hover { background-color: if($variant=='light', mix($fg_color,$bg_color,5%), mix($selected_bg_color,$bg_color,25%)); } &:active, &:selected { &, arrow { @extend %selected_items; } } &:checked { color: $fg_color; } @@ -1166,7 +1166,7 @@ headerbar { } progress { - border-color: $selected_bg_color; + border-color: $control_color; background-image: none; background-color: transparent; } @@ -1231,7 +1231,7 @@ headerbar { } // Reset buttons - .linked:not(.vertical):not(.path-bar):not(.nautilus-path-bar) > button { + .linked:not(.vertical):not(.path-bar):not(.nautilus-path-bar):not(.stack-switcher) > button { &, &:hover, &:active, &:checked, &:disabled { border-radius: 3px; border-style: solid; @@ -1251,9 +1251,11 @@ headerbar { .linked:not(.vertical).path-bar { > button { - @include button(header-hover); + color: $header_fg; + border-color: $header_button_border; + background-color: $header_button_bg; - &:hover { background-color: lighten($header_button_bg, 15%); } + &:hover { background-color: mix($selected_bg_color, $header_button_bg, 25%); } &:active, &:checked { @include button(header-active); } &:disabled { color: transparentize($header_fg, 0.4); } @@ -1303,9 +1305,9 @@ headerbar { caret-color: $selected_fg_color; } button { - &,&:disabled { @include button(header-hover); } + &,&:disabled { @include button(header-hover); } // NOTE: This might be wrong as it assumes a background colour as opposed to a selected one, and this is supposedly disabled. - &:hover { background-color: lighten($header_button_bg, 15%); } + &:hover { background-color: mix($selected_bg_color, $header_button_bg, 25%); } &:active, &:checked { @include button(header-active); } &:disabled { color: transparentize($header_fg, 0.4); } } @@ -1394,8 +1396,8 @@ headerbar { border-color: $_slider_border; } &:active { - background-color: $selected_bg_color; - border-color: $selected_bg_color; + background-color: $control_color; + border-color: $control_color; } &:disabled { background-color: mix($_slider_bg, $header_bg, 70%); @@ -1510,12 +1512,13 @@ treeview.view { &.progressbar, &.progressbar:focus { // progress bar in treeviews color: $selected_fg_color; border-radius: 3px; - background-color: $selected_bg_color; + background-color: $control_color; + text-shadow: -1px -1px $bg_color, 0px -1px $bg_color, 1px -1px $bg_color, 1px 0px $bg_color, 1px 1px $bg_color, 0px 1px $bg_color, -1px 1px $bg_color, -1px 0px $bg_color; &:selected, &:selected:focus { - color: $selected_bg_color; box-shadow: none; background-color: $selected_fg_color; + text-shadow: -1px -1px $selected_bg_color, 0px -1px $selected_bg_color, 1px -1px $selected_bg_color, 1px 0px $selected_bg_color, 1px 1px $selected_bg_color, 0px 1px $selected_bg_color, -1px 1px $selected_bg_color, -1px 0px $selected_bg_color; } } &.trough { // progress bar trough in treeviews @@ -1690,7 +1693,7 @@ menu, border-top: 1px solid mix($fg_color, $base_color, 10%); -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } - &:hover { background-color: mix($fg_color, $base_color, 10%); } + &:hover { background-color: mix($selected_bg_color, $base_color, 25%); } &:disabled { color: transparent; background-color: transparent; @@ -1921,7 +1924,7 @@ scrollbar { background-clip: padding-box; background-color: mix($fg_color, $bg_color, 40%); - &:hover { background-color: mix($fg_color, $bg_color, 30%); } + &:hover { background-color: mix($selected_bg_color, $bg_color, 70%); } &:hover:active { background-color: $selected_bg_color;} @@ -2152,7 +2155,7 @@ scale { background-color: lighten($osd_bg_color, 7%); highlight { - background-color: $selected_bg_color; + background-color: $control_color; &:disabled { } } @@ -2167,9 +2170,9 @@ scale { background-color: transparentize(black, 0.8); highlight { - background-color: $selected_fg_color; + background-color: $control_color; - &:disabled { background-color: mix($selected_fg_color, $selected_bg_color, 55%); } + &:disabled { background-color: mix($selected_fg_color, $control_color, 55%); } } &:disabled { background-color: transparentize(black, 0.9); } @@ -2179,16 +2182,16 @@ scale { // The colored part of trough highlight { border-radius: 2.5px; - background-color: $selected_bg_color; + background-color: $control_color; - &:disabled { background-color: transparentize($selected_bg_color, 0.45); } + &:disabled { background-color: transparentize($control_color, 0.45); } } // this is another differently styled part of the trough, the most relevant use case is for example // in media player to indicate how much video stream as been cached fill { border-radius: 2.5px; - background-color: transparentize($selected_bg_color, 0.5); + background-color: transparentize($control_color, 0.5); &:disabled { background-color: transparent; } } @@ -2207,8 +2210,8 @@ scale { &:active { background-clip: border-box; - background-color: $selected_bg_color; - border-color: $selected_bg_color; + background-color: $control_color; + border-color: $control_color; } &:disabled { @@ -2229,29 +2232,29 @@ scale { border-color: mix($selected_fg_color, $selected_bg_color, 85%); } &:active { - background-color: mix($selected_fg_color, $selected_bg_color, 50%); - border-color: mix($selected_fg_color, $selected_bg_color, 50%); + background-color: mix($selected_fg_color, $control_color, 50%); + border-color: mix($selected_fg_color, $control_color, 50%); } &:disabled{ - background-color: mix($selected_fg_color, $selected_bg_color, 55%); - border-color: mix($selected_fg_color, $selected_bg_color, 55%); + background-color: mix($selected_fg_color, $control_color, 55%); + border-color: mix($selected_fg_color, $control_color, 55%); } } // OSD sliders .osd & { background-clip: border-box; - background-color: $selected_bg_color; - border-color: $selected_bg_color; + background-color: $control_color; + border-color: $control_color; &:hover { - background-color: lighten($selected_bg_color, 10%); - border-color: lighten($selected_bg_color, 10%) + background-color: lighten($control_color, 10%); + border-color: lighten($control_color, 10%) } &:active { - background-color: darken($selected_bg_color, 10%); - border-color: darken($selected_bg_color, 10%); + background-color: darken($control_color, 10%); + border-color: darken($control_color, 10%); } &:disabled { } @@ -2325,7 +2328,7 @@ progressbar { } // Moving bit progress { - background-color: $selected_bg_color; + background-color: $control_color; border: none; border-radius: 3px; box-shadow: none; //needed for clipping @@ -2368,8 +2371,8 @@ levelbar { &.vertical.discrete block { margin: 1px 0; } block:not(.empty) { - border: 1px solid $selected_bg_color; - background-color: $selected_bg_color; + border: 1px solid $control_color; + background-color: $control_color; border-radius: 2px; } block.low { @@ -2377,8 +2380,8 @@ levelbar { background-color: $warning_color; } block.high { - border-color: $selected_bg_color; - background-color: $selected_bg_color; + border-color: $control_color; + background-color: $control_color; } block.full { border-color: $success_color; diff --git a/common/gtk-3.0/3.20/sass/_drawing.scss b/common/gtk-3.0/3.20/sass/_drawing.scss index 120a158..b9ebcb3 100644 --- a/common/gtk-3.0/3.20/sass/_drawing.scss +++ b/common/gtk-3.0/3.20/sass/_drawing.scss @@ -131,7 +131,7 @@ // color: $fg_color; border-color: $button_border; - background-color: lighten($button_bg, 5%); + background-color: mix($selected_bg_color, $button_bg, 25%); } @else if $t==active { @@ -181,7 +181,7 @@ // color: $header_fg; border-color: $header_button_border; - background-color: $header_button_bg; + background-color: mix($selected_bg_color, $header_button_bg, 25%); } @else if $t==header-active { @@ -227,7 +227,7 @@ // color: $osd_fg_color; border-color: $osd_button_border; - background-color: opacify(lighten($osd_button_bg, 7%), 0.1); + background-color: opacify(mix($selected_bg_color, $osd_button_bg, 25%), 0.1); } @else if $t==osd-active { diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss index 2b59744..71acc8d 100644 --- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss @@ -31,7 +31,7 @@ filechooser, .sidebar-icon { color: transparentize($dark_sidebar_fg, 0.4); } &.has-open-popup, - &:hover { background-color: transparentize($dark_sidebar_fg, 0.85); } + &:hover { background-color: transparentize($selected_bg_color, 0.75); } &:disabled { &, label, image { color: transparentize($dark_sidebar_fg, 0.6); } @@ -158,7 +158,7 @@ filechooser { background-color: transparentize($dark_sidebar_fg, 1); &:hover { - background-color: transparentize($dark_sidebar_fg, 0.85); + background-color: transparentize($selected_bg_color, 0.75); } &:active { color: $selected_fg_color; @@ -202,7 +202,7 @@ filechooser { slider { background-color: transparentize(lighten($dark_sidebar_fg, 15%), 0.3); - &:hover { background-color: lighten($dark_sidebar_fg, 20%); } + &:hover { background-color: mix($selected_bg_color, $dark_sidebar_fg, 20%); } &:hover:active { background-color: $selected_bg_color; } diff --git a/common/index/dark/index.theme b/common/index/dark/index.theme index 7f5fbfc..67d72b1 100644 --- a/common/index/dark/index.theme +++ b/common/index/dark/index.theme @@ -1,12 +1,12 @@ [Desktop Entry] Type=X-GNOME-Metatheme -Name=Arc-Dark -Comment=A flat theme with transparent elements +Name=Arc-39 +Comment=A Miku-styled theme for the Linux desktop Encoding=UTF-8 [X-GNOME-Metatheme] -GtkTheme=Arc-Dark -MetacityTheme=Arc-Dark -IconTheme=gnome -CursorTheme=DMZ-Black +GtkTheme=Arc-39 +MetacityTheme=Arc-39 +IconTheme=Arc +CursorTheme=Adwaita ButtonLayout=menu:minimize,maximize,close diff --git a/configure.ac b/configure.ac index a75532a..4184123 100644 --- a/configure.ac +++ b/configure.ac @@ -30,11 +30,11 @@ ARC_ENABLE([OPENBOX], [openbox], [Openbox], [disable]) AS_IF([test "x$ENABLE_TRANSPARENCY" != xno], [ AC_SUBST([themedir], [${datadir}/themes/Arc]) AC_SUBST([themedarkerdir], [${datadir}/themes/Arc-Darker]) - AC_SUBST([themedarkdir], [${datadir}/themes/Arc-Dark]) + AC_SUBST([themedarkdir], [${datadir}/themes/Arc-39]) ], [ AC_SUBST([themedir], [${datadir}/themes/Arc-solid]) AC_SUBST([themedarkerdir], [${datadir}/themes/Arc-Darker-solid]) - AC_SUBST([themedarkdir], [${datadir}/themes/Arc-Dark-solid]) + AC_SUBST([themedarkdir], [${datadir}/themes/Arc-39-solid]) ]) AS_IF([test "x$ENABLE_GTK3" != xno], [ARC_GTK3])