Hello community, here is the log from the commit of package numix-gtk-theme for openSUSE:Factory checked in at 2017-11-19 11:15:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/numix-gtk-theme (Old) and /work/SRC/openSUSE:Factory/.numix-gtk-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "numix-gtk-theme" Sun Nov 19 11:15:39 2017 rev:14 rq:542830 version:2.6.7 Changes: -------- --- /work/SRC/openSUSE:Factory/numix-gtk-theme/numix-gtk-theme.changes 2017-01-04 19:30:16.968627250 +0100 +++ /work/SRC/openSUSE:Factory/.numix-gtk-theme.new/numix-gtk-theme.changes 2017-11-19 11:15:49.145709357 +0100 @@ -1,0 +2,7 @@ +Sat Nov 18 00:00:12 UTC 2017 - [email protected] + +- Update to version 2.6.7: + * See /usr/share/doc/packages/metatheme-numix-common/CHANGES +- Rebase numix-gtk-theme-light-menubars.patch. + +------------------------------------------------------------------- @@ -19 +26 @@ - (gh#numixproject/numix-gtk-theme##619). + (gh#numixproject/numix-gtk-theme#619). Old: ---- numix-gtk-theme-2.6.6.tar.gz New: ---- numix-gtk-theme-2.6.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ numix-gtk-theme.spec ++++++ --- /var/tmp/diff_new_pack.RNZnON/_old 2017-11-19 11:15:50.041676808 +0100 +++ /var/tmp/diff_new_pack.RNZnON/_new 2017-11-19 11:15:50.045676663 +0100 @@ -1,7 +1,7 @@ # # spec file for package numix-gtk-theme # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define _theme Numix %define _name numix Name: numix-gtk-theme -Version: 2.6.6 +Version: 2.6.7 Release: 0 Summary: Numix GTK+ theme for MATE, Cinnamon, GNOME, and Xfce License: GPL-3.0+ @@ -87,12 +87,11 @@ ln -s . src %endif %patch0 -p1 -chmod a-x CREDITS LICENSE README.md %build -if [ -r Makefile ]; then - make %{?_smp_mflags} V=1 -fi +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) || 0%{?sle_version} >= 120200 +make %{?_smp_mflags} V=1 +%endif %install %if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) || 0%{?sle_version} >= 120200 @@ -103,6 +102,7 @@ ls -d */ | while read dir; do cp -a "$dir" "%{buildroot}%{_datadir}/themes/%{_theme}/$dir" done +find %{buildroot} -type f -name "*.orig" -delete -print %endif # Changed to a symlink in numix-gtk-theme 2.6.4, breaks update from older versions. ls -d %{buildroot}%{_datadir}/themes/Numix/gtk-3.*/assets | while read dir; do @@ -118,20 +118,17 @@ %fdupes %{buildroot}%{_datadir}/ %files -n metatheme-%{_name}-common -%defattr(-,root,root) -%doc CREDITS LICENSE README.md +%doc CHANGES CREDITS LICENSE README.md %{_datadir}/themes/%{_theme}/ %exclude %{_datadir}/themes/%{_theme}/gtk-2.*/ %exclude %{_datadir}/themes/%{_theme}/gtk-3.*/ %files -n gtk2-metatheme-%{_name} -%defattr(-,root,root) -%doc CREDITS LICENSE README.md +%doc CHANGES CREDITS LICENSE README.md %{_datadir}/themes/%{_theme}/gtk-2.*/ %files -n gtk3-metatheme-%{_name} -%defattr(-,root,root) -%doc CREDITS LICENSE README.md +%doc CHANGES CREDITS LICENSE README.md %{_datadir}/themes/%{_theme}/gtk-3.*/ %changelog ++++++ numix-gtk-theme-2.6.6.tar.gz -> numix-gtk-theme-2.6.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/.github/CODE_OF_CONDUCT.md new/numix-gtk-theme-2.6.7/.github/CODE_OF_CONDUCT.md --- old/numix-gtk-theme-2.6.6/.github/CODE_OF_CONDUCT.md 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/.github/CODE_OF_CONDUCT.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -# Contributor Code of Conduct - -As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. - -We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. - -Examples of unacceptable behavior by participants include: - -- The use of sexualized language or imagery -- Personal attacks -- Trolling or insulting/derogatory comments -- Public or private harassment -- Publishing other's private information, such as physical or electronic addresses, without explicit permission -- Other unethical or unprofessional conduct - -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not inline with this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. - -By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. - -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. - -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at [[email protected]](mailto:[email protected]). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident. - -This Code of Conduct is adapted from the Contributor Covenant, version 1.3.0, available from http://contributor-covenant.org/version/1/3/0/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/.github/CONTRIBUTING.md new/numix-gtk-theme-2.6.7/.github/CONTRIBUTING.md --- old/numix-gtk-theme-2.6.6/.github/CONTRIBUTING.md 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/.github/CONTRIBUTING.md 2017-10-14 15:23:55.000000000 +0200 @@ -26,7 +26,7 @@ ### Code of Conduct -This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). +This project adheres to the Contributor Covenant [code of conduct](/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [[email protected]](mailto:[email protected]). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/CHANGES new/numix-gtk-theme-2.6.7/CHANGES --- old/numix-gtk-theme-2.6.6/CHANGES 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/CHANGES 2017-10-14 15:23:55.000000000 +0200 @@ -1,3 +1,47 @@ +-------------->>>> 2.6.7 <<<<-------------------------->>>> 2.6.7 <<<<-------------------------->>>> 2.6.7 <<<<-------------- +[2017-10-14 13:52:32 +0530] Gtk-3.20: Add message summary and popover-list styles for geary Khurshid Alam {fd8e657} +[2017-10-14 13:49:06 +0530] Update readme for Ubuntu and Debian Khurshid Alam {5d031a3} +[2017-10-05 10:27:02 -0500] Update README.md Dustin Falgout {8d99a96} +[2017-10-05 10:23:02 -0500] Update urls for distro logo images in README.md Dustin Falgout {a0bd7d1} +[2017-08-30 00:16:16 +0100] Xfwm4: improve accessibility (wider bottom edge) Andrew Chadwick {6057a2d} +[2017-07-26 02:03:28 -0500] Update CONTRIBUTING.md Dustin Falgout {858e629} +[2017-07-26 02:01:53 -0500] Delete CODE_OF_CONDUCT.md Dustin Falgout {68d01fe} +[2017-07-26 02:01:29 -0500] Create CODE_OF_CONDUCT.md Dustin Falgout {88632d8} +[2017-06-15 14:27:30 +0530] [Gnome-Panel-3.24] Add style for tasklist-button Khurshid Alam {f2425ca} +[2017-06-13 20:10:05 +0530] [Gtk-2.0] Set inkscape-decoration & gtk--small-toolbar icon to 16px.. Khurshid Alam {abf6111} +[2017-06-13 02:39:50 +0530] [Gtk-3.20] Tilix: Do not bottom-border color Khurshid Alam {06be2fa} +[2017-06-13 02:34:23 +0530] [Gtk-3.20] Tilix: Add bottom border for active titlebar. Fixes #657 Khurshid Alam {82568c7} +[2017-06-06 12:53:28 +0530] [Gtk-3.20] Metacity: Use normal geometry-style for nautilus dialogs.. Khurshid Alam {deed3fb} +[2017-05-14 21:20:12 -0500] Update README.md Dustin Falgout {30ae59b} +[2017-05-10 20:03:46 +0530] Fix syntax error in previous commit Khurshid Alam {402fd48} +[2017-05-10 14:05:55 +0530] [Gtk-3.18] Fix white border on tilix. Fixes #655 Khurshid Alam {4289b97} +[2017-04-16 19:49:09 -0400] README: update Arch package name (#663) Ronan Jouchet {582f09f} +[2017-04-14 22:11:26 +0530] [Gtk-3.22] Tweaks in popover.events list for gnome-calendar Khurshid Alam {487d8e6} +[2017-04-08 22:58:43 +0530] Use darker background for solid-csd window. Fixes #659 Khurshid Alam {bf8f3b0} +[2017-03-29 21:44:29 +0530] Fix indentation Khurshid Alam {35e5463} +[2017-03-29 21:30:13 +0530] [Gtk-3.22] Re-Introduce disabled state under treeview.progressbar Khurshid Alam {ab172c2} +[2017-03-29 19:35:48 +0530] [Gtk-3.22] Progressbar under Treeview: Minor fixes Khurshid Alam {c8828c7} +[2017-03-21 01:23:40 -0500] Update README.md Dustin Falgout {deddc89} +[2017-03-21 01:22:27 -0500] Update README.md Dustin Falgout {f55b6a7} +[2017-03-13 22:38:18 +0530] [Gtk-3.22] Use box-shadow to draw border on Notebook tab Khurshid Alam {d99f46c} +[2017-02-15 13:29:13 +0530] [Gtk-3.22] Separate titlebar mixin from toolbar Khurshid Alam {f25d7e0} +[2017-02-15 12:46:53 +0530] Attempting to fix >1px height in linked combobox-button Khurshid Alam {f52633e} +[2017-02-09 22:15:04 +0530] [Gtk-3.22] Provide gap between buttons in message dialog. 3.22 fix .. Khurshid Alam {ec299d4} +[2017-02-09 22:06:13 +0530] [Gtk-3.22] Fixing & adjusting menu & modelbutton padding Khurshid Alam {653556d} +[2017-02-08 20:20:55 +0530] [Gtk-3.20][Gtk-3.22] GtkCalendar under popover menu Khurshid Alam {0220883} +[2017-02-07 16:06:37 +0530] [Gtk-3.22][Switches] Make slider to fall in-line with the text Khurshid Alam {23f1543} +[2017-02-06 20:15:39 +0530] [Button-Redesign] Lighten active a checked state button color for l.. Khurshid Alam {d2f201b} +[2017-02-06 18:25:09 +0530] Fixinng notebook-tab-active color and close button style Khurshid Alam {777d586} +[2017-02-05 10:39:36 +0530] [Gtk-3.22][Button-Redesign] Spinbutton: Fixing color and entry border Khurshid Alam {85138a0} +[2017-02-04 14:32:13 +0530] [Gtk-3.22][Button-Redesign] Fixed spinbutton hover-state color Khurshid Alam {8670cc0} +[2017-02-04 00:44:26 +0530] [Gtk-3.22] Redesign-Buttons (Phase1) Khurshid Alam {9e4844a} +[2017-01-30 22:22:09 +0530] Flatter button. More prominent shadow on hover. Fixing #370 Khurshid Alam {2363312} +[2017-01-30 22:09:37 +0530] [Gtk-3.22] Normalize Switches. Fixes #396 Khurshid Alam {3be320f} +[2017-01-23 12:43:55 +0100] [Gtk-3.22][Gtk-3.20] Fix iconview background for Unity-Control-Cent.. Csaba Jakosa {1a8c9bf} +[2017-01-22 19:20:32 +0100] [GTK 3.22] Add hover effect for menuitem under Unity-LIM. Fixes #632 Csaba Jakosa {45210ca} +[2017-01-12 21:39:54 +0530] Set Numix as default icon theme for MATE's theme picker. Fixes #488 Khurshid Alam {92b576f} +[2016-11-19 16:36:45 -0600] Update README.md Dustin Falgout {0e4a840} +[2016-11-19 23:34:56 +0100] Add Debian and Ubuntu official distro package, remove Ubuntu PPA. (.. Léo Andrès {b24ed9e} -------------->>>> 2.6.6 <<<<-------------------------->>>> 2.6.6 <<<<-------------------------->>>> 2.6.6 <<<<-------------- [2016-11-14 16:22:11 -0600] update utils.sh script Dustin Falgout {795932a} [2016-11-10 05:37:27 +0100] [Gtk-3.20] Fixed gnome-terminal scrollbar color. Disable backdrop m.. Csaba Jakosa {9574a02} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/CODE_OF_CONDUCT.md new/numix-gtk-theme-2.6.7/CODE_OF_CONDUCT.md --- old/numix-gtk-theme-2.6.6/CODE_OF_CONDUCT.md 1970-01-01 01:00:00.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/CODE_OF_CONDUCT.md 2017-10-14 15:23:55.000000000 +0200 @@ -0,0 +1,46 @@ +# Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/README.md new/numix-gtk-theme-2.6.7/README.md --- old/numix-gtk-theme-2.6.6/README.md 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/README.md 2017-10-14 15:23:55.000000000 +0200 @@ -1,21 +1,16 @@ ## Numix ##### A modern flat theme with a combination of light and dark elements. It supports GNOME, Unity, Xfce and Openbox. -[](https://numixproject.org/) [](https://circleci.com/gh/numixproject/numix-gtk-theme/tree/master) [](https://github.com/numixproject/numix-gtk-theme/releases/latest)   +[](https://numixproject.org/) [](https://circleci.com/gh/numixproject/numix-gtk-theme/tree/master) [](https://github.com/numixproject/numix-gtk-theme/releases/latest)   ## Install It -### Official Distro Packages +### Distro Packages |Distro|Install Command/Links| |:----:|:----:| -| |`sudo pacman -S numix-themes`| -||[1 Click Install](http://software.opensuse.org/ymp/openSUSE:Factory/standard/numix-gtk-theme.ymp) \| [OBS Repo](http://software.opensuse.org/download.html?project=openSUSE%3AFactory&package=numix-gtk-theme)| -||`sudo dnf install numix-gtk-theme`| - -### Unofficial Distro Packages -|Distro|Install Command/Links| -|:----:|:----:| -||[PPA](https://launchpad.net/~numix/+archive/ubuntu/ppa)| - +|![arch][arch] ![antergos][antergos]|`sudo pacman -S numix-gtk-theme`| +|![opensuse][opensuse]|[1 Click Install](http://software.opensuse.org/ymp/openSUSE:Factory/standard/numix-gtk-theme.ymp) \| [OBS Repo](http://software.opensuse.org/download.html?project=openSUSE%3AFactory&package=numix-gtk-theme)| +|![fedora][fedora]|`sudo dnf install numix-gtk-theme`| +|![debian][debian] ![ubuntu][ubuntu]|`sudo apt install numix-gtk-theme`| ## Build It @@ -23,32 +18,20 @@ To install Sass, install Ruby and the gem command using your distribution's package manager. Then install `sass` with the `gem` command, -`gem install sass` +`gem install sass` (not needed for Ubuntu/Debian) You'll also need the ```glib-compile-schemas``` and ```gdk-pixbuf-pixdata``` commands in your path to generate the gresource binary. Install them using your distribution's package manager. -#### Debian, Ubuntu - - ```sh -sudo apt-get install libglib2.0-dev libgdk-pixbuf2.0-dev libxml2-utils -``` - -#### Fedora - -```sh -sudo dnf install glib2-devel gdk-pixbuf2-devel -``` - -#### Arch Linux - -```sh -sudo pacman -S glib2 gdk-pixbuf2 -``` +|Distro|Commands| +|:----:|:----:| +|![arch][arch] ![antergos][antergos]|`sudo pacman -S glib2 gdk-pixbuf2`| +|![opensuse][opensuse]|`sudo zipper install glib2-devel gdk-pixbuf-devel`| +|![fedora][fedora]|`sudo dnf install glib2-devel gdk-pixbuf2-devel`| +|![debian][debian] ![ubuntu][ubuntu]|`sudo apt-get install ruby-sass libglib2.0-dev libgdk-pixbuf2.0-dev libxml2-utils`| -After installing all the dependencies, switch to the cloned directory and, run the following in Terminal, +After installing all the dependencies, change to the cloned directory and, run the following in Terminal, ```sh -make sudo make install ``` @@ -91,3 +74,12 @@ Report bugs or contribute at [GitHub](https://github.com/numixproject/numix-gtk-theme) License: GPL-3.0+ + + +[antergos]: https://antergos.com/distro-logos/logo-square26x26.png "antergos" +[arch]: https://antergos.com/distro-logos/archlogo26x26.png "arch" +[fedora]: https://antergos.com/distro-logos/fedora-logo.png "fedora" +[openSUSE]: https://antergos.com/distro-logos/Geeko-button-bling7.png "openSUSE" +[ubuntu]: https://antergos.com/distro-logos/ubuntu_orange_hex.png "ubuntu" +[debian]: https://antergos.com/distro-logos/openlogo-nd-25.png "debian" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-2.0/gtkrc new/numix-gtk-theme-2.6.7/src/gtk-2.0/gtkrc --- old/numix-gtk-theme-2.6.6/src/gtk-2.0/gtkrc 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-2.0/gtkrc 2017-10-14 15:23:55.000000000 +0200 @@ -2,6 +2,8 @@ gtk-color-scheme = "bg_color:#eeeeee\nfg_color:#555555\nbase_color:#ffffff\ntext_color:#333333\nselected_bg_color:#f0544c\nselected_fg_color:#ffffff\ntooltip_bg_color:#444444\ntooltip_fg_color:#eeeeee\ntitlebar_bg_color:#444444\ntitlebar_fg_color:#dddddd\nmenubar_bg_color:#444444\nmenubar_fg_color:#dddddd\ntoolbar_bg_color:#eeeeee\ntoolbar_fg_color:#555555\nmenu_bg_color:#444444\nmenu_fg_color:#dddddd\npanel_bg_color:#444444\npanel_fg_color:#dddddd\nlink_color:#f06860" +gtk-icon-sizes = "inkscape-decoration=16,16:gtk-small-toolbar=16,16" + # Default Style style "murrine-default" { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.0/scss/_widgets.scss new/numix-gtk-theme-2.6.7/src/gtk-3.0/scss/_widgets.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.0/scss/_widgets.scss 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.0/scss/_widgets.scss 2017-10-14 15:23:55.000000000 +0200 @@ -35,3 +35,4 @@ @import "apps/unity"; @import "apps/lightdm"; @import "apps/gnome-terminal"; +@import "apps/gnome-applications"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.0/scss/apps/_gnome-applications.scss new/numix-gtk-theme-2.6.7/src/gtk-3.0/scss/apps/_gnome-applications.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.0/scss/apps/_gnome-applications.scss 1970-01-01 01:00:00.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.0/scss/apps/_gnome-applications.scss 2017-10-14 15:23:55.000000000 +0200 @@ -0,0 +1,10 @@ +/**************** + ! Tilix * +*****************/ + +@include exports("tilix") { + .terminal-titlebar { + border-color: $titlebar_bg_color; + } +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/_global.scss new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/_global.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/_global.scss 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/_global.scss 2017-10-14 15:23:55.000000000 +0200 @@ -3,7 +3,7 @@ @import "functions"; // default color scheme -$bg_color: if($variant == "dark", #444, #eee); +$bg_color: if($variant == "dark", #444, #dedede); $fg_color: if($variant == "dark", #ddd, #555); $base_color: if($variant == "dark", #333, #fff); $text_color: if($variant == "dark", #eee, #333); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/apps/_gnome-applications.scss new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/apps/_gnome-applications.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/apps/_gnome-applications.scss 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/apps/_gnome-applications.scss 2017-10-14 15:23:55.000000000 +0200 @@ -29,3 +29,50 @@ } } } + + +/************************ + ! Unity-Control-Center * +*************************/ + +@include exports("unity-control-center") { + // Fixed: https://github.com/numixproject/numix-gtk-theme/issues/634 + .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame { + // hide unwanted frames + border: 0 none transparent; + + > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical { + // reset $base_color; + iconview.view { + &, &:backdrop { + background-color: transparent; + } + + &:selected { + &:focus, & { + @extend %selected_items; + } + } + } + } + } +} + + +/**************** + ! Geary * +*****************/ + +@include exports("geary") { + .geary-expanded .geary-message-summary { + background-color: shade($base_color, 0.95); + } + + .geary-folder-popover-list-row { + border-color: shade($menu_bg_color, 1.2); + box-shadow: None; + + & > label { color: $bg_color; } + } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/apps/_gnome-terminal.scss new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/apps/_gnome-terminal.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/apps/_gnome-terminal.scss 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/apps/_gnome-terminal.scss 2017-10-14 15:23:55.000000000 +0200 @@ -1,3 +1,5 @@ +@import "widgets/button"; + /********************** ! Genome Terminal * ***********************/ @@ -35,3 +37,16 @@ } } } + + +/********************** + ! Tilix * +***********************/ + +@include exports("tilix") { + .terminal-titlebar:active { + border-width: 0 0 2px 0; + border-style: solid; + border-color: $selected_bg_color; + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/apps/_panel.scss new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/apps/_panel.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/apps/_panel.scss 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/apps/_panel.scss 2017-10-14 15:23:55.000000000 +0200 @@ -54,7 +54,11 @@ color: $black; } - #clock-applet-button { &, &:backdrop { @extend %panelbutton; } } + #clock-applet-button, + #tasklist-button, + #showdesktop-button { + &, &:backdrop { @extend %panelbutton; } + } panel-applet { border: 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/apps/_unity.scss new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/apps/_unity.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/apps/_unity.scss 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/apps/_unity.scss 2017-10-14 15:23:55.000000000 +0200 @@ -33,6 +33,16 @@ color: mix($titlebar_fg_color, $titlebar_bg_color, .1); text-shadow: none; + // Fixed: https://github.com/numixproject/numix-gtk-theme/issues/632 + // for L.I.M's selected menuitem + &:hover { + border-radius: 0; + border-color: mix($panel_bg_color, $panel_fg_color, .21); + background-color: mix($panel_bg_color, $panel_fg_color, .21); + background-image: none; + color: shade($panel_fg_color, 1.08); + } + &:backdrop { border: 1px solid $wm_border_unfocused; color: mix($titlebar_fg_color, $titlebar_bg_color, .4); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_button.scss new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_button.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_button.scss 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_button.scss 2017-10-14 15:23:55.000000000 +0200 @@ -43,9 +43,9 @@ } %button { - min-height: 16px; - min-width: 16px; - padding: $spacing ($spacing + 2px); + //min-height: 16px; + //min-width: 16px; + padding: $spacing ($spacing + 1); border-width: 1px; border-style: solid; border-radius: $roundness; @@ -273,14 +273,19 @@ $border_strength: if(lightness($bg) > 50, 0, .1); $shadow_strength: if(lightness($bg) > 50, 0, .1); - $button_bg: if(hue($bg) == 0deg, shade($bg, 1.2), $bg); + $button_bg: if(lightness($bg) > 50, $bg, shade($bg, 1.2)); @extend %button; - @include linear-gradient($button_bg); - @include border(rgba(0, 0, 0, .12 + $border_strength)); - + @if (lightness($button_bg) > 50) { + border-color: border_normal($button_bg); + @include linear-gradient(shade($button_bg, 1.08)); + } @else { + @include linear-gradient($button_bg); + @include border(rgba(0, 0, 0, .12 + $border_strength)); + } + color: $fg; - box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); + &.flat { border-color: alpha($button_bg, 0); @@ -291,24 +296,32 @@ &, &.flat { &:focus, &:hover { - @include linear-gradient(shade($button_bg, 1.2)); - @include border(rgba(0, 0, 0, .2 + $border_strength)); + @if (lightness($button_bg) > 50) { + border-color: border_active($button_bg); + @include linear-gradient(shade($button_bg, 1.11)); + } @else { + @include linear-gradient(shade($button_bg, 1.2)); + @include border(rgba(0, 0, 0, .2 + $border_strength)); + } - box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); + } + &:checked, &:active { - @include linear-gradient(shade($button_bg, .7), to top); - + @if (lightness($button_bg) > 50) { + @include linear-gradient(shade($button_bg, .8), to top); + } @else { + @include linear-gradient(shade($button_bg, .7), to top); + } color: $white; - box-shadow: inset 1px 0 alpha($dark_shadow, .06), - inset 0 1px alpha($dark_shadow, .07), - inset -1px 0 alpha($dark_shadow, .06), - inset 0 -1px alpha($dark_shadow, .05); &:focus, &:hover { - @include linear-gradient(shade($button_bg, .65), to top); - + @if (lightness($button_bg) > 50) { + @include linear-gradient(shade($button_bg, .75), to top); + } @else { + @include linear-gradient(shade($button_bg, .65), to top); + } color: $white; } } @@ -379,12 +392,12 @@ } button { - @include button(shade($bg_color, 1.2), $fg_color); + @include button($bg_color, $fg_color); .inline-toolbar &, - .linked > & { @include linked_button(shade($bg_color, 1.2)); } + .linked > & { @include linked_button($bg_color); } - .linked.vertical > & { @include linked_vertical_button(shade($bg_color, 1.2)); } + .linked.vertical > & { @include linked_vertical_button($bg_color); } &.circular, &.circular-button { // FIXME: aggregate to buttons @@ -412,9 +425,16 @@ } &:not(.vertical) { - @extend %entry; - @include linear-gradient($base_color, to top); - @include border($base_color); + @if (lightness($bg_color) > 50) { + border: 1px solid border_normal($bg_color); + background-color: transparent; + background-image: none; + box-shadow: inset 1px 0 shade($base_color, .9); + } @else { + @extend %entry; + @include linear-gradient($base_color, to top); + @include border($base_color); + } padding: 0; @@ -425,7 +445,6 @@ &:disabled { @include linear-gradient(shade($base_color, .9), to top); - color: mix($base_color, $text_color, .5); } @@ -443,6 +462,16 @@ background-image: none; box-shadow: none; + @if (lightness($bg_color) > 50) { + background-color: shade($bg_color, 1.08); + } + + &:hover { + @if (lightness($bg_color) > 50) { + background-color: shade($bg_color, 1.11); + } + } + &:dir(rtl) { border-style: none solid none none; } &:active { box-shadow: inset 0 2px 3px -1px transparentize($black, .8); } @@ -451,7 +480,6 @@ &:backdrop:disabled { border-style: none none none solid; // It is needed or it gets overridden - &:dir(rtl) { border-style: none solid none none; } } @@ -497,8 +525,8 @@ button.combo { // otherwise the arrow placement is not symmetric min-width: 0; - padding-left: $spacing + 2px; - padding-right: $spacing + 2px; + //padding-left: $spacing + 1px; + //padding-right: $spacing + 1px; } arrow { @@ -509,9 +537,11 @@ box button, box entry { @extend %linked_button; - padding: $spacing ($spacing + 2px); } + //hack to get rid of extra +1px height in linked combobox + //.linked:not(.vertical) button.combo { padding: 4px; } + .linked:not(.vertical) > & > box > button.combo { // the combo is a composite widget so the way we do button linked doesn't // work, special case needed. See diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_entry.scss new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_entry.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_entry.scss 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_entry.scss 2017-10-14 15:23:55.000000000 +0200 @@ -90,11 +90,16 @@ border-width: 1px; border-style: solid; border-radius: $roundness; - transition: border 150ms ease; - box-shadow: inset 1px 1px alpha($dark_shadow, .06), - inset -1px 0 alpha($dark_shadow, .06); + border-color: border_normal($bg_color); + transition: border 100ms ease-out; + &:focus, &:hover, &:active { transition: border 100ms ease-in; } + + box-shadow: inset 1px 0 alpha($dark_shadow, 0.10), + inset 0 1px alpha($dark_shadow, 0.12), + inset -1px 0 alpha($dark_shadow, 0.10), + inset 0 -1px alpha($dark_shadow, 0.05); + - &:focus, &:hover, &:active { transition: none; } &:selected { &, &:selected:focus { @@ -149,7 +154,7 @@ @mixin entry($bg, $fg, $border: $borders_color) { @extend %entry; @include linear-gradient($bg, to top); - @include border($bg); + border-color: border_normal($bg); padding: $spacing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_menu.scss new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_menu.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_menu.scss 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_menu.scss 2017-10-14 15:23:55.000000000 +0200 @@ -1,6 +1,32 @@ @import "entry"; + +@mixin menu_calendar($bg, $fg) { + color: $fg; + + &.header { + border-bottom: 1px solid shade($bg, ($contrast + .1)); + border-radius: 0; + + &:backdrop { border-color: shade($bg, ($contrast + .1)); } + } + + &.button { + @extend %undecorated_button; + color: alpha($fg, .55); + + &:hover { + @extend %undecorated_button; + color: $fg; + } + } + + &:indeterminate, + &:indeterminate:backdrop { color: mix($fg, $bg, .5); } +} + + /********* ! Menubar **********/ @@ -47,7 +73,7 @@ .context-menu { border: 0; border-radius: 0; - padding: 2px 0; + padding: 0; background-color: $menu_bg_color; color: $menu_fg_color; @@ -59,7 +85,7 @@ separator, .csd & separator { background-color: shade($menu_bg_color, ($contrast + .1)); - margin: ($spacing - 2px) 0; + margin: 1px 0; } // Firefox workaround @@ -67,7 +93,7 @@ .csd & .separator { color: shade($menu_bg_color, ($contrast + .1)); } menuitem { - min-height: 16px; + min-height: 14px; min-width: 40px; padding: $spacing - 1px; border-radius: 0; @@ -85,8 +111,8 @@ // submenu indicators arrow { - min-height: 16px; - min-width: 16px; + min-height: 14px; + min-width: 14px; &:dir(ltr) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); @@ -115,31 +141,7 @@ } } - calendar { - color: $menu_fg_color; - - &.header { - border-bottom: 1px solid shade($menu_bg_color, ($contrast + .1)); - border-radius: 0; - - &:backdrop { border-color: shade($menu_bg_color, ($contrast + .1)); } - } - - &.button { - @extend %undecorated_button; - - color: alpha($menu_fg_color, .55); - - &:hover { - @extend %undecorated_button; - - color: $menu_fg_color; - } - } - - &:indeterminate, - &:indeterminate:backdrop { color: mix($menu_fg_color, $menu_bg_color, .5); } - } + calendar { @include menu_calendar($menu_bg_color, $menu_fg_color); } // avoids labels color being overridden, see // https://bugzilla.gnome.org/show_bug.cgi?id=767058 @@ -150,8 +152,8 @@ > arrow { //@include button(undecorated); - min-height: 16px; - min-width: 16px; + min-height: 14px; + min-width: 14px; padding: $spacing; background-color: $menu_bg_color; border-radius: 0; @@ -194,8 +196,8 @@ } check, radio { - min-height: 16px; - min-width: 16px; + min-height: 14px; + min-width: 14px; &:dir(ltr) { margin-right: 7px; } &:dir(rtl) { margin-left: 7px; } @@ -276,15 +278,50 @@ button { @include button($menu_bg_color, $menu_fg_color); } + calendar { @include menu_calendar($menu_bg_color, $menu_fg_color); } + > list, > .view, > toolbar { border-style: none; background-color: transparent; } } + //gnome-calendar-fix + popover.events { + grid.vertical { + &, & list, & list row, & list box { + margin: 0; + border-radius: 0; + background-color: $menu_bg_color; + } + } + + grid.vertical box.vertical { + border-top-left-radius: 0; + border-top-right-radius: 0; + } + } + + popover { + list.calendar-list row { padding: 0px; } + + datechooser { + & grid.vertical navigator button { + min-height: 20px; + min-width: 20px; + margin: 5px; + } + + & grid.horizontal day.day { + min-height: 24px; + min-width: 24px; + } + } + } + modelbutton.flat, menuitem.button.flat { - padding: $spacing ($spacing + 2px); + padding: ($spacing - 1px) ($spacing + 1px); outline-color: transparent; transition: none; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_misc.scss new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_misc.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_misc.scss 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_misc.scss 2017-10-14 15:23:55.000000000 +0200 @@ -42,8 +42,8 @@ @include exports("dialogs") { messagedialog, .message-dialog, .prompt { -GtkDialog-content-area-border: 0; - -GtkDialog-action-area-border: $spacing; - -GtkDialog-button-spacing: 0; + -GtkDialog-action-area-border: 0; + -GtkDialog-button-spacing: $spacing; margin: 0; padding: 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_notebook.scss new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_notebook.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_notebook.scss 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_notebook.scss 2017-10-14 15:23:55.000000000 +0200 @@ -145,28 +145,21 @@ tab { padding: 0; - border-style: solid; - border-width: 1px; // for reorderable tabs - border-color: transparent; // - background-image: none; - box-shadow: none; outline: none; > box, > label, > widget > box { - padding: $spacing $spacing * 2; // top/bottom | left/right - border-width: 2px; - border-style: solid; - border-color: transparent; - transition: border-color .2s linear; + padding: ($spacing + 2px) $spacing * 2; // top/bottom | left/right + box-shadow: 1px 1px transparent; //duplicate shadows used for transition? + transition: box-shadow .2s linear; } &.reorderable-page { > box, > label, > widget > box { - padding: $spacing $spacing * 2; // top | right | bottom | left + padding: ($spacing + 2px) $spacing * 2; // top | right | bottom | left } } @@ -179,7 +172,7 @@ min-width: 16px; padding: 0; margin-left: $spacing * 2; - border: 1px solid transparent; + //border: 1px solid transparent; transition: all .1s linear; } @@ -187,15 +180,15 @@ background-color: shade($base_color, .93); border-color: transparent; outline: none; - - button, - button.flat { - border: 1px solid alpha($bg_color, .1); - } } &:checked { - background-color: mix($bg_color, $base_color, .4); + @if (lightness($bg_color) > 50) { + background-color: mix($bg_color, $base_color, .7); + } @else { + background-color: mix($bg_color, $base_color, .4); + } + border-bottom-color: transparent; outline: none; @@ -204,7 +197,11 @@ } &:hover { - background-color: mix($bg_color, $base_color, .6); + @if (lightness($bg_color) > 50) { + background-color: mix($bg_color, $base_color, .9); + } @else { + background-color: mix($bg_color, $base_color, .6); + } } } @@ -213,153 +210,122 @@ } } - &.top tab, - &.bottom tab { + + &.top tab { + box-shadow: inset 0 -1px $borders_color; + transition: box-shadow .2s ease-out; + &:hover { + outline: none; &:not(:first-child):not(:last-child):not(:only-child) { - box-shadow: 1px 0 1px shade($base_color, .85), -1px 0 1px shade($base_color, .85); + box-shadow: 1px 0 1px shade($base_color, .85), -1px 0 1px shade($base_color, .85), inset 0 -1px $borders_color; } &:last-child:not(:only-child) { - box-shadow: -1px 0 1px shade($base_color, .85); + box-shadow: -1px 0 1px shade($base_color, .85), inset 0 -1px $borders_color; } &:first-child:not(:only-child) { - box-shadow: 1px 0 1px shade($base_color, .85); - } + box-shadow: 1px 0 1px shade($base_color, .85), inset 0 -1px $borders_color; + } } &:checked { - &:not(:first-child):not(:last-child):not(:only-child) { - box-shadow: 1px 0 1px shade($base_color, .8), -1px 0 1px shade($base_color, .8); - } + outline: none; - &:last-child:not(:only-child) { - box-shadow: -1px 0 1px shade($base_color, .8); + label { + margin-bottom: 0; + color: $selected_bg_color; } - &:first-child:not(:only-child) { - box-shadow: 1px 0 1px shade($base_color, .8); + &:hover { + background-color: mix($bg_color, $base_color, .6); } - } - } - &.right tab, - &.left tab { - &:hover { &:not(:first-child):not(:last-child):not(:only-child) { - box-shadow: 0 1px 1px shade($base_color, .85), 0 -1px 1px shade($base_color, .85); + box-shadow: 1px 0 1px shade($base_color, .8), -1px 0 1px shade($base_color, .8), inset 0 -2px $selected_bg_color; } &:last-child:not(:only-child) { - box-shadow: 0 -1px 1px shade($base_color, .85); + box-shadow: -1px 0 1px shade($base_color, .8), inset 0 -2px $selected_bg_color; + } &:first-child:not(:only-child) { - box-shadow: 0 1px 1px shade($base_color, .85); + box-shadow: 1px 0 1px shade($base_color, .8), inset 0 -2px $selected_bg_color; + } } + } + + &.right tab { + box-shadow: inset 1px 0 $borders_color; + transition: box-shadow .3s ease-out; + + &:hover { + outline: none; - &:checked { &:not(:first-child):not(:last-child):not(:only-child) { - box-shadow: 0 1px 1px shade($base_color, .8), 0 -1px 1px shade($base_color, .8); + box-shadow: 0 1px 1px shade($base_color, .85), 0 -1px 1px shade($base_color, .85), inset 1px 0 $borders_color; } &:last-child:not(:only-child) { - box-shadow: 0 -1px 1px shade($base_color, .8); + box-shadow: 0 -1px 1px shade($base_color, .85), inset 1px 0 $borders_color; } &:first-child:not(:only-child) { - box-shadow: 0 1px 1px shade($base_color, .8); + box-shadow: 0 1px 1px shade($base_color, .85), inset 1px 0 $borders_color; } } - } - - &.top tab { - border-style: solid; - border-color: $borders_color; - border-width: 0; - border-bottom-width: 1px; - transition: border-bottom-color .2s linear; - - &:hover { - outline: none; - } &:checked { - border-bottom-color: $selected_bg_color; outline: none; - > box, - > label, - > widget > box { - border-bottom-color: $selected_bg_color; - } - label { - margin-bottom: 0; + margin-left: 0; color: $selected_bg_color; } &:hover { background-color: mix($bg_color, $base_color, .6); } - } - } - - &.right tab { - border-style: solid; - border-color: $borders_color; - border-width: 0; - border-left-width: 1px; - transition: border-left-color .3s ease-out; - &:hover { - outline: none; - } - - &:checked { - border-left-color: $selected_bg_color; - outline: none; - - > box, - > label, - > widget > box { - border-left-color: $selected_bg_color; + &:not(:first-child):not(:last-child):not(:only-child) { + box-shadow: 0 1px 1px shade($base_color, .8), 0 -1px 1px shade($base_color, .8), inset 2px 0 $selected_bg_color; } - label { - margin-left: 0; - color: $selected_bg_color; + &:last-child:not(:only-child) { + box-shadow: 0 -1px 1px shade($base_color, .8), inset 2px 0 $selected_bg_color; } - &:hover { - background-color: mix($bg_color, $base_color, .6); + &:first-child:not(:only-child) { + box-shadow: 0 1px 1px shade($base_color, .8), inset 2px 0 $selected_bg_color; } } } &.bottom tab { - border-style: solid; - border-color: $borders_color; - border-width: 0; - border-top-width: 1px; - transition: border-top-color .3s ease-out; + box-shadow: inset 0 1px $borders_color; + transition: box-shadow .3s ease-out; &:hover { outline: none; + &:not(:first-child):not(:last-child):not(:only-child) { + box-shadow: 1px 0 1px shade($base_color, .85), -1px 0 1px shade($base_color, .85), inset 0 1px $borders_color; + } + + &:last-child:not(:only-child) { + box-shadow: -1px 0 1px shade($base_color, .85), inset 0 1px $borders_color; + } + + &:first-child:not(:only-child) { + box-shadow: 1px 0 1px shade($base_color, .85), inset 0 1px $borders_color; + } } &:checked { - border-top-color: $selected_bg_color; outline: none; - > box, - > label, - > widget > box { - border-top-color: $selected_bg_color; - } - label { margin-top: 0; color: $selected_bg_color; @@ -368,30 +334,44 @@ &:hover { background-color: mix($bg_color, $base_color, .6); } + + &:not(:first-child):not(:last-child):not(:only-child) { + box-shadow: 1px 0 1px shade($base_color, .8), -1px 0 1px shade($base_color, .8), inset 0 2px $selected_bg_color; + } + + &:last-child:not(:only-child) { + box-shadow: -1px 0 1px shade($base_color, .8), inset 0 2px $selected_bg_color; + } + + &:first-child:not(:only-child) { + box-shadow: 1px 0 1px shade($base_color, .8), inset 0 2px $selected_bg_color; + } } } &.left tab { - border-style: solid; - border-color: $borders_color; - border-width: 0; - border-right-width: 1px; - transition: border-right-color .3s ease-out; + box-shadow: inset -1px 0 $borders_color; + transition: box-shadow .3s ease-out; &:hover { outline: none; + + &:not(:first-child):not(:last-child):not(:only-child) { + box-shadow: 0 1px 1px shade($base_color, .85), 0 -1px 1px shade($base_color, .85), inset -1px 0 $borders_color; + } + + &:last-child:not(:only-child) { + box-shadow: 0 -1px 1px shade($base_color, .85), inset -1px 0 $borders_color; + } + + &:first-child:not(:only-child) { + box-shadow: 0 1px 1px shade($base_color, .85), inset -1px 0 $borders_color; + } } &:checked { - border-right-color: $selected_bg_color; outline: none; - > box, - > label, - > widget > box { - border-right-color: $selected_bg_color; - } - label { margin-right: 0; color: $selected_bg_color; @@ -400,6 +380,18 @@ &:hover { background-color: mix($bg_color, $base_color, .6); } + + &:not(:first-child):not(:last-child):not(:only-child) { + box-shadow: 0 1px 1px shade($base_color, .8), 0 -1px 1px shade($base_color, .8), inset -2px 0 $selected_bg_color; + } + + &:last-child:not(:only-child) { + box-shadow: 0 -1px 1px shade($base_color, .8), inset -2px 0 $selected_bg_color; + } + + &:first-child:not(:only-child) { + box-shadow: 0 1px 1px shade($base_color, .8), inset -2px 0 $selected_bg_color; + } } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_progress.scss new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_progress.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_progress.scss 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_progress.scss 2017-10-14 15:23:55.000000000 +0200 @@ -22,7 +22,7 @@ trough { border: 1px solid alpha(border_normal($bg_color), .5); - background-color: shade($bg_color, 1.08); + background-color: shade($bg_color, 1.1); background-image: none; border-radius: $roundness; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_toggle.scss new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_toggle.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_toggle.scss 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_toggle.scss 2017-10-14 15:23:55.000000000 +0200 @@ -104,18 +104,22 @@ @include exports("switch") { switch { + min-height: 16px; + padding: $spacing - 2px; border-radius: $roundness; - padding: $spacing - 1px; border: none; outline: none; transition: background-color .3s linear; - min-width: 88px; - min-height: 24px; + background-color: $switch_bg_color; color: $switch_fg_color; box-shadow: inset 1px -1px 0 alpha($dark_shadow, .06), inset -1px 1px 0 alpha($dark_shadow, .06); slider { + min-height: 18px; + min-width: 26px; + padding: 0 2px; + background-color: $switch_slider_bg_color; transition: all 0.3s ease-in; box-shadow: 0 1px 2px 0 alpha($dark_shadow, .07), 1px 0 2px 0 alpha($dark_shadow, .07); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_toolbar.scss new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_toolbar.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_toolbar.scss 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_toolbar.scss 2017-10-14 15:23:55.000000000 +0200 @@ -5,7 +5,7 @@ ! Toolbar **********/ -@mixin toolbar($bg, $fg) { +@mixin titlebar($bg, $fg) { @include linear-gradient($bg); @include border($bg); @@ -13,7 +13,6 @@ &:disabled { @include linear-gradient(shade($bg, .9)); - color: mix($fg, $bg, .5); } @@ -28,33 +27,77 @@ } button { @include button($bg, $fg); } - .linked > button { @include linked_button($bg); } - combobox, button { - padding: $spacing; + combobox { padding: 4px; } + + separator { + &, &:disabled { + color: shade($bg, ($contrast - .2)); + border-color: currentColor; + -GtkWidget-window-dragging: true; + } + } +} + + + + + +@mixin toolbar($bg, $fg) { + @include linear-gradient($bg); + @include border($bg); + + color: $fg; + + &:disabled { + @include linear-gradient(shade($bg, .9)); + color: mix($fg, $bg, .5); + } - &.text-button { padding: $spacing; } + .title { + font-weight: bold; + padding: 0 ($spacing * 2); + } - &.image-button { padding: $spacing; } + .subtitle { + font-size: smaller; + padding: 0 ($spacing * 2); + } + + button { @include button($bg, $fg); } + .linked > button { @include linked_button($bg); } + + &.horizontal combobox { padding: 4px; } + + &.horizontal button { + padding: 4px; + &.text-button { padding: 4px; } + &.image-button { padding: 4px; } + } + + &.vertical button { + padding: 5px; + &.text-button { padding: 5px; } + &.image-button { padding: 5px; } } separator { &, &:disabled { color: shade($bg, ($contrast - .2)); border-color: currentColor; - -GtkWidget-window-dragging: true; } } } @mixin inline-toolbar($bg, $fg) { - background-image: none; + padding: 1px; border-width: 0 1px 1px; border-style: solid; border-color: $borders_color; - background-color: mix($borders_color, $bg_color, .7); + background-color: shade($bg, 1.08); + background-image: none; &:backdrop { border-color: $backdrop_borders_color; @@ -80,6 +123,7 @@ %toolbar { padding: $spacing - 1px; border-style: none; + -gtk-icon-style: symbolic; // toolbar separators &.horizontal separator { margin: 0 ($spacing + 2px) 1px; } @@ -98,6 +142,11 @@ button { // Size height margin-top: $spacing + 3px; margin-bottom: $spacing + 3px; + &.popup { padding: 5px; } + &.image-button { padding: 5px; } + &.text-button.image-button { padding: 5px; } + &.text-button { padding: 5px; } + } switch { // Size height @@ -112,7 +161,7 @@ } %titlebar { // Default headerbar and titlebar code. - @include toolbar($titlebar_bg_color, $titlebar_fg_color); + @include titlebar($titlebar_bg_color, $titlebar_fg_color); @include linear-gradient($titlebar_bg_color); border-radius: $roundness $roundness 0 0; @@ -185,7 +234,6 @@ @include exports("toolbar") { toolbar { @include toolbar($toolbar_bg_color, $toolbar_fg_color); - @extend %toolbar; &.inline-toolbar { @include inline-toolbar($toolbar_bg_color, $toolbar_fg_color); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_view.scss new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_view.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_view.scss 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_view.scss 2017-10-14 15:23:55.000000000 +0200 @@ -177,9 +177,6 @@ border-radius: $roundness; border: 1px solid $selected_borders_color; background-color: $selected_bg_color; - //background-image: linear-gradient(to bottom, $selected_bg_color, darken($selected_bg_color, .1)); - box-shadow: inset 0 1px if($variant == 'light', transparentize($white, .7), transparentize($white, .85)), - 0 1px if($variant == 'light', transparentize($black, .8), transparentize($black, .9)); &:selected { &:focus, & { @@ -202,13 +199,12 @@ background-color: mix($backdrop_base_color, $selected_bg_color, .9); } + + &:disabled { background-color: shade($selected_bg_color, 1.08); } //required if disabled state is turned on } } - &:disabled { - @include linear-gradient($bg_color); - border-color: border_insensitive($bg_color); - } + &:disabled { background-color: shade($selected_bg_color, 1.08); } &:backdrop { @if $variant == 'light' { @@ -223,20 +219,20 @@ } &.trough { // progress bar trough in treeviews - background-color: transparentize($fg_color, .9); border-radius: $roundness; + border: 1px solid alpha(border_normal($bg_color), .5); + background-color: shade($bg_color, 1.1); &:selected { &:focus, & { - background-color: if($variant == 'light', transparentize($selected_fg_color, .7), darken($selected_bg_color, .1)); + background-color: if($variant == 'light', shade($bg_color, 1.1), darken($selected_bg_color, .1)); + @if $variant == 'light' { border: 1px solid $selected_borders_color; } - @if $variant == 'light' { - border-width: 1px 0; - border-style: solid; - border-color: $selected_bg_color; - } + &:disabled { background-color: shade($bg_color, 1.08); } } } + + &:disabled { background-color: shade($bg_color, 1.08); } } header { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_window.scss new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_window.scss --- old/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_window.scss 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/gtk-3.20/scss/widgets/_window.scss 2017-10-14 15:23:55.000000000 +0200 @@ -33,7 +33,7 @@ .solid-csd & { border-radius: 0; margin: 1px; - background-color: $bg_color; + background-color: $titlebar_bg_color; // Unity/compiz regression: Issue: https://github.com/numixproject/numix-gtk-theme/issues/206 box-shadow: none; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/index.theme new/numix-gtk-theme-2.6.7/src/index.theme --- old/numix-gtk-theme-2.6.6/src/index.theme 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/index.theme 2017-10-14 15:23:55.000000000 +0200 @@ -6,5 +6,6 @@ [X-GNOME-Metatheme] GtkTheme=Numix +IconTheme=Numix MetacityTheme=Numix ButtonLayout=:minimize,maximize,close diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/metacity-1/metacity-theme-2.xml new/numix-gtk-theme-2.6.7/src/metacity-1/metacity-theme-2.xml --- old/numix-gtk-theme-2.6.6/src/metacity-1/metacity-theme-2.xml 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/metacity-1/metacity-theme-2.xml 2017-10-14 15:23:55.000000000 +0200 @@ -990,7 +990,7 @@ <button function="unstick" state="pressed"><draw_ops></draw_ops></button> </frame_style> -<frame_style name="dialog_focused" geometry="nobuttons"> +<frame_style name="dialog_focused" geometry="normal"> <piece position="entire_background" draw_ops="entire_background_focused" /> <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> <piece position="title" draw_ops="title_focused" /> @@ -1024,7 +1024,7 @@ <button function="unstick" state="pressed"><draw_ops></draw_ops></button> </frame_style> -<frame_style name="dialog_unfocused" geometry="nobuttons"> +<frame_style name="dialog_unfocused" geometry="normal"> <piece position="entire_background" draw_ops="entire_background_unfocused" /> <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/metacity-1/metacity-theme-3.xml new/numix-gtk-theme-2.6.7/src/metacity-1/metacity-theme-3.xml --- old/numix-gtk-theme-2.6.6/src/metacity-1/metacity-theme-3.xml 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/metacity-1/metacity-theme-3.xml 2017-10-14 15:23:55.000000000 +0200 @@ -1002,7 +1002,7 @@ <button function="unstick" state="pressed"><draw_ops></draw_ops></button> </frame_style> -<frame_style name="dialog_focused" geometry="nobuttons"> +<frame_style name="dialog_focused" geometry="normal"> <piece position="entire_background" draw_ops="entire_background_focused" /> <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> <piece position="title" draw_ops="title_focused" /> @@ -1036,7 +1036,7 @@ <button function="unstick" state="pressed"><draw_ops></draw_ops></button> </frame_style> -<frame_style name="dialog_unfocused" geometry="nobuttons"> +<frame_style name="dialog_unfocused" geometry="normal"> <piece position="entire_background" draw_ops="entire_background_unfocused" /> <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/xfwm4/bottom-active.xpm new/numix-gtk-theme-2.6.7/src/xfwm4/bottom-active.xpm --- old/numix-gtk-theme-2.6.6/src/xfwm4/bottom-active.xpm 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/xfwm4/bottom-active.xpm 2017-10-14 15:23:55.000000000 +0200 @@ -1,6 +1,11 @@ /* XPM */ static char * bottom_active_xpm[] = { -"8 1 2 1", +"8 5 3 1", " c None", -". c #484848", -"........"}; +". c #444444", +"# c #484848", +"........", +"........", +"........", +"........", +"########"}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/xfwm4/bottom-inactive.xpm new/numix-gtk-theme-2.6.7/src/xfwm4/bottom-inactive.xpm --- old/numix-gtk-theme-2.6.6/src/xfwm4/bottom-inactive.xpm 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/xfwm4/bottom-inactive.xpm 2017-10-14 15:23:55.000000000 +0200 @@ -1,6 +1,11 @@ /* XPM */ static char * bottom_inactive_xpm[] = { -"8 1 2 1", +"8 5 3 1", " c None", -". c #393939", -"........"}; +". c #444444", +"# c #393939", +"........", +"........", +"........", +"........", +"########"}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/xfwm4/bottom-left-active.xpm new/numix-gtk-theme-2.6.7/src/xfwm4/bottom-left-active.xpm --- old/numix-gtk-theme-2.6.6/src/xfwm4/bottom-left-active.xpm 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/xfwm4/bottom-left-active.xpm 2017-10-14 15:23:55.000000000 +0200 @@ -1,6 +1,11 @@ /* XPM */ static char * bottom_left_active_xpm[] = { -"1 1 2 1", +"24 5 3 1", " c None", -". c #484848", -"."}; +". c #444444", +"# c #484848", +"#.......................", +"#.......................", +"#.......................", +"#.......................", +"########################"}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/xfwm4/bottom-left-inactive.xpm new/numix-gtk-theme-2.6.7/src/xfwm4/bottom-left-inactive.xpm --- old/numix-gtk-theme-2.6.6/src/xfwm4/bottom-left-inactive.xpm 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/xfwm4/bottom-left-inactive.xpm 2017-10-14 15:23:55.000000000 +0200 @@ -1,6 +1,11 @@ /* XPM */ static char * bottom_left_inactive_xpm[] = { -"1 1 2 1", +"24 5 3 1", " c None", -". c #393939", -"."}; +". c #444444", +"# c #393939", +"#.......................", +"#.......................", +"#.......................", +"#.......................", +"########################"}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/xfwm4/bottom-right-active.xpm new/numix-gtk-theme-2.6.7/src/xfwm4/bottom-right-active.xpm --- old/numix-gtk-theme-2.6.6/src/xfwm4/bottom-right-active.xpm 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/xfwm4/bottom-right-active.xpm 2017-10-14 15:23:55.000000000 +0200 @@ -1,6 +1,11 @@ /* XPM */ static char * bottom_right_active_xpm[] = { -"1 1 2 1", +"24 5 3 1", " c None", -". c #484848", -"."}; +". c #444444", +"# c #484848", +".......................#", +".......................#", +".......................#", +".......................#", +"########################"}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.6/src/xfwm4/bottom-right-inactive.xpm new/numix-gtk-theme-2.6.7/src/xfwm4/bottom-right-inactive.xpm --- old/numix-gtk-theme-2.6.6/src/xfwm4/bottom-right-inactive.xpm 2016-11-14 23:22:29.000000000 +0100 +++ new/numix-gtk-theme-2.6.7/src/xfwm4/bottom-right-inactive.xpm 2017-10-14 15:23:55.000000000 +0200 @@ -1,6 +1,11 @@ /* XPM */ static char * bottom_right_inactive_xpm[] = { -"1 1 2 1", +"24 5 3 1", " c None", -". c #393939", -"."}; +". c #444444", +"# c #393939", +".......................#", +".......................#", +".......................#", +".......................#", +"########################"}; ++++++ numix-gtk-theme-light-menubars.patch ++++++ --- /var/tmp/diff_new_pack.RNZnON/_old 2017-11-19 11:15:50.621655738 +0100 +++ /var/tmp/diff_new_pack.RNZnON/_new 2017-11-19 11:15:50.621655738 +0100 @@ -1,6 +1,6 @@ --- a/src/gtk-2.0/gtkrc +++ b/src/gtk-2.0/gtkrc -@@ -307,19 +307,19 @@ style "murrine-vscrollbar" = "murrine-scrollbar" { } +@@ -309,19 +309,19 @@ style "murrine-vscrollbar" = "murrine-sc # Menus style "murrine-menu" = "murrine-thin" { @@ -25,7 +25,7 @@ text[PRELIGHT] = @selected_fg_color text[SELECTED] = @selected_fg_color text[ACTIVE] = @selected_fg_color -@@ -335,7 +335,7 @@ style "murrine-menu-item" = "murrine-wider" { +@@ -337,7 +337,7 @@ style "murrine-menu-item" = "murrine-wid bg[SELECTED] = @selected_bg_color bg[ACTIVE] = @selected_bg_color
