Hello community, here is the log from the commit of package numix-gtk-theme for openSUSE:Factory checked in at 2016-05-11 16:38:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-04-28 17:02:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.numix-gtk-theme.new/numix-gtk-theme.changes 2016-05-11 16:38:12.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 10 19:43:12 UTC 2016 - [email protected] + +- Update to version 2.5.1+git20160510. + +------------------------------------------------------------------- Old: ---- numix-gtk-theme-2.5.1+git20160426.tar.gz New: ---- numix-gtk-theme-2.5.1+git20160510.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ numix-gtk-theme.spec ++++++ --- /var/tmp/diff_new_pack.WSBlBm/_old 2016-05-11 16:38:12.000000000 +0200 +++ /var/tmp/diff_new_pack.WSBlBm/_new 2016-05-11 16:38:12.000000000 +0200 @@ -19,7 +19,7 @@ %define _theme Numix %define _name numix Name: numix-gtk-theme -Version: 2.5.1+git20160426 +Version: 2.5.1+git20160510 Release: 0 Summary: Numix GTK+ theme for MATE, GNOME, and Xfce License: GPL-3.0+ ++++++ numix-gtk-theme-2.5.1+git20160426.tar.gz -> numix-gtk-theme-2.5.1+git20160510.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/.scss-lint.yml new/numix-gtk-theme-2.5.1+git20160510/.scss-lint.yml --- old/numix-gtk-theme-2.5.1+git20160426/.scss-lint.yml 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/.scss-lint.yml 2016-05-10 17:37:33.000000000 +0200 @@ -106,6 +106,9 @@ enabled: true global: [ "px", "%", "s", "ms" ] + PseudoElement: + enabled: false + QualifyingElement: enabled: false allow_element_with_attribute: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/README.md new/numix-gtk-theme-2.5.1+git20160510/README.md --- old/numix-gtk-theme-2.5.1+git20160426/README.md 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/README.md 2016-05-10 17:37:33.000000000 +0200 @@ -1,16 +1,16 @@ ## Numix -##### A modern flat theme with a combination of light and dark elements. It supports Gnome, Unity, XFCE and Openbox. -##### [](http://numixproject.org) [The Numix Project](http://numixproject.org) +##### A modern flat theme with a combination of light and dark elements. It supports GNOME, Unity, Xfce and Openbox. +##### [](https://numixproject.org/) [The Numix Project](https://numixproject.org/) ### Manual installation First, you need to compile the theme using the [Sass](http://sass-lang.com/) compiler. -To install Sass, install ruby and the gem command using your distro's package manager. Then install `sass` with the `gem` command, +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` -You'll also need the following commands in your path to generate the gresource binary. Install them using your distro's package manager. +You'll also need the following commands in your path to generate the gresource binary. Install them using your distribution's package manager. * `glib-compile-schemas` * `gdk-pixbuf-pixdata` @@ -22,7 +22,7 @@ sudo make install ``` -To set the theme in Gnome, run the following commands in Terminal, +To set the theme in GNOME, run the following commands in Terminal, ```sh gsettings set org.gnome.desktop.interface gtk-theme "Numix" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/gtk-3.0/scss/widgets/_overshoot.scss new/numix-gtk-theme-2.5.1+git20160510/gtk-3.0/scss/widgets/_overshoot.scss --- old/numix-gtk-theme-2.5.1+git20160426/gtk-3.0/scss/widgets/_overshoot.scss 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/gtk-3.0/scss/widgets/_overshoot.scss 2016-05-10 17:37:33.000000000 +0200 @@ -68,9 +68,9 @@ $_bg_pos: $position center; } - background-image: linear-gradient(to $_gradient_dir, // this is the dashed line + /*background-image: linear-gradient(to $_gradient_dir, // this is the dashed line $_undershoot_color_light 50%, - $_undershoot_color_dark 50%); + $_undershoot_color_dark 50%);*/ padding-#{$position}: 1px; background-size: $_dash_bg_size; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/apps/_lightdm.scss new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/apps/_lightdm.scss --- old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/apps/_lightdm.scss 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/apps/_lightdm.scss 2016-05-10 17:37:33.000000000 +0200 @@ -11,8 +11,10 @@ text-shadow: 0 1px alpha($black, .5); -gtk-icon-shadow: 0 1px alpha($black, .5); - .menubar { - &, > .menuitem { + menubar { + padding-left: 5px; + + &, > menuitem { background-color: transparent; background-image: none; color: $white; @@ -31,10 +33,10 @@ &:disabled { color: alpha($white, .7); } - .menu { + menu { border-radius: 1px; - .menuitem { + menuitem { font: normal; text-shadow: none; } @@ -57,7 +59,7 @@ inset 0 1px mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21), inset 0 -1px mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21); - .button { + button { padding: 3px 15px; border-width: 1px; border-radius: $roundness; @@ -84,9 +86,9 @@ #login_window { - .menu { border-radius: 1px; } + menu { border-radius: 1px; } - GtkComboBox .button { + combobox button { &, &:hover, &:active, &:active:hover, &:focus, &:hover:focus, &:active:focus, &:active:hover:focus { padding: 0; @@ -96,7 +98,7 @@ } } - .entry { + entry { padding: 3px 5px; border-width: 1px; border-style: solid; @@ -123,9 +125,9 @@ color: $lightdm_fg_color; font: 18px; - .menu { font: normal; } + menu { font: normal; } - .arrow { color: mix($lightdm_fg_color, $lightdm_bg_color, .5); } + arrow { color: mix($lightdm_fg_color, $lightdm_bg_color, .5); } } #user_image { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/apps/_nautilus.scss new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/apps/_nautilus.scss --- old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/apps/_nautilus.scss 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/apps/_nautilus.scss 2016-05-10 17:37:33.000000000 +0200 @@ -41,31 +41,26 @@ border: none; frame { border: 0; } } - } - - NautilusQueryEditor { - toolbar { - padding-top: $spacing - 1px; - padding-bottom: $spacing - 2px; - border-width: 1px 0 0; - border-style: solid; - border-color: $toolbar_bg_color; - background-color: shade($toolbar_bg_color, .9); - &:nth-child(2) { border-color: border_normal($toolbar_bg_color); } + .searchbar-container { + border-bottom: 2px solid $base_color; + border-left-width: 0px; - &.search-bar { - border-top-width: 0; - border-bottom-width: 0; - } - - &, &.search-bar { - &:last-child, &:only-child { - border-bottom-width: 1px; - border-bottom-color: border_normal($toolbar_bg_color); + searchbar { + padding-top: $spacing - 3px; + padding-bottom: $spacing - 2px; + border: none; + background-color: $selected_bg_color; + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1); + + .search { + border-right-width: 1px; + + + button { + margin-left: 8px; + } } } - } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/apps/_nemo.scss new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/apps/_nemo.scss --- old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/apps/_nemo.scss 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/apps/_nemo.scss 2016-05-10 17:37:33.000000000 +0200 @@ -6,7 +6,6 @@ .nemo-desktop, .nemo-desktop * { color: $white; text-shadow: 1px 1px $black; - border: none; &:active { color: $fg_color; @@ -21,41 +20,55 @@ } } - .nemo-pathbar { - @include button($toolbar_bg_color, $toolbar_fg_color); - -NemoPathbarButton-border-radius: $roundness; - } - - /* This block needs to be moved back into the scope of nemo-window - * as soon as nemo is updated to include the nemo-window style class. - */ - .sidebar .view { - -NemoPlacesTreeView-disk-full-bg-color: shade($bg_color, .8); - -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-max-length: 75px; - - &:selected { - -NemoPlacesTreeView-disk-full-bg-color: $selected_fg_color; - -NemoPlacesTreeView-disk-full-fg-color: shade($selected_bg_color, 1.2); - } - } - - /* Ridiculously specific selector until Nemo is updated with new style classes */ - grid > paned > box > paned > box > notebook { - background-color: $base_color; - } - .nemo-window { toolbar { border-width: 0 0 1px; border-style: solid; border-color: border_normal($toolbar_bg_color); - } - /* Stupid selectors to target statusbar because nemo lacks 3.20 style class */ + button { + @include button($bg_color, $fg_color); + } + + button.linked, .linked .button { + @include linked_button($bg_color); + } + + combobox button { + padding: $spacing - 1px; + + &.text-button { + padding: $spacing; + } + + &.image-button { + padding: ($spacing + 1px) ($spacing - 1px) ($spacing + 1px) $spacing; + } + } + + separator, separator:disabled { + color: shade($bg_color, ($contrast + .1)); + border-color: currentColor; + -GtkWidget-window-dragging: true; + } + + &.primary-toolbar button { + padding: 5px 6px; + } + + /* Path Bar */ + toolitem stack { + margin-left: 15px; + + widget button { + @include linked_button($toolbar_bg_color); + -NemoPathbarButton-border-radius: $roundness; + } + } + + } // END toolbar + + /* Status Bar */ grid { > widget:last-child { button { @@ -79,8 +92,12 @@ > box > scale { margin-right: 12px; } + + statusbar { + border: 0; + } } - } // END statusbar + } // END Status Bar .sidebar { .frame { @@ -92,89 +109,80 @@ padding-right: $spacing; } - .places-sidebar { + .nemo-places-sidebar { &, & .view { background-color: mix($bg_color, $base_color, .5); } - .view:selected { - &:focus, & { - @extend %selected_items; + + .view { + -NemoPlacesTreeView-disk-full-bg-color: shade($bg_color, .8); + -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-max-length: 75px; + + &:selected { + -NemoPlacesTreeView-disk-full-bg-color: $selected_fg_color; + -NemoPlacesTreeView-disk-full-fg-color: shade($selected_bg_color, 1.2); + + &:focus, & { + @extend %selected_items; + } } } } - } + + /* Nemo Query Editor (File Search Bar) */ + + separator + box .primary-toolbar { + padding-top: $spacing - 3px; + padding-bottom: $spacing - 4px; + border-top: none; + background-color: $selected_bg_color; + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1); + + button:nth-child(2) { + border-right: none; + border-top-right-radius: 0px; + border-bottom-right-radius: 0px; + } + + button:nth-child(3) { + margin-left: -6px; + border-left: none; + border-top-left-radius: 0px; + border-bottom-left-radius: 0px; + } + + button.flat { + $bg: $bg_color; + $fg: $fg_color; + $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); + + @extend %button; + @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); + padding: 5px 6px; + } - statusbar { - border: 0; - } + } // END Nemo Query Editor + + } // END .sidebar notebook { + background-color: $base_color; border-width: 0; tabs { border: 0; } } - - toolbar { - button { - @include button($bg_color, $fg_color); - } - - button.linked, .linked .button { - @include linked_button($bg_color); - } - - combobox button { - padding: $spacing - 1px; - - &.text-button { - padding: $spacing; - } - - &.image-button { - padding: ($spacing + 1px) ($spacing - 1px) ($spacing + 1px) $spacing; - } - } - - separator, separator:disabled { - color: shade($bg_color, ($contrast + .1)); - border-color: currentColor; - -GtkWidget-window-dragging: true; - } - - &.primary-toolbar button { - padding: 5px 6px; - } - } - } - - NemoQueryEditor { - toolbar { - padding-top: $spacing - 3px; - padding-bottom: $spacing - 4px; - border-width: 1px 0 0; - border-style: solid; - border-color: $toolbar_bg_color; - background-color: shade($toolbar_bg_color, .9); - - &:nth-child(2) { - border-color: border_normal($toolbar_bg_color); - } - - &.search-bar { - border-top-width: 0; - border-bottom-width: 0; - } - - &, &.search-bar { - &:last-child, &:only-child { - border-bottom-width: 1px; - border-bottom-color: border_normal($toolbar_bg_color); - } - } - - } } - } + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_button.scss new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_button.scss --- old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_button.scss 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_button.scss 2016-05-10 17:37:33.000000000 +0200 @@ -53,6 +53,13 @@ outline-color: transparent; } + %undecorated_button { + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: none; + } + %linked_middle { border-radius: 0; border-left-style: none; @@ -103,6 +110,9 @@ &:only-child, &:first-child:only-child { border-width: 1px; border-style: solid; + } + + &:only-child { border-radius: $roundness; } } @@ -256,7 +266,7 @@ min-width: 24px; @include button(shade($bg_color, 1.2), $fg_color); - &.link, .link & { @include linked_button(shade($bg_color, 1.2)); } + &.linked, .linked & { @include linked_button(shade($bg_color, 1.2)); } spinbutton & { color: mix($text_color, $base_color, .4); @@ -347,6 +357,13 @@ @include exports("combobox") { combobox { + button.combo { + // otherwise the arrow placement is not symmetric + min-width: 0; + padding-left: 8px; + padding-right: 8px; + } + arrow { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); min-height: 16px; @@ -358,7 +375,7 @@ padding: ($spacing - 2px) ($spacing + 1px); } - box > button { + .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 // https://bugzilla.gnome.org/show_bug.cgi?id=733979 @@ -367,10 +384,10 @@ &:dir(rtl) { @extend %linked_middle:dir(rtl); } } - &:first-child > button { @extend %linked_button:first-child; } + .linked:not(.vertical) > &:first-child > box > button.combo { @extend %linked_button:first-child; } - &:last-child > button { @extend %linked_button:last-child; } + .linked:not(.vertical) > &:last-child > box > button.combo { @extend %linked_button:last-child; } - &:only-child > button { @extend %linked_button:only-child; } + .linked:not(.vertical) > &:only-child > box > button.combo { @extend %linked_button:only-child; } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_calendar.scss new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_calendar.scss --- old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_calendar.scss 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_calendar.scss 2016-05-10 17:37:33.000000000 +0200 @@ -4,20 +4,64 @@ @include exports("calendar") { calendar { - padding: $spacing; + padding: 1px 3px; outline-offset: -1px; - &:indeterminate { color: mix($fg_color, $bg_color, .5); } + color: $text_color; - &.view, &.highlight, &.header, &.button { - &, &:focus, &:hover, &:disabled { - border: 0; - background-color: transparent; - background-image: none; + &.view { + &, &:backdrop { @extend %undecorated_button; } + } + + &:selected { + @extend %selected_items; + + border-radius: $roundness; + } + + &.header { + border-bottom: 1px solid transparentize($black, .9); + border-radius: 0; + + &:backdrop { border-color: transparentize($black, .9); } + } + + &.button { + @extend %undecorated_button; + + color: alpha($fg_color, .55); + + &:hover { + @extend %undecorated_button; + + color: $fg_color; + } + + &:backdrop { + @extend %undecorated_button; + + color: alpha($backdrop_fg_color, .55); + } + + &:disabled { + @extend %undecorated_button; + + color: alpha($insensitive_fg_color, .55); } } - &.highlight { color: $selected_bg_color; } + &:indeterminate, + &:indeterminate:backdrop { color: mix($fg_color, $bg_color, .5); } + + &.highlight, + &.highlight:backdrop { + font-size: smaller; + color: $selected_bg_color; + } + + &:backdrop { + color: $backdrop_text_color; + } } /* gnome-calendar */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_grid.scss new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_grid.scss --- old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_grid.scss 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_grid.scss 2016-05-10 17:37:33.000000000 +0200 @@ -28,15 +28,15 @@ &:hover { background-color: if(variant == light, transparentize($fg_color, .9), transparentize($fg_color, .95)); } - &:active { box-shadow: inset 0 2px 2px -2px transparentize(black, .8); } + &:active { box-shadow: inset 0 2px 2px -2px transparentize($black, .8); } &:backdrop:hover { background-color: transparent; } &:selected { - &:active { box-shadow: inset 0 2px 3px -1px transparentize(black, .5); } + &:active { box-shadow: inset 0 2px 3px -1px transparentize($black, .5); } &.has-open-popup, - &:hover { background-color: mix($fg_color, $selected_bg_color, .1); } + &:hover { background-color: mix($selected_bg_color, $fg_color, .1); } &:backdrop { background-color: $selected_bg_color; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_menu.scss new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_menu.scss --- old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_menu.scss 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_menu.scss 2016-05-10 17:37:33.000000000 +0200 @@ -185,13 +185,6 @@ } } -%undecorated_button { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: none; -} - /********* ! Popover @@ -262,7 +255,7 @@ } } - frame { + .frame { border-color: border_normal($menu_bg_color); border-radius: $roundness; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_misc.scss new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_misc.scss --- old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_misc.scss 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_misc.scss 2016-05-10 17:37:33.000000000 +0200 @@ -15,15 +15,18 @@ ************/ @include exports("tooltip") { - .tooltip { + tooltip { &.background { - @include linear-gradient($tooltip_bg_color); - - border: 0; - border-radius: $roundness; - color: $tooltip_fg_color; + &, &.csd { + background-color: $tooltip_bg_color; + background-clip: padding-box; + border: 1px solid border_normal($tooltip_bg_color); + border-radius: $roundness; + } } + label { color: $tooltip_fg_color; } + * { background-color: transparent; color: inherit; @@ -69,18 +72,22 @@ **********************/ @include exports("notifications") { - .app-notification { - &, &.frame { - border-style: solid; - border-color: border_normal($osd_bg); - border-width: 0 1px 1px; - border-radius: 0 0 $roundness $roundness; - padding: $spacing * 2; - background-color: $osd_bg; - background-image: none; - color: $osd_fg; + frame.app-notification { + border-style: solid; + border-color: border_normal($osd_bg); + border-width: 0 1px 1px; + border-radius: 0 0 $roundness $roundness; + padding: $spacing * 2; + background-color: $osd_bg; + background-image: none; + color: $osd_fg; - .button { @include button($osd_bg, $osd_fg); } + button { + @include button($osd_bg, $osd_fg); + } + + border { + border: 0; } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_notebook.scss new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_notebook.scss --- old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_notebook.scss 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_notebook.scss 2016-05-10 17:37:33.000000000 +0200 @@ -135,7 +135,7 @@ &:hover:not(:active):not(:backdrop) { background-clip: padding-box; background-image: none; - background-color: transparentize(white, 0.7); + background-color: transparentize($white, .7); border-color: transparent; box-shadow: none; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_osd.scss new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_osd.scss --- old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_osd.scss 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_osd.scss 2016-05-10 17:37:33.000000000 +0200 @@ -106,14 +106,14 @@ } } - .osd progressBar, progressBar.osd { - -GtkProgressBar-xspacing: 0; - -GtkProgressBar-yspacing: 2px; - -GtkProgressBar-min-horizontal-bar-height: 2px; + .osd progressbar, progressbar.osd { + margin: 2px; + min-height: 2px; + min-width: 2px; padding: 0; - &.trough { + trough { padding: 0; border-style: none; border-radius: 0; @@ -121,7 +121,7 @@ background-color: transparent; } - &.progressbar { + progress { border-style: none; border-radius: 0; background-color: $selected_bg_color; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_overshoot.scss new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_overshoot.scss --- old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_overshoot.scss 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_overshoot.scss 2016-05-10 17:37:33.000000000 +0200 @@ -22,6 +22,13 @@ $_small_gradient_color: $color; $_big_gradient_color: $color; + @if $color == $fg_color { + $_small_gradient_color: darken($borders_color, 10%); + $_big_gradient_color: $fg_color; + + @if $t == backdrop { $_small_gradient_color: $backdrop_borders_color; } + } + $_small_gradient: -gtk-gradient(radial, $_position, 0, $_position, .5, @@ -35,10 +42,10 @@ to(alpha($_big_gradient_color, 0))); @if $type == normal { - background-image: none; + background-image: $_small_gradient, $_big_gradient; background-size: $_small_gradient_size, $_big_gradient_size; } @else if $type == backdrop { - background-image: none; + background-image: $_small_gradient; background-size: $_small_gradient_size; } @@ -68,50 +75,75 @@ $_bg_pos: $position center; } - background-image: none; + /*background-image: linear-gradient(to $_gradient_dir, // this is the dashed line + $_undershoot_color_light 50%, + $_undershoot_color_dark 50%);*/ padding-#{$position}: 1px; background-size: $_dash_bg_size; background-repeat: $_gradient_repeat; background-origin: content-box; background-position: $_bg_pos; + border: 0; + box-shadow: none; } -// This is used by GtkScrolledWindow, when content is touch-dragged past boundaries. -// This draws a box on top of the content, the size changes programmatically. -overshoot { - &.top { - @include overshoot(top); - - &:backdrop { @include overshoot(top, backdrop); } +scrolledwindow { + viewport.frame { // avoid double borders when viewport inside scrolled window + border-style: none; } - &.bottom { - @include overshoot(bottom); + // This is used by GtkScrolledWindow, when content is touch-dragged past boundaries. + // This draws a box on top of the content, the size changes programmatically. + overshoot { + &.top { + @include overshoot(top); - &:backdrop { @include overshoot(bottom, backdrop); } - } + &:backdrop { @include overshoot(top, backdrop); } + } - &.left { - @include overshoot(left); + &.bottom { + @include overshoot(bottom); - &:backdrop { @include overshoot(left, backdrop); } - } + &:backdrop { @include overshoot(bottom, backdrop); } + } - &.right { - @include overshoot(right); + &.left { + @include overshoot(left); - &:backdrop { @include overshoot(right, backdrop); } + &:backdrop { @include overshoot(left, backdrop); } + } + + &.right { + @include overshoot(right); + + &:backdrop { @include overshoot(right, backdrop); } + } } -} -// Overflow indication, works similarly to the overshoot, the size if fixed tho. -undershoot { - &.top { @include undershoot(top); } + // Overflow indication, works similarly to the overshoot, the size if fixed tho. + undershoot { + &.top { @include undershoot(top); } + + &.bottom { @include undershoot(bottom); } - &.bottom { @include undershoot(bottom); } + &.left { @include undershoot(left); } - &.left { @include undershoot(left); } + &.right { @include undershoot(right); } + } + + junction { // the small square between two scrollbars + border-color: transparent; + // the border image is used to add the missing dot between the borders, details, details, details... + border-image: linear-gradient(to bottom, $borders_color 1px, transparent 1px) 0 0 0 1 / 0 1px stretch; + background-color: $scrollbar_bg_color; - &.right { @include undershoot(right); } + &:dir(rtl) { border-image-slice: 0 1 0 0; } + + &:backdrop { + border-image-source: linear-gradient(to bottom, $backdrop_borders_color 1px, transparent 1px); + background-color: $backdrop_scrollbar_bg_color; + transition: 200ms ease-out; + } + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_progress.scss new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_progress.scss --- old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_progress.scss 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_progress.scss 2016-05-10 17:37:33.000000000 +0200 @@ -182,7 +182,7 @@ border-radius: 2.5px; background-color: $_scale_trough_bg; - &:disabled { background-color: transparentize($_scale_trough_bg, 0.45); } + &:disabled { background-color: transparentize($_scale_trough_bg, .45); } //OSD troughs .osd & { @@ -196,7 +196,7 @@ // Troughs in selected list-rows and infobars row:selected &, infobar & { - background-color: transparentize(black, 0.8); + background-color: transparentize($black, .8); highlight { background-color: $selected_fg_color; @@ -204,7 +204,7 @@ &:disabled { background-color: mix($selected_fg_color, $selected_bg_color, .55); } } - &:disabled { background-color: transparentize(black, 0.9); } + &:disabled { background-color: transparentize($black, .9); } } } @@ -213,20 +213,20 @@ border-radius: 2.5px; background-color: $selected_bg_color; - &:disabled { background-color: transparentize($selected_bg_color, 0.45); } + &:disabled { background-color: transparentize($selected_bg_color, .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($selected_bg_color, .5); &:disabled { background-color: transparent; } } slider { - $_slider_border: if($variant=='light', transparentize(shade($button_border, .25), 0.5), darken($button_border,2%)); + $_slider_border: if($variant == 'light', transparentize(shade($button_border, .25), .5), darken($button_border, 2%)); background-color: $button_bg; border: 1px solid $_slider_border; @@ -245,7 +245,7 @@ &:disabled { background-color: mix($fg_color, $bg_color, .55); - border-color: transparentize($_slider_border, 0.2); + border-color: transparentize($_slider_border, .2); } // Selected list-row and infobar sliders @@ -287,10 +287,10 @@ } } - value { color: alpha(currentColor, 0.4); } + value { color: alpha(currentColor, .4); } marks { - color: alpha(currentColor, 0.4); + color: alpha(currentColor, .4); @each $marks_class, $marks_pos, $marks_margin in (top, top, bottom), (bottom, bottom, top), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_scrollbar.scss new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_scrollbar.scss --- old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_scrollbar.scss 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_scrollbar.scss 2016-05-10 17:37:33.000000000 +0200 @@ -62,7 +62,7 @@ min-width: $_slider_small_width; min-height: $_slider_small_width; background-color: $fg_color; - border: 1px solid if($variant == "light", white, black); + border: 1px solid if($variant == 'light', $white, $black); } // hide steppers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_toolbar.scss new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_toolbar.scss --- old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_toolbar.scss 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_toolbar.scss 2016-05-10 17:37:33.000000000 +0200 @@ -46,7 +46,7 @@ &.vertical separator { margin: ($spacing + 2px) 1px ($spacing + 2px) 0; } separator, separator:disabled { - color: shade($bg, ($contrast + .1)); + color: shade($bg, ($contrast - .2)); border-color: currentColor; -GtkWidget-window-dragging: true; @@ -106,9 +106,11 @@ .tiled &, .maximized & { border-radius: 0; } - .title { font: bold; } + .title { font-weight: bold; } - .titlebutton { + separator.titlebutton { margin-left: $spacing * 2; } + + button.titlebutton { padding: $spacing; border: 0; background-image: none; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_view.scss new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_view.scss --- old/numix-gtk-theme-2.5.1+git20160426/gtk-3.20/scss/widgets/_view.scss 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_view.scss 2016-05-10 17:37:33.000000000 +0200 @@ -44,8 +44,8 @@ @include exports("treeview") { .rubberband, rubberband { - border: 1px solid darken($selected_bg_color, 10%); - background-color: transparentize(darken($selected_bg_color, 10%), 0.8); + border: 1px solid darken($selected_bg_color, .1); + background-color: transparentize(darken($selected_bg_color, .1), .8); } treeview entry { @@ -91,8 +91,8 @@ -GtkTreeView-tree-line-width: 1; -GtkTreeView-tree-line-pattern: ''; - border-left-color: mix($dark_bg_color, $base_color, .2); // this is actually the tree lines color, - border-top-color: mix($dark_bg_color, $base_color, .2); // while this is the grid lines color, better then nothing + border-left-color: mix($fg_color, $base_color, .5); // this is actually the tree lines color, + border-top-color: $bg_color; // while this is the grid lines color, better then nothing rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props @@ -104,7 +104,7 @@ &:backdrop, & { border-left-color: mix($selected_fg_color, $selected_bg_color, .5); - border-top-color: transparentize($fg_color, 0.9); // doesn't work unfortunatelly + border-top-color: transparentize($fg_color, .9); // doesn't work unfortunatelly } } @@ -123,7 +123,7 @@ min-height: 2px; color: $bg_color; - &:backdrop { color: transparentize($bg_color, 0.9); } + &:backdrop { color: transparentize($bg_color, .9); } } &:backdrop { @@ -147,7 +147,6 @@ &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } - &:hover { color: $fg_color; } &:selected { @@ -170,8 +169,8 @@ 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)); + 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, & { @@ -179,14 +178,14 @@ color: $selected_fg_color; box-shadow: none; } @else { - box-shadow: inset 0 1px transparentize(white, .95); + box-shadow: inset 0 1px transparentize($white, .95); } @include linear-gradient($selected_bg_color); &:backdrop { @if $variant == 'light' { - color: $selected_bg_color; + color: $backdrop_selected_fg_color; border-color: $selected_borders_color; // otherwise it gets inherited by .view(?!?) } @else { border-color: $backdrop_base_color; @@ -286,7 +285,7 @@ @include exports("separator") { separator { // vbox and hbox separators - background: transparentize(black, .9); + background: transparentize($black, .9); min-width: 1px; min-height: 1px; } @@ -350,12 +349,12 @@ @include exports("placesview") { placesview { .server-list-button > image { - transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + transition: 200ms cubic-bezier(.25, .46, .45, .94); -gtk-icon-transform: rotate(0turn); } .server-list-button:checked > image { - transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + transition: 200ms cubic-bezier(.25, .46, .45, .94); -gtk-icon-transform: rotate(-0.5turn); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160426/openbox-3/themerc new/numix-gtk-theme-2.5.1+git20160510/openbox-3/themerc --- old/numix-gtk-theme-2.5.1+git20160426/openbox-3/themerc 2016-04-27 09:59:03.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160510/openbox-3/themerc 2016-05-10 17:37:33.000000000 +0200 @@ -55,6 +55,10 @@ window.active.button.disabled.bg.color: #333333 window.active.button.disabled.image.color: #888888 +window.active.button.hover.bg: flat solid +window.active.button.hover.bg.color: #333333 +window.active.button.hover.image.color: #f06860 + # Inactive window window.inactive.border.color: #393939 @@ -85,6 +89,10 @@ window.inactive.button.disabled.bg.color: #333333 window.inactive.button.disabled.image.color: #888888 +window.inactive.button.hover.bg: flat solid +window.inactive.button.hover.bg.color: #333333 +window.inactive.button.hover.image.color: #f06860 + # OSD osd.border.width: 1
