Hello community, here is the log from the commit of package numix-gtk-theme for openSUSE:Factory checked in at 2016-11-16 13:34:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/numix-gtk-theme (Old) and /work/SRC/openSUSE:Factory/.numix-gtk-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "numix-gtk-theme" Changes: -------- --- /work/SRC/openSUSE:Factory/numix-gtk-theme/numix-gtk-theme.changes 2016-10-25 17:44:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.numix-gtk-theme.new/numix-gtk-theme.changes 2016-11-16 13:34:05.000000000 +0100 @@ -1,0 +2,28 @@ +Wed Nov 16 10:42:43 UTC 2016 - [email protected] + +- Update to version 2.6.6: + * Also support Numix-Frost-Light. + * Nemo statusbar button padding fix + (gh#numixproject/numix-gtk-theme#611). + * Fix notebook tab padding issues for some applications + (gh#numixproject/numix-gtk-theme#588). + * [GTK+-3.20] Optimised notebook padding. + * [GTK+-3.20] Fixed notebook asymmetrical padding. + * Fix button left margin. + * Fix discrete filled block inside levelbar + (gh#numixproject/numix-gtk-theme##619). + * [GTK+-3.20] Optimise sidebar padding. + * [GTK+-3.20] Add styling to Raven components of the Budgie + panel (gh#numixproject/numix-gtk-theme#620). + * [GTK+-3.20] Fix xfce4 code. + * Create global OSD file. + * GTKHEADERB 3.22 :: Create global OSD file + (gh#numixproject/numix-gtk-theme#628). + * [GTK+-3.20] Fix for volume OSD slider + (gh#numixproject/numix-gtk-theme#623). + * Disable box-shadow for osd button in fine-tune mode + (gh#numixproject/numix-gtk-theme#561) + * [GTK+-3.20] Fix gnome-terminal scrollbar colour. Disable + backdrop mode. + +------------------------------------------------------------------- Old: ---- numix-gtk-theme-2.6.5.tar.gz New: ---- numix-gtk-theme-2.6.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ numix-gtk-theme.spec ++++++ --- /var/tmp/diff_new_pack.ypJZ7O/_old 2016-11-16 13:34:06.000000000 +0100 +++ /var/tmp/diff_new_pack.ypJZ7O/_new 2016-11-16 13:34:06.000000000 +0100 @@ -19,7 +19,7 @@ %define _theme Numix %define _name numix Name: numix-gtk-theme -Version: 2.6.5 +Version: 2.6.6 Release: 0 Summary: Numix GTK+ theme for MATE, Cinnamon, GNOME, and Xfce License: GPL-3.0+ ++++++ numix-gtk-theme-2.6.5.tar.gz -> numix-gtk-theme-2.6.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/CHANGES new/numix-gtk-theme-2.6.6/CHANGES --- old/numix-gtk-theme-2.6.5/CHANGES 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/CHANGES 2016-11-14 23:22:29.000000000 +0100 @@ -1,3 +1,25 @@ +-------------->>>> 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} +[2016-11-01 18:10:06 +0100] Disable box-shadow for osd button in fine-tune mode. Fixes #561. Csaba Jakosa {ad37d7f} +[2016-11-01 19:08:14 +0200] [Gtk-3.20] Fix for volume OSD slider. Fixes #623 Nazar Mokrynskyi {14d2a48} +[2016-11-01 13:58:47 +0530] GTKHEADERB 3.22 :: Create global OSD file (#628) Khurshid Alam {9ec47ab} +[2016-11-01 09:21:28 +0100] * Fixed code. Megax {4d33256} +[2016-11-01 09:18:25 +0100] * Create global OSD file. Megax {b3ba2ee} +[2016-11-01 09:18:18 +0100] [Gtk-3.20] Fixed xfce4 code. Csaba Jakosa {a4cefd6} +[2016-10-31 18:58:14 +0100] [GTK-3.20] Code Cleanup Csaba Jakosa {6d54958} +[2016-10-30 18:30:58 +0200] [GTK-3.20] Added styling to Raven components of Budgie panel. Fixes.. Nazar Mokrynskyi {bbf9dd6} +[2016-10-28 21:19:49 +0200] [GTK 3.20] Optimized sidebar padding Csaba Jakosa {30132a0} +[2016-10-27 21:13:29 +0530] Fix syntax in previous commit Khurshid Alam {1d1d3a2} +[2016-10-27 21:09:47 +0530] Fix discrete filled block inside levelbar. Fixes #619 Khurshid Alam {32f0fec} +[2016-10-27 20:35:00 +0530] Tweak do_install in utils.sh Khurshid Alam {588a875} +[2016-10-25 12:43:37 +0200] [GTK 3.20] Fixed notebook asymmetrical padding Csaba Jakosa {2f94d4c} +[2016-10-24 08:39:15 +0200] [Gtk-3.20] Optimized notebook padding Csaba Jakosa {023bd6f} +[2016-10-23 16:33:14 -0500] fix notebook tab padding issues for some applications. Fixes #588 Dustin Falgout {7ac68f6} +[2016-10-23 17:15:11 +0200] * Nemo statusbar button padding fix. (#611) Csaba Jakosa {aea6d16} +[2016-10-23 02:14:28 -0500] also support Numix-Frost-Light Dustin Falgout {05e6198} +[2016-10-23 02:11:45 -0500] update zip task in Makefile to support both Numix and Numix-Frost Dustin Falgout {95fe512} +[2016-10-23 00:11:17 -0500] utils.sh :: support Numix and Numix Frost when generating CHANGES f.. Dustin Falgout {ee50385} -------------->>>> 2.6.5 <<<<-------------------------->>>> 2.6.5 <<<<-------------------------->>>> 2.6.5 <<<<-------------- [2016-10-22 20:36:07 -0500] add zip task to Makefile Dustin Falgout {5ccc199} [2016-10-22 20:18:42 -0500] utils.sh :: fix errors in do_install function Dustin Falgout {5f85cec} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/Makefile new/numix-gtk-theme-2.6.6/Makefile --- old/numix-gtk-theme-2.6.5/Makefile 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/Makefile 2016-11-14 23:22:29.000000000 +0100 @@ -45,8 +45,8 @@ zip: all mkdir $(ROOT_DIR)/dist - $(UTILS) install $(ROOT_DIR)/dist/Numix - cd $(ROOT_DIR)/dist && zip --symlinks -rq Numix Numix + $(UTILS) install $(ROOT_DIR)/dist/$$(basename $(INSTALL_DIR)) + cd $(ROOT_DIR)/dist && zip --symlinks -rq $$(basename $(INSTALL_DIR)) $$(basename $(INSTALL_DIR)) .PHONY: all diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/scripts/utils.sh new/numix-gtk-theme-2.6.6/scripts/utils.sh --- old/numix-gtk-theme-2.6.5/scripts/utils.sh 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/scripts/utils.sh 2016-11-14 23:22:29.000000000 +0100 @@ -19,7 +19,7 @@ do GTKVER="${_DIR##*/}" - mkdir "${_DIR}" + mkdir -p "${_DIR}" cp -t "${_DIR}" \ "${GTKVER}/gtk.css" \ @@ -28,7 +28,7 @@ "${GTKVER}/thumbnail.png" cd "${_DIR}" - ln -sr ../assets assets + ln -srf ../assets assets cd - done } @@ -48,15 +48,32 @@ update_changes_file() { - local LAST_STABLE_RELEASE NEXT_STABLE_RELEASE - - LAST_STABLE_RELEASE=$(git describe --tags $(git rev-list --tags --max-count=1)) - + LAST_STABLE_RELEASE=$(git describe --abbrev=0 --tags $(git rev-list --tags --max-count=1)) LAST_MAJOR_MINOR="${LAST_STABLE_RELEASE%.*}" + + LAST_MAJOR="${LAST_STABLE_RELEASE%%.*}" + LAST_MINOR="${LAST_MAJOR_MINOR#*.}" LAST_PATCH="${LAST_STABLE_RELEASE##*.}" - NEXT_PATCH=$(($LAST_PATCH + 1)) - NEXT_STABLE_RELEASE="${LAST_MAJOR_MINOR}.${NEXT_PATCH}" + case "${PWD##*/}" in + numix-gtk-theme) + NEXT_PATCH=$(($LAST_PATCH + 1)) + + NEXT_STABLE_RELEASE="${LAST_MAJOR_MINOR}.${NEXT_PATCH}" + ;; + + Numix-Frost) + LAST_MAJOR=$(($LAST_MAJOR + 1)) + NEXT_STABLE_RELEASE="${LAST_MAJOR}.${LAST_MINOR}.${LAST_PATCH}" + LAST_PATCH=$(($LAST_PATCH - 1)) + + LAST_STABLE_RELEASE="${LAST_MAJOR}.${LAST_MINOR}.${LAST_PATCH}" + ;; + + *) + echo 'Unknown directory!' && exit 1 + ;; + esac [[ -f CHANGES ]] && mv CHANGES CHANGES.old diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/_widgets.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/_widgets.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/_widgets.scss 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/_widgets.scss 2016-11-14 23:22:29.000000000 +0100 @@ -37,3 +37,5 @@ @import "apps/xfce"; @import "apps/unity"; @import "apps/lightdm"; +@import "apps/gnome-terminal"; +@import "apps/budgie"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/apps/_budgie.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/apps/_budgie.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/apps/_budgie.scss 1970-01-01 01:00:00.000000000 +0100 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/apps/_budgie.scss 2016-11-14 23:22:29.000000000 +0100 @@ -0,0 +1,27 @@ +/****************** + ! Budgie Desktop * +*******************/ + +@include exports("budgie-desktop") { + .budgie-container { + background-color: transparent; + } + + .raven { + background-color: transparentize($bg_color, .07); + + .raven-header { + background-color: $bg_color; + border: solid $borders_color; + border-width: 1px 0; + } + + .raven-background { + background-color: transparentize($bg_color, .07); + } + } + + .raven-mpris { + background-color: transparentize($bg_color, .3); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/apps/_gnome-terminal.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/apps/_gnome-terminal.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/apps/_gnome-terminal.scss 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/apps/_gnome-terminal.scss 2016-11-14 23:22:29.000000000 +0100 @@ -14,10 +14,10 @@ background-color: $osd_base; border-color: border_normal($osd_base); - &:backdrop { - background-color: shade($backdrop_osd_bg, .9); - border-color: border_normal(shade($backdrop_osd_bg, .9)); - } + //&:backdrop { + // background-color: shade($backdrop_osd_bg, .9); + // border-color: border_normal(shade($backdrop_osd_bg, .9)); + //} } scrollbar.vertical { @@ -28,7 +28,7 @@ &:hover:active { background-color: $selected_bg_color; } - &:backdrop { background-color: mix($backdrop_osd_fg, $backdrop_osd_bg, .4); } + //&:backdrop { background-color: mix($backdrop_osd_fg, $backdrop_osd_bg, .4); } &:disabled { background-color: transparent; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/apps/_nemo.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/apps/_nemo.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/apps/_nemo.scss 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/apps/_nemo.scss 2016-11-14 23:22:29.000000000 +0100 @@ -63,7 +63,7 @@ button { min-height: 16px; min-width: 16px; - padding: ($spacing - 1px); + padding: ($spacing - 1px) (($spacing * 2) - 2px); } button:first-child { @@ -108,7 +108,7 @@ -NemoPlacesTreeView-disk-full-fg-color: $selected_bg_color; -NemoPlacesTreeView-disk-full-bar-width: 2px; -NemoPlacesTreeView-disk-full-bar-radius: 1px; - -NemoPlacesTreeView-disk-full-bottom-padding: 0px; + -NemoPlacesTreeView-disk-full-bottom-padding: 0; -NemoPlacesTreeView-disk-full-max-length: 75px; &:selected { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/apps/_xfce.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/apps/_xfce.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/apps/_xfce.scss 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/apps/_xfce.scss 2016-11-14 23:22:29.000000000 +0100 @@ -20,5 +20,11 @@ font: inherit; button { @extend %panelbutton; } + + menu { + -gtk-icon-effect: none; + + text-shadow: none; + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_button.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_button.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_button.scss 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_button.scss 2016-11-14 23:22:29.000000000 +0100 @@ -364,15 +364,15 @@ box-shadow: none; &:focus, &:hover { - border: 1px solid alpha($black, .3); + border: 1px solid alpha($bg_color, .1); background-color: alpha($white, .2); background-image: none; box-shadow: none; } &:active, &:checked, &:active:hover, &:checked:hover { - border: 1px solid alpha($black, .3); - background-color: alpha($black, .1); + border: 1px solid alpha($selected_bg_color, .2); + background-color: alpha($white, .2); background-image: none; box-shadow: none; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_choosers.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_choosers.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_choosers.scss 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_choosers.scss 2016-11-14 23:22:29.000000000 +0100 @@ -155,8 +155,6 @@ &:checked { colorswatch:only-child { box-shadow: none; } } } } - - colorchooser .popover.osd { border-radius: $roundness; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_grid.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_grid.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_grid.scss 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_grid.scss 2016-11-14 23:22:29.000000000 +0100 @@ -17,7 +17,7 @@ } row { - transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + transition: all 150ms cubic-bezier(.25, .46, .45, .94); &:hover { transition: none; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_menu.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_menu.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_menu.scss 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_menu.scss 2016-11-14 23:22:29.000000000 +0100 @@ -232,17 +232,6 @@ &:backdrop { box-shadow: none; } - .osd & { - box-shadow: 0 2px 7px 3px alpha($black, .5); - - > toolbar button { - border-radius: 0; - border-width: 0; - background-color: transparent; - background-image: none; - } - } - treeview.view { &:hover, &:selected, &:selected:focus, &:backdrop:selected, &:backdrop:selected:focus { border-top-color: $selected_bg_color; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_misc.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_misc.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_misc.scss 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_misc.scss 2016-11-14 23:22:29.000000000 +0100 @@ -165,7 +165,7 @@ border-top-left-radius: 0; } - .button { + button { border: 0; background-color: transparent; background-image: none; @@ -235,8 +235,8 @@ entry.entry.pin-entry { font-style: normal; font-size: 50px; - padding-left: 25px; - padding-right: 25px; + padding-left: $spacing * 5; + padding-right: $spacing * 5; } label.pin-label { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_notebook.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_notebook.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_notebook.scss 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_notebook.scss 2016-11-14 23:22:29.000000000 +0100 @@ -144,7 +144,7 @@ } tab { - padding: ($spacing + 1) 0 0; // top | left/right | bottom + padding: 0; border-style: solid; border-width: 1px; // for reorderable tabs border-color: transparent; // @@ -152,18 +152,35 @@ box-shadow: none; outline: none; - button, button:hover { - margin-left: 15px; - opacity: 0; - transition: opacity .3s ease-in; - } - - > box, > label { - padding: 0 ($spacing * 3) ($spacing + 1); // top | left/right | bottom + > box, + > label, + > widget > box { + padding: $spacing $spacing * 2; // top/bottom | left/right border-width: 2px; border-style: solid; border-color: transparent; - transition: border-color .3s ease-out; + transition: border-color .2s linear; + } + + &.reorderable-page { + > box, + > label, + > widget > box { + padding: $spacing $spacing * 2; // top | right | bottom | left + } + } + + /* close button styling */ + button, + button.flat { + @extend %close_button; + + min-height: 16px; + min-width: 16px; + padding: 0; + margin-left: $spacing * 2; + border: 1px solid transparent; + transition: all .1s linear; } &:hover { @@ -171,8 +188,9 @@ border-color: transparent; outline: none; - button, button:hover { - opacity: 1; + button, + button.flat { + border: 1px solid alpha($bg_color, .1); } } @@ -193,15 +211,6 @@ label { color: mix($text_color, $base_color, .3); } - - /* close button styling */ - button.flat { - min-height: 16px; - min-width: 16px; - padding: 0; - - @extend %close_button; - } } &.top tab, @@ -267,16 +276,11 @@ } &.top tab { - padding: ($spacing + 1) 0 0; // top | left/right | bottom border-style: solid; border-color: $borders_color; border-width: 0; border-bottom-width: 1px; - transition: border-bottom-color .3s ease-out; - - > box, > label { - padding: 0 ($spacing * 3) ($spacing + 1); // top | left/right | bottom - } + transition: border-bottom-color .2s linear; &:hover { outline: none; @@ -286,7 +290,9 @@ border-bottom-color: $selected_bg_color; outline: none; - > box, > label { + > box, + > label, + > widget > box { border-bottom-color: $selected_bg_color; } @@ -302,17 +308,12 @@ } &.right tab { - padding: 0 ($spacing + 1) 0 0; // top | right | bottom | left border-style: solid; border-color: $borders_color; border-width: 0; border-left-width: 1px; transition: border-left-color .3s ease-out; - > box, > label { - padding: ($spacing + 1) ($spacing * 3); // top | right | bottom | left - } - &:hover { outline: none; } @@ -321,7 +322,9 @@ border-left-color: $selected_bg_color; outline: none; - > box, > label { + > box, + > label, + > widget > box { border-left-color: $selected_bg_color; } @@ -337,17 +340,12 @@ } &.bottom tab { - padding: 0 0 ($spacing + 1); // top | left/right | bottom border-style: solid; border-color: $borders_color; border-width: 0; border-top-width: 1px; transition: border-top-color .3s ease-out; - > box, > label { - padding: ($spacing + 1) ($spacing * 3) 0; // top/bottom | left/right - } - &:hover { outline: none; } @@ -356,7 +354,9 @@ border-top-color: $selected_bg_color; outline: none; - > box, > label { + > box, + > label, + > widget > box { border-top-color: $selected_bg_color; } @@ -372,17 +372,12 @@ } &.left tab { - padding: 0 0 0 ($spacing + 1); // top | right | bottom | left border-style: solid; border-color: $borders_color; border-width: 0; border-right-width: 1px; transition: border-right-color .3s ease-out; - > box, > label { - padding: ($spacing + 1) ($spacing * 3); // top/bottom | left/right - } - &:hover { outline: none; } @@ -391,7 +386,9 @@ border-right-color: $selected_bg_color; outline: none; - > box, > label { + > box, + > label, + > widget > box { border-right-color: $selected_bg_color; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_osd.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_osd.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_osd.scss 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_osd.scss 2016-11-14 23:22:29.000000000 +0100 @@ -8,6 +8,21 @@ @include exports("osd") { overlay.osd { background-color: transparent; } + colorchooser .popover.osd { border-radius: $roundness; } + + button.color { + .osd colorswatch:only-child { box-shadow: none; } + + @if $variant == 'light' { + .osd & { + &:disabled, + &:backdrop, + &:active, + &:checked { colorswatch:only-child { box-shadow: none; } } + } + } + } + button.osd, #XfceNotifyWindow button { @include button($osd_bg, $osd_fg); @@ -38,6 +53,26 @@ &.bottom { border-radius: 0; } // positional classes for `attached` osd toolbars } + progressbar.osd { // progressbar.osd used for epiphany page loading progress + margin: 2px; + min-height: 2px; + min-width: 2px; + + trough { + border-style: none; + border-radius: 0; + background-image: none; + background-color: transparent; + } + + progress { + border-style: none; + border-radius: 0; + background-color: $selected_bg_color; + background-image: none; + } + } + .osd, #XfceNotifyWindow { background-color: $osd_bg; @@ -58,10 +93,17 @@ entry { @include entry($osd_base, $osd_text_color, $osd_borders_color); } /* used by gnome-settings-daemon's media-keys OSD */ - trough { background-color: shade($osd_bg, .8); } + trough, + &.trough { + background-color: alpha($osd_fg, .3); + } - progressbar { background-color: $osd_fg; } + progressbar, + &.progressbar { + background-color: $osd_fg; + } + // Old GTK 3.0 code scale { slider { @include linear-gradient(shade($osd_bg, 1.08)); @@ -89,6 +131,33 @@ } } + // New GTK 3.20 code + scale { + //OSD troughs + trough { + background-color: lighten($osd_bg, 7%); + + highlight { background-color: $selected_bg_color; } + } + + // OSD sliders + slider { + background-clip: border-box; + background-color: $selected_bg_color; + border-color: $selected_bg_color; + + &:hover { + background-color: lighten($selected_bg_color, 10%); + border-color: lighten($selected_bg_color, 10%); + } + + &:active { + background-color: darken($selected_bg_color, 10%); + border-color: darken($selected_bg_color, 10%); + } + } + } + &.view, .view, view { background-color: $osd_bg; } scrollbar { @@ -127,6 +196,17 @@ background-color: $osd_bg; } + popover.background { + box-shadow: 0 2px 7px 3px alpha($black, .5); + + > toolbar button { + border-radius: 0; + border-width: 0; + background-color: transparent; + background-image: none; + } + } + spinbutton { // OSD horizontal &:not(.vertical) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_overshoot.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_overshoot.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_overshoot.scss 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_overshoot.scss 2016-11-14 23:22:29.000000000 +0100 @@ -75,6 +75,7 @@ $_bg_pos: $position center; } + // Disable /*background-image: linear-gradient(to $_gradient_dir, // this is the dashed line $_undershoot_color_light 50%, $_undershoot_color_dark 50%);*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_progress.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_progress.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_progress.scss 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_progress.scss 2016-11-14 23:22:29.000000000 +0100 @@ -52,36 +52,16 @@ border-top-right-radius: $roundness; } } - - &.osd { // progressbar.osd used for epiphany page loading progress - margin: 2px; - min-height: 2px; - min-width: 2px; - - trough { - border-style: none; - border-radius: 0; - background-image: none; - background-color: transparent; - } - - progress { - border-style: none; - border-radius: 0; - background-color: $selected_bg_color; - background-image: none; - } - } } levelbar { - block { + &.horizontal block { min-width: 34px; - min-height: 3px; + min-height: 4px; } &.vertical block { - min-width: 3px; + min-width: 4px; min-height: 34px; } @@ -92,16 +72,17 @@ border: 1px solid alpha(border_normal($bg_color), .5); border-radius: $roundness; + padding: 2px; // make discrete block appear inside levelbar } &.horizontal.discrete block { - margin: 0 2px; + margin: 0 1px; &:first-child { margin: 0; } } &.vertical.discrete block { - margin: 2px 0; + margin: 1px 0; &:first-child { margin: 0; } } @@ -110,7 +91,7 @@ @include linear-gradient($selected_bg_color); border-color: transparent; - border-radius: 0; + border-radius: $roundness; &.low { background-color: $warning_color; @@ -119,12 +100,12 @@ &.high, &:not(.empty) { - background-color: $selected_bg_color; + background-color: $success_color; border-color: transparent; } &.full { - background-color: $success_color; + background-color: shade($selected_bg_color, .8); border-color: transparent; } @@ -193,13 +174,6 @@ &:disabled { background-color: transparentize($_scale_trough_bg, .45); } - //OSD troughs - .osd & { - background-color: lighten($osd_bg, 7%); - - highlight { background-color: $selected_bg_color; } - } - // Troughs in selected list-rows and infobars menuitem:hover &, row:selected &, @@ -279,23 +253,6 @@ border-color: mix($selected_fg_color, $selected_bg_color, .55); } } - - // OSD sliders - .osd & { - background-clip: border-box; - background-color: $selected_bg_color; - border-color: $selected_bg_color; - - &:hover { - background-color: lighten($selected_bg_color, 10%); - border-color: lighten($selected_bg_color, 10%) - } - - &:active { - background-color: darken($selected_bg_color, 10%); - border-color: darken($selected_bg_color, 10%); - } - } } value { color: alpha(currentColor, .4); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_sidebar.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_sidebar.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_sidebar.scss 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_sidebar.scss 2016-11-14 23:22:29.000000000 +0100 @@ -72,12 +72,12 @@ row { // Needs overriding of the GtkListBoxRow padding - min-height: 36px; + min-height: 32px; padding: 0; // Using margins/padding directly in the SidebarRow // will make the animation of the new bookmark row jump - > revealer { padding: 0 14px; } + > revealer { padding: 0 $spacing * 2; } &:selected { color: $selected_fg_color; } @@ -110,10 +110,10 @@ //@extend %button_selected.flat; - min-height: 26px; - min-width: 26px; - margin-top: 3px; - margin-bottom: 3px; + min-height: 20px; + min-width: 20px; + margin-top: 2px; + margin-bottom: 2px; padding: 0; border-radius: 100%; -gtk-outline-radius: 100%; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_toggle.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_toggle.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_toggle.scss 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_toggle.scss 2016-11-14 23:22:29.000000000 +0100 @@ -105,7 +105,7 @@ @include exports("switch") { switch { border-radius: $roundness; - padding: $spacing - 1; + padding: $spacing - 1px; border: none; outline: none; transition: background-color .3s linear; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_view.scss new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_view.scss --- old/numix-gtk-theme-2.6.5/src/gtk-3.20/scss/widgets/_view.scss 2016-10-23 03:36:43.000000000 +0200 +++ new/numix-gtk-theme-2.6.6/src/gtk-3.20/scss/widgets/_view.scss 2016-11-14 23:22:29.000000000 +0100 @@ -179,7 +179,7 @@ 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)); + 0 1px if($variant == 'light', transparentize($black, .8), transparentize($black, .9)); &:selected { &:focus, & {
