Hello community, here is the log from the commit of package numix-gtk-theme for openSUSE:Factory checked in at 2016-05-30 09:58:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-11 16:38:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.numix-gtk-theme.new/numix-gtk-theme.changes 2016-05-30 09:58:53.000000000 +0200 @@ -1,0 +2,6 @@ +Sun May 29 11:23:43 UTC 2016 - [email protected] + +- Update to version 2.5.1+git20160525: + * No changelog available. + +------------------------------------------------------------------- Old: ---- numix-gtk-theme-2.5.1+git20160510.tar.gz New: ---- numix-gtk-theme-2.5.1+git20160525.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ numix-gtk-theme.spec ++++++ --- /var/tmp/diff_new_pack.xl2yV8/_old 2016-05-30 09:58:54.000000000 +0200 +++ /var/tmp/diff_new_pack.xl2yV8/_new 2016-05-30 09:58:54.000000000 +0200 @@ -19,7 +19,7 @@ %define _theme Numix %define _name numix Name: numix-gtk-theme -Version: 2.5.1+git20160510 +Version: 2.5.1+git20160525 Release: 0 Summary: Numix GTK+ theme for MATE, GNOME, and Xfce License: GPL-3.0+ ++++++ numix-gtk-theme-2.5.1+git20160510.tar.gz -> numix-gtk-theme-2.5.1+git20160525.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/README.md new/numix-gtk-theme-2.5.1+git20160525/README.md --- old/numix-gtk-theme-2.5.1+git20160510/README.md 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/README.md 2016-05-25 20:16:53.000000000 +0200 @@ -1,6 +1,6 @@ ## Numix ##### 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/) +[](https://numixproject.org/) [](https://circleci.com/gh/numixproject/numix-gtk-theme/tree/master)   ### Manual installation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/circle.yml new/numix-gtk-theme-2.5.1+git20160525/circle.yml --- old/numix-gtk-theme-2.5.1+git20160510/circle.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/numix-gtk-theme-2.5.1+git20160525/circle.yml 2016-05-25 20:16:53.000000000 +0200 @@ -0,0 +1,3 @@ +machine: + ruby: + version: 2.3.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.0/scss/widgets/_notebook.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.0/scss/widgets/_notebook.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.0/scss/widgets/_notebook.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.0/scss/widgets/_notebook.scss 2016-05-25 20:16:53.000000000 +0200 @@ -12,8 +12,7 @@ border-style: solid; border-color: border_normal($base_color); border-radius: 0; - background-color: $base_color; - background-image: none; + @include linear-gradient($base_color); background-clip: border-box; color: $text_color; @@ -32,11 +31,11 @@ &.frame { border-color: border_normal($base_color); - &.top { border-width: 1px 1px 0; } + &.top { border-width: 1px 1px 0 1px; } &.right { border-width: 1px 1px 1px 0; } - &.bottom { border-width: 0 1px 1px; } + &.bottom { border-width: 0 1px 1px 1px; } &.left { border-width: 1px 0 1px 1px; } } @@ -49,51 +48,94 @@ } tab { - padding: ($spacing + 1px) ($spacing * 2); + padding: ($spacing + 1px) $spacing * 2; border: 1px solid transparent; background-color: transparent; background-image: none; - &:hover { - background-color: shade($base_color, .95); - border-color: shade($base_color, .8); - } - &:active { - background-color: $base_color; + background-color: transparent; background-image: none; - border-color: shade($base_color, .85); } &.top { - border-bottom-width: 0; + border-bottom-width: 2px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; + + &:hover { + border-bottom-color: alpha($selected_bg_color, 0.3); + } + + &:active { + border-bottom-color: $selected_bg_color; + } } &.right { - border-left-width: 0; + border-left-width: 2px; border-bottom-left-radius: 0; border-top-left-radius: 0; - } + &:hover { + border-left-color: alpha($selected_bg_color, 0.3); + } + + &:active { + border-left-color: $selected_bg_color; + } + } &.bottom { - border-top-width: 0; + border-top-width: 2px; border-top-right-radius: 0; border-top-left-radius: 0; + + &:hover { + border-top-color: alpha($selected_bg_color, 0.3); + } + + &:active { + border-top-color: $selected_bg_color; + } } &.left { - border-right-width: 0; + border-right-width: 2px; border-top-right-radius: 0; border-bottom-right-radius: 0; + + &:hover { + border-right-color: alpha($selected_bg_color, 0.3); + } + + &:active { + border-right-color: $selected_bg_color; + } } GtkLabel { color: mix($text_color, $base_color, .3); } + &.reorderable-page { + &:hover { + background-color: shade($base_color, .85); + border-left: 0; + border-right: 0; + /* using box shadows instead of borders due to slanted edges */ + box-shadow: inset 0 3px alpha($black, .03), inset 0 2px alpha($black, .03), inset 0 1px alpha($black, .03), inset 1px 0 shade($base_color, .7), inset -1px 0 shade($base_color, .7); + } + + &:active { + background-color: shade($base_color, .9); + border-left: 0; + border-right: 0; + box-shadow: inset 0 3px alpha($black, .03), inset 0 2px alpha($black, .03), inset 0 1px alpha($black, .03), inset 1px 0 shade($base_color, .75), inset -1px 0 shade($base_color, .75); + } + } + /* close button styling */ .button { @extend %close_button; } + } .prelight-page { @@ -104,23 +146,5 @@ &, GtkLabel { color: $text_color; } } - .reorderable-page { - &:hover { - background-color: shade($base_color, .85); - border-left: 0; - border-right: 0; - /* using box shadows instead of borders due to slanted edges */ - box-shadow: inset 0 3px alpha($black, .03), inset 0 2px alpha($black, .03), inset 0 1px alpha($black, .03), - inset 1px 0 shade($base_color, .7), inset -1px 0 shade($base_color, .7); - } - - &:active { - background-color: shade($base_color, .9); - border-left: 0; - border-right: 0; - box-shadow: inset 0 3px alpha($black, .03), inset 0 2px alpha($black, .03), inset 0 1px alpha($black, .03), - inset 1px 0 shade($base_color, .75), inset -1px 0 shade($base_color, .75); - } - } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.0/scss/widgets/_progress.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.0/scss/widgets/_progress.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.0/scss/widgets/_progress.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.0/scss/widgets/_progress.scss 2016-05-25 20:16:53.000000000 +0200 @@ -156,18 +156,27 @@ &.vertical { margin: 0 7px; } } - &.highlight { - &, &.left, &.bottom { - @include linear-gradient($selected_bg_color); + &.highlight.left { + &, .memuitem & { + @include linear-gradient($selected_bg_color); + border-color: $selected_bg_color; + + &:hover { + border-color: border_normal($selected_bg_color); + background-color: shade($selected_bg_color, .8); + } - border-color: $selected_bg_color; - - &:insensitive { - @include linear-gradient(shade($bg_color, .8)); - - border-color: shade($bg_color, .7); - } + &:insensitive { + @include linear-gradient(shade($bg_color, .9)); + border-color: shade($bg_color, .85); + } } } + + &.highlight.bottom { + @include linear-gradient($selected_bg_color); + border-color: $selected_bg_color; + } + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.0/scss/widgets/_view.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.0/scss/widgets/_view.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.0/scss/widgets/_view.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.0/scss/widgets/_view.scss 2016-05-25 20:16:53.000000000 +0200 @@ -140,8 +140,6 @@ border: 1px solid border_focus($selected_bg_color); color: $selected_fg_color; } - - &:backdrop { } } &:insensitive { @@ -150,11 +148,6 @@ border-color: border_insensitive($bg_color); } } - - &:backdrop { - @include linear-gradient($bg_color); - border-color: border_insensitive($bg_color); - } } .trough { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/_global.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/_global.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/_global.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/_global.scss 2016-05-25 20:16:53.000000000 +0200 @@ -108,6 +108,10 @@ $backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, .35); $backdrop_sidebar_bg_color: mix($backdrop_bg_color, $backdrop_base_color, .5); +$backdrop_osd_base: $osd_base; +$backdrop_osd_bg: $osd_bg; +$backdrop_osd_fg: mix($osd_fg, $backdrop_osd_base, .5); + $backdrop_scrollbar_bg_color: darken($backdrop_bg_color, 3%); $backdrop_scrollbar_slider_color: mix($backdrop_fg_color, $backdrop_bg_color, .4); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/_widgets.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/_widgets.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/_widgets.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/_widgets.scss 2016-05-25 20:16:53.000000000 +0200 @@ -34,4 +34,3 @@ @import "apps/xfce"; @import "apps/unity"; @import "apps/lightdm"; -@import "apps/gnome-terminal"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/apps/_gnome-terminal.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/apps/_gnome-terminal.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/apps/_gnome-terminal.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/apps/_gnome-terminal.scss 2016-05-25 20:16:53.000000000 +0200 @@ -5,53 +5,39 @@ @include exports("gnome-terminal") { //noinspection ScssLintInspection,ScssLintInspection VteTerminal { - background-color: $osd_base; - color: $osd_fg; + background-color: $osd_base; + color: $osd_fg; } - TerminalWindow { - .scrollbars-junction { - background-color: $osd_base; - } - scrollbar { - trough { - background-color: $osd_base; - } - button { - color: shade($osd_base, 0.6); - &:active { - color: shade($osd_base, 0.6); - &:hover { - color: shade($osd_base, 0.6); - } - } - } - & slider { - border-color: mix(shade($osd_base, 0.87), $osd_fg, 0.21); - background-color: mix($osd_base, $osd_fg, 0.21); - &:hover { - border-color: mix(shade($osd_base, 0.87), $osd_fg, 0.31); - background-color: mix($osd_base, $osd_fg, 0.31); - } - &.vertical { - &:hover { - border-color: mix(shade($osd_base, 0.87), $osd_fg, 0.31); - background-color: mix($osd_base, $osd_fg, 0.31); - } - &:active { - border-color: shade($selected_bg_color, 0.9); - background-color: $selected_bg_color; - } - } - &:active { - border-color: shade($selected_bg_color, 0.9); - background-color: $selected_bg_color; - } - } - } - GtkNotebook.notebook { - border-right-width: 0; - border-bottom-width: 0; - border-left-width: 0; - } + + terminal-window { + junction, scrollbar trough { + 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)); + } + } + + scrollbar.vertical { + slider { + background-color: mix($osd_base, $osd_fg, .2); + + &:hover { background-color: mix($osd_base, $osd_fg, .3); } + + &:hover:active { background-color: $selected_bg_color; } + + &:backdrop { background-color: mix($backdrop_osd_fg, $backdrop_osd_bg, .4); } + + &:disabled { background-color: transparent; } + } + } + + /*GtkNotebook.notebook { + border-right-width: 0; + border-bottom-width: 0; + border-left-width: 0; + }*/ } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/apps/_nemo.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/apps/_nemo.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/apps/_nemo.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/apps/_nemo.scss 2016-05-25 20:16:53.000000000 +0200 @@ -30,9 +30,7 @@ @include button($bg_color, $fg_color); } - button.linked, .linked .button { - @include linked_button($bg_color); - } + .linked > button { @include linked_button($bg_color); } combobox button { padding: $spacing - 1px; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_base.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_base.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_base.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_base.scss 2016-05-25 20:16:53.000000000 +0200 @@ -126,7 +126,7 @@ &.csd .sidebar { border-top-style: none; } - .sidebar label { padding: 6px 12px; } + .sidebar label { padding: $spacing ($spacing * 2); } .sidebar label.highlight { background-color: mix($fg_color, $bg_color, .8); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_button.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_button.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_button.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_button.scss 2016-05-25 20:16:53.000000000 +0200 @@ -27,8 +27,7 @@ @if $variant == 'light' { background-position: right 3px, right 4px; - } - @else { + } @else { background-position: right 3px, right 2px; } @@ -37,8 +36,7 @@ &:dir(rtl) { @if $variant == 'light' { background-position: left 3px, left 4px; - } - @else { + } @else { background-position: left 3px, left 2px; } } @@ -72,6 +70,18 @@ } } + %linked_vertical_middle { + border-radius: 0; + border-top-style: none; + border-bottom-style: solid; + + &:dir(rtl) { + border-radius: 0; // needed when including %linked_vertical_middle:dir(rtl) + border-top-style: none; + border-bottom-style: solid; + } + } + %linked_button { border-width: 1px; border-style: solid; @@ -116,6 +126,51 @@ border-radius: $roundness; } } + + %linked_vertical_button { + border-width: 1px; + border-style: solid; + border-radius: 0; + border-top-style: none; + border-bottom-style: none; + + &:first-child { + border-width: 1px; + border-radius: $roundness; + border-top-style: solid; + border-bottom-style: none; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + + &:dir(rtl) { + border-top-style: none; + border-bottom-style: solid; + } + } + + &:last-child { + border-width: 1px; + border-radius: $roundness; + border-top-style: none; + border-bottom-style: solid; + border-top-left-radius: 0; + border-top-right-radius: 0; + + &:dir(rtl) { + border-top-style: solid; + border-bottom-style: none; + } + } + + &:only-child, &:first-child:only-child { + border-width: 1px; + border-style: solid; + } + + &:only-child { + border-radius: $roundness; + } + } } @mixin linked_button($bg) { @@ -165,6 +220,53 @@ } } +@mixin linked_vertical_button($bg) { + $border_strength: if(lightness($bg) > 50, 0, .1); + $shadow_strength: if(lightness($bg) > 50, 0, .1); + + @extend %linked_vertical_button; + + box-shadow: inset 0 -1px border_normal(rgba(0, 0, 0, .12 + $border_strength)), + 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); + + &:focus, &:hover { + box-shadow: inset 0 -1px border_focus(rgba(0, 0, 0, .12 + $border_strength)), + 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); + } + + &:active, &:active:hover, + &:active:focus, &:active:hover:focus, + &:checked, &:checked:hover, + &:checked:focus, &:checked:hover:focus { + box-shadow: inset 0 -1px border_active(rgba(0, 0, 0, .12 + $border_strength)), + inset 1px 0 alpha($dark_shadow, .07), + inset -1px 0 alpha($dark_shadow, .05); + } + + &:disabled { box-shadow: inset 0 -1px shade($bg, .8); } + + &:last-child, &:only-child { box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); } + + &:last-child:hover, &:only-child:hover { box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); } + + &:disabled:last-child, &:disabled:only-child, + &:active:disabled:last-child, &:active:disabled:only-child, + &:checked:disabled:last-child, &:checked:disabled:only-child { box-shadow: none; } + + &:active:last-child, &:active:last-child:focus, &:active:last-child:hover, &:active:last-child:hover:focus, + &:checked:last-child, &:checked:last-child:focus, &:checked:last-child:hover, &:checked:last-child:hover:focus { + box-shadow: inset 0 1px alpha($dark_shadow, .07), + inset -1px 0 alpha($dark_shadow, .06); + } + + &:active:only-child, &:active:only-child:focus, &:active:only-child:hover, &:active:only-child:hover:focus, + &:checked:only-child, &:checked:only-child:focus, &:checked:only-child:hover, &:checked:only-child:hover:focus { + box-shadow: inset 1px 0 alpha($dark_shadow, .06), + inset 0 1px alpha($dark_shadow, .07), + inset -1px 0 alpha($dark_shadow, .06); + } +} + @mixin button($bg, $fg) { $border_strength: if(lightness($bg) > 50, 0, .1); $shadow_strength: if(lightness($bg) > 50, 0, .1); @@ -239,7 +341,6 @@ } @include exports("button") { - %close_button { border: 1px solid transparent; background-color: transparent; @@ -266,88 +367,93 @@ min-width: 24px; @include button(shade($bg_color, 1.2), $fg_color); - &.linked, .linked & { @include linked_button(shade($bg_color, 1.2)); } + .inline-toolbar &, + .linked > & { @include linked_button(shade($bg_color, 1.2)); } - spinbutton & { - color: mix($text_color, $base_color, .4); - padding: $spacing ($spacing * 2); - border: 0; - border-radius: 0; - border-style: none; - background-color: transparent; - background-image: none; - box-shadow: inset 1px 0 shade($base_color, .9); + .linked.vertical > & { @include linked_vertical_button(shade($bg_color, 1.2)); } + } - &:disabled { - color: mix($text_color, $base_color, .7); - box-shadow: inset 1px 0 shade($base_color, .85); - } + spinbutton { + button { + color: mix($text_color, $base_color, .4); &:active, &:checked, &:hover { color: $text_color; } - &:first-child { - border-radius: $roundness 0 0 $roundness; - box-shadow: none; - } + &:disabled { color: alpha($insensitive_fg_color, .8); } - &:last-child { border-radius: 0 $roundness $roundness 0; } + &:backdrop { color: mix($backdrop_base_color, $backdrop_fg_color, .9); } - &:dir(rtl) { box-shadow: inset -1px 0 shade($base_color, .9); } + &:backdrop:disabled { color: alpha($backdrop_insensitive_color, .8); } } - spinbutton.vertical & { - border: 1px solid shade($bg_color, .8); - border-radius: $roundness; - background-color: shade($bg_color, 1.08); - background-image: none; - color: $fg_color; - box-shadow: none; + &:not(.vertical) { + @extend %entry; + @include linear-gradient($base_color, to top); + @include border($base_color); - &:hover { - border-color: shade($bg_color, .7); - background-color: shade($bg_color, 1.1); - background-image: none; - } + padding: 0; - &:active, &:checked { - border-color: shade($bg_color, .8); - background-color: shade($bg_color, .95); - background-image: none; - } + color: $text_color; + caret-color: $text_color; - &:active:hover, &:checked:hover { - border-color: shade($bg_color, .7); - } - - &:focus, &:hover:focus, &:active:focus, &:active:hover:focus { border-color: shade($bg_color, .7); } + &:focus, &:active { border-color: border_focus($borders_color); } &:disabled { - border-color: shade($bg_color, .85); - background-color: shade($bg_color, .9); - background-image: none; + @include linear-gradient(shade($base_color, .9), to top); + + color: mix($base_color, $text_color, .5); } - &:first-child { - border-width: 1px; - border-bottom-width: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; + entry { + // reset all the other props since the spinbutton node is styled here + border: 0; + border-radius: 0; + box-shadow: none; } - &:last-child { - border-width: 1px; - border-top-width: 0; - border-top-left-radius: 0; - border-top-right-radius: 0; + button { + border-radius: 0; + border-color: alpha($borders_color, .8); + border-style: none none none solid; + background-image: none; + box-shadow: none; + + &:dir(rtl) { border-style: none solid none none; } + + &:active { box-shadow: inset 0 2px 3px -1px transparentize($black, .8); } + + &:backdrop { border-color: alpha($backdrop_borders_color, .8); } + + &:backdrop:disabled { + border-style: none none none solid; // It is needed or it gets overridden + + &:dir(rtl) { border-style: none solid none none; } + } + + &:dir(rtl):first-child { border-radius: $roundness 0 0 $roundness; } + + &:dir(ltr):last-child { border-radius: 0 $roundness $roundness 0; } } } - spinbutton.vertical entry { - border-width: 1px; - border-style: solid; - border-radius: 0; - } + &.vertical { + entry { + // reset all the other props since the spinbutton node is styled here + border-radius: 0; + } + button { + &.up { + border-style: solid solid none solid; + border-radius: $roundness $roundness 0 0; + } + + &.down { + border-style: none solid solid solid; + border-radius: 0 0 $roundness $roundness; + } + } + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_entry.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_entry.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_entry.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_entry.scss 2016-05-25 20:16:53.000000000 +0200 @@ -14,6 +14,11 @@ border-right-width: 0; border-bottom-right-radius: 0; border-top-right-radius: 0; + + &:dir(rtl) { + border-left-width: 0; + border-right-width: 1px; + } } &:last-child { @@ -22,16 +27,66 @@ border-left-width: 0; border-bottom-left-radius: 0; border-top-left-radius: 0; + + &:dir(rtl) { + border-left-width: 1px; + border-right-width: 0; + } + } + + &:only-child, &:first-child:only-child { + border-width: 1px; } &:only-child { + border-radius: $roundness; + } +} + +%linked_vertical_entry { + border-width: 1px; + border-radius: 0; + border-top-width: 0; + border-bottom-width: 0; + + &:first-child { border-width: 1px; border-radius: $roundness; + border-top-width: 1px; + border-bottom-width: 0; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + + &:dir(rtl) { + border-top-width: 0; + border-bottom-width: 1px; + } + } + + &:last-child { + border-width: 1px; + border-radius: $roundness; + border-top-width: 0; + border-bottom-width: 1px; + border-top-left-radius: 0; + border-top-right-radius: 0; + + &:dir(rtl) { + border-top-width: 1px; + border-bottom-width: 0; + } + } + + &:only-child, &:first-child:only-child { + border-width: 1px; + } + + &:only-child { + border-radius: $roundness; } } %entry { - padding: $spacing; border-width: 1px; border-style: solid; border-radius: $roundness; @@ -48,7 +103,7 @@ &:disabled { box-shadow: none; } - & progressbar { + progress { @include linear-gradient($selected_bg_color); border-width: 0; @@ -56,13 +111,11 @@ color: $selected_fg_color; } - & image.left { padding-right: $spacing; } - & image.right { padding-left: $spacing; } + image.left { padding-right: $spacing; } - selection { - background-color: $selected_bg_color; - color: $selected_fg_color; - } + image.right { padding-left: $spacing; } + + selection { &:focus, & { @extend %selected_items; } } } @mixin entry($bg, $fg) { @@ -70,6 +123,8 @@ @include linear-gradient($bg, to top); @include border($bg); + padding: $spacing; + color: $fg; caret-color: $fg; @@ -86,6 +141,8 @@ entry { @include entry($base_color, $text_color); - &.linked, .linked & { @extend %linked_entry; } + .linked:not(.vertical) > & { @extend %linked_entry; } + + .linked.vertical > & { @extend %linked_vertical_entry; } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_misc.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_misc.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_misc.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_misc.scss 2016-05-25 20:16:53.000000000 +0200 @@ -15,6 +15,7 @@ ************/ @include exports("tooltip") { + .tooltip, // Firefox fix tooltip { &.background { &, &.csd { @@ -22,11 +23,10 @@ background-clip: padding-box; border: 1px solid border_normal($tooltip_bg_color); border-radius: $roundness; + color: $tooltip_fg_color; } } - label { color: $tooltip_fg_color; } - * { background-color: transparent; color: inherit; @@ -241,6 +241,46 @@ } +/************************ + ! Shortcut window keys * +*************************/ + +@include exports("keycap") { + // shortcut window keys + .keycap { + min-width: 20px; + min-height: 25px; + margin-top: 2px; + padding-bottom: $spacing / 2; + padding-left: $spacing; + padding-right: $spacing; + + color: $fg_color; + background-color: $base_color; + border: 1px solid; + border-color: if($variant == 'light', mix($borders_color, $bg_color, .5), $borders_color); + border-radius: $roundness; + box-shadow: if($variant == 'light', inset 0 -3px mix($base_color, $bg_color, .2), inset 0 -3px mix($borders_color, $base_color, .6)); + font-size: smaller; + + &:backdrop { + background-color: $backdrop_base_color; + color: $backdrop_fg_color; + transition: 200ms ease-out; + } + } +} + + +/***************** + ! Stackswitcher * +******************/ + +@include exports("stackswitcher") { + stackswitcher button.text-button { min-width: 90px; } // FIXME aggregate with buttons +} + + /******************* ! Selected Items * ********************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_osd.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_osd.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_osd.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_osd.scss 2016-05-25 20:16:53.000000000 +0200 @@ -8,13 +8,13 @@ @include exports("osd") { overlay.osd { background-color: transparent; } - osd { + .osd { &.background { background-color: alpha($osd_bg, .8); color: $osd_fg; } - frame { + .frame { background-clip: border-box; background-origin: border-box; } @@ -105,27 +105,4 @@ background-color: $osd_bg; } } - - .osd progressbar, progressbar.osd { - margin: 2px; - min-height: 2px; - min-width: 2px; - - padding: 0; - - trough { - padding: 0; - 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; - } - } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_overshoot.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_overshoot.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_overshoot.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_overshoot.scss 2016-05-25 20:16:53.000000000 +0200 @@ -26,7 +26,7 @@ $_small_gradient_color: darken($borders_color, 10%); $_big_gradient_color: $fg_color; - @if $t == backdrop { $_small_gradient_color: $backdrop_borders_color; } + @if $type == backdrop { $_small_gradient_color: $backdrop_borders_color; } } $_small_gradient: -gtk-gradient(radial, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_progress.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_progress.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_progress.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_progress.scss 2016-05-25 20:16:53.000000000 +0200 @@ -8,40 +8,41 @@ border-radius: $roundness; font-size: smaller; color: alpha($fg_color, .6); - min-width: 6px; - min-height: 6px; - &.osd { - min-height: 4px; + // sizing + &.horizontal { + trough, + progress { min-height: 6px; } } + &.vertical { + trough, + progress { min-width: 6px; } + } + + &.osd { min-height: 4px; } + trough { border: 1px solid alpha(border_normal($bg_color), .5); background-color: shade($bg_color, 1.08); background-image: none; + border-radius: $roundness; } - } - - progressbar progress { - @include linear-gradient($selected_bg_color); - - border-radius: 0; - box-shadow: none; - &.left { - border-top-left-radius: $roundness; - border-bottom-left-radius: $roundness; - } + progress { + @include linear-gradient($selected_bg_color); - &.right { - border-top-right-radius: $roundness; - border-bottom-right-radius: $roundness; - } + border-radius: 0; - &.left.right { box-shadow: none; } + &.left { + border-top-left-radius: $roundness; + border-bottom-left-radius: $roundness; + } - &.vertical { - @include linear-gradient($selected_bg_color, to right); + &.right { + border-top-right-radius: $roundness; + border-bottom-right-radius: $roundness; + } &.bottom { border-bottom-left-radius: $roundness; @@ -53,6 +54,26 @@ 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 { @@ -75,22 +96,21 @@ border-radius: $roundness; } - &.horizontal.discrete { margin-right: 1px; } + &.horizontal.discrete block { + margin: 0 2px; - &.vertical.discrete { margin-bottom: 1px; } + &:first-child { margin: 0; } + } - block:not(.empty) { - @include linear-gradient($selected_bg_color); + &.vertical.discrete block { + margin: 2px 0; - border-color: transparent; - border-radius: 0; + &:first-child { margin: 0; } } block { @include linear-gradient($selected_bg_color); - // FIXME: it would be nice to set make fill blocks bigger, but we'd need - // :nth-child working on discrete indicators border-color: transparent; border-radius: 0; @@ -99,7 +119,8 @@ border-color: transparent; } - &.high { + &.high, + &:not(.empty) { background-color: $selected_bg_color; border-color: transparent; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_toggle.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_toggle.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_toggle.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_toggle.scss 2016-05-25 20:16:53.000000000 +0200 @@ -81,19 +81,20 @@ @include exports("switch") { switch { border-radius: $roundness; - padding: $spacing; + padding: $spacing - 1; border: none; outline: none; transition: background-color 0.3s linear; - min-width: 93px; - min-height: 25px; + min-width: 88px; + min-height: 24px; background-color: $switch_bg_color; color: $switch_fg_color; + box-shadow: inset 1px -1px 0px rgba(0, 0, 0, 0.06), inset -1px 1px 0px rgba(0, 0, 0, 0.06); slider { background-color: $switch_slider_bg_color; transition: all 0.3s ease-in; - box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.1); + box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.07), 1px 0px 2px 0px rgba(0, 0, 0, 0.07); border-radius: $roundness; } @@ -105,6 +106,7 @@ slider { background-color: $white; + box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.1); } } @@ -113,10 +115,29 @@ background-image: none; border-color: $switch_disabled_border_color; color: $switch_disabled_fg_color; + box-shadow: none; slider { background-color: $switch_disabled_slider_bg_color; } } + + list row:selected & { + background-color: $switch_disabled_slider_bg_color; + color: $switch_disabled_bg_color; + + slider { + background-color: mix($switch_disabled_bg_color, $base_color, .4); + } + + &:checked { + color: $selected_bg_color; + background-color: $switch_slider_bg_color; + + slider { + background-color: $selected_bg_color; + } + } + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_toolbar.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_toolbar.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_toolbar.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_toolbar.scss 2016-05-25 20:16:53.000000000 +0200 @@ -9,7 +9,7 @@ @include linear-gradient($bg); @include border($bg); - padding: $spacing * 2; + padding: $spacing; color: $fg; &:disabled { @@ -30,7 +30,7 @@ button { @include button($bg, $fg); } - button.linked, .linked button { @include linked_button($bg); } + .linked > button { @include linked_button($bg); } combobox, button { padding: $spacing - 1px; @@ -64,6 +64,10 @@ &.inline-toolbar { background-image: none; background-color: transparent; + + button { @include button($toolbar_bg_color, $toolbar_fg_color); } + + .linked > button { @include linked_button($toolbar_bg_color); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_view.scss new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_view.scss --- old/numix-gtk-theme-2.5.1+git20160510/gtk-3.20/scss/widgets/_view.scss 2016-05-10 17:37:33.000000000 +0200 +++ new/numix-gtk-theme-2.5.1+git20160525/gtk-3.20/scss/widgets/_view.scss 2016-05-25 20:16:53.000000000 +0200 @@ -143,23 +143,23 @@ &.expander { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); - color: mix($fg_color, $base_color, .7); + color: mix($base_color, $fg_color, .7); &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } &:hover { color: $fg_color; } &:selected { - color: mix($selected_fg_color, $selected_bg_color, .7); + color: mix($selected_bg_color, $selected_fg_color, .7); &:hover { color: $selected_fg_color; } - &:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, .7); } + &:backdrop { color: mix($selected_bg_color, $backdrop_selected_fg_color, .7); } } &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } - &:backdrop { color: mix($backdrop_fg_color, $backdrop_base_color, .7); } + &:backdrop { color: mix($backdrop_base_color, $backdrop_fg_color, .7); } } &.progressbar { // progress bar in treeviews @@ -258,7 +258,7 @@ } } - button:last-child { &:backdrop, & { border-right-style: none; }} + button:last-child { &:backdrop, & { border-right-style: none; } } } button.dnd, @@ -275,6 +275,8 @@ text-shadow: none; } } + + acceleditor > label { background-color: $selected_bg_color; } } } @@ -291,38 +293,6 @@ } } - -/********************* - ! Column view headers -**********************/ - -@include exports("columnheader") { - column-header { - .button { - &, &:active { - border-width: 0 1px 1px 0; - border-radius: 0; - } - - &, &:active, &:focus, &:active:focus { - border-color: shade($base_color, .9); - border-bottom-color: shade($base_color, .8); - background-color: shade($base_color, .97); - background-image: none; - } - - &:hover, &:active:hover, &:hover:focus, &:active:hover:focus { - border-color: shade($base_color, .9); - border-bottom-color: shade($base_color, .8); - background-color: shade($base_color, .99); - background-image: none; - } - - &:last-child .button { border-width: 0 0 1px; } - } - } -} - /********** ! Frames *
