From f52633e9769d63e608c278e471f6182a826c398c Mon Sep 17 00:00:00 2001 From: Khurshid Alam Date: Wed, 15 Feb 2017 12:46:53 +0530 Subject: [PATCH 01/10] Attempting to fix >1px height in linked combobox-button Still not perfect More will come once I unify button (image, text, image-text, popup, radio) paddings --- src/gtk-3.20/scss/widgets/_button.scss | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/gtk-3.20/scss/widgets/_button.scss b/src/gtk-3.20/scss/widgets/_button.scss index 7175bad..709acf3 100644 --- a/src/gtk-3.20/scss/widgets/_button.scss +++ b/src/gtk-3.20/scss/widgets/_button.scss @@ -43,9 +43,9 @@ } %button { - min-height: 16px; - min-width: 16px; - padding: $spacing ($spacing + 2px); + //min-height: 16px; + //min-width: 16px; + padding: $spacing ($spacing + 1); border-width: 1px; border-style: solid; border-radius: $roundness; @@ -525,8 +525,8 @@ button.combo { // otherwise the arrow placement is not symmetric min-width: 0; - padding-left: $spacing + 2px; - padding-right: $spacing + 2px; + //padding-left: $spacing + 1px; + //padding-right: $spacing + 1px; } arrow { @@ -537,9 +537,11 @@ box button, box entry { @extend %linked_button; - padding: $spacing ($spacing + 2px); } + //hack to get rid of extra +1px height in linked combobox + //.linked:not(.vertical) button.combo { padding: 4px; } + .linked:not(.vertical) > & > box > button.combo { // the combo is a composite widget so the way we do button linked doesn't // work, special case needed. See From f25d7e04353543e03fd155f4d9dfa80fc6b551f2 Mon Sep 17 00:00:00 2001 From: Khurshid Alam Date: Wed, 15 Feb 2017 13:29:13 +0530 Subject: [PATCH 02/10] [Gtk-3.22] Separate titlebar mixin from toolbar Separate mixin for toolbar and titlebar Symbolic icon for horizontal toolbar. Lets face it, toolbutton icons for gnome+hicolor are not as good as symbolic icons. We are using symbolic icons everywhere else anyway. Button padding for horizontal toolbar is reduced to 4px. Horizontal toolbar requests GTK_ICON_SIZE_LARGE (24x24) by default. It doesn't make sense to use 5px padding on 24x24 icons. Button (image, text, image-text, popup, radio) padding for vertical toolbar,headerbar remains same for now. --- src/gtk-3.20/scss/widgets/_toolbar.scss | 67 +++++++++++++++++++++---- 1 file changed, 57 insertions(+), 10 deletions(-) diff --git a/src/gtk-3.20/scss/widgets/_toolbar.scss b/src/gtk-3.20/scss/widgets/_toolbar.scss index 95c929b..5bb8f65 100644 --- a/src/gtk-3.20/scss/widgets/_toolbar.scss +++ b/src/gtk-3.20/scss/widgets/_toolbar.scss @@ -5,7 +5,7 @@ ! Toolbar **********/ -@mixin toolbar($bg, $fg) { +@mixin titlebar($bg, $fg) { @include linear-gradient($bg); @include border($bg); @@ -13,7 +13,6 @@ &:disabled { @include linear-gradient(shade($bg, .9)); - color: mix($fg, $bg, .5); } @@ -28,22 +27,65 @@ } button { @include button($bg, $fg); } - .linked > button { @include linked_button($bg); } - combobox, button { - padding: $spacing; + combobox { padding: 4px; } - &.text-button { padding: $spacing; } + separator { + &, &:disabled { + color: shade($bg, ($contrast - .2)); + border-color: currentColor; + -GtkWidget-window-dragging: true; + } + } +} - &.image-button { padding: $spacing; } + + + + +@mixin toolbar($bg, $fg) { + @include linear-gradient($bg); + @include border($bg); + + color: $fg; + + &:disabled { + @include linear-gradient(shade($bg, .9)); + color: mix($fg, $bg, .5); + } + + .title { + font-weight: bold; + padding: 0 ($spacing * 2); + } + + .subtitle { + font-size: smaller; + padding: 0 ($spacing * 2); + } + + button { @include button($bg, $fg); } + .linked > button { @include linked_button($bg); } + + &.horizontal combobox { padding: 4px; } + + &.horizontal button { + padding: 4px; + &.text-button { padding: 4px; } + &.image-button { padding: 4px; } + } + + &.vertical button { + padding: 5px; + &.text-button { padding: 5px; } + &.image-button { padding: 5px; } } separator { &, &:disabled { color: shade($bg, ($contrast - .2)); border-color: currentColor; - -GtkWidget-window-dragging: true; } } @@ -81,6 +123,7 @@ %toolbar { padding: $spacing - 1px; border-style: none; + -gtk-icon-style: symbolic; // toolbar separators &.horizontal separator { margin: 0 ($spacing + 2px) 1px; } @@ -99,6 +142,11 @@ button { // Size height margin-top: $spacing + 3px; margin-bottom: $spacing + 3px; + &.popup { padding: 5px; } + &.image-button { padding: 5px; } + &.text-button.image-button { padding: 5px; } + &.text-button { padding: 5px; } + } switch { // Size height @@ -113,7 +161,7 @@ } %titlebar { // Default headerbar and titlebar code. - @include toolbar($titlebar_bg_color, $titlebar_fg_color); + @include titlebar($titlebar_bg_color, $titlebar_fg_color); @include linear-gradient($titlebar_bg_color); border-radius: $roundness $roundness 0 0; @@ -186,7 +234,6 @@ @include exports("toolbar") { toolbar { @include toolbar($toolbar_bg_color, $toolbar_fg_color); - @extend %toolbar; &.inline-toolbar { @include inline-toolbar($toolbar_bg_color, $toolbar_fg_color); } From d99f46c88895330688f0aa306c05603017ed2334 Mon Sep 17 00:00:00 2001 From: Khurshid Alam Date: Mon, 13 Mar 2017 22:38:18 +0530 Subject: [PATCH 03/10] [Gtk-3.22] Use box-shadow to draw border on Notebook tab We were drawing border on both notebook tab and on widget > box, which results a double border on tab. The situation worse in case of tiling gtk3 apps like tilix which uses can use horizontal notebook inside vertical notebook. --- src/gtk-3.20/scss/widgets/_notebook.scss | 230 +++++++++++------------ 1 file changed, 109 insertions(+), 121 deletions(-) diff --git a/src/gtk-3.20/scss/widgets/_notebook.scss b/src/gtk-3.20/scss/widgets/_notebook.scss index 642ef2d..31f9d89 100644 --- a/src/gtk-3.20/scss/widgets/_notebook.scss +++ b/src/gtk-3.20/scss/widgets/_notebook.scss @@ -145,28 +145,21 @@ tab { padding: 0; - border-style: solid; - border-width: 1px; // for reorderable tabs - border-color: transparent; // - background-image: none; - box-shadow: none; outline: none; > box, > label, > widget > box { - padding: $spacing $spacing * 2; // top/bottom | left/right - border-width: 2px; - border-style: solid; - border-color: transparent; - transition: border-color .2s linear; + padding: ($spacing + 2px) $spacing * 2; // top/bottom | left/right + box-shadow: 1px 1px transparent; //duplicate shadows used for transition? + transition: box-shadow .2s linear; } &.reorderable-page { > box, > label, > widget > box { - padding: $spacing $spacing * 2; // top | right | bottom | left + padding: ($spacing + 2px) $spacing * 2; // top | right | bottom | left } } @@ -217,89 +210,29 @@ } } - &.top tab, - &.bottom tab { - &:hover { - &:not(:first-child):not(:last-child):not(:only-child) { - box-shadow: 1px 0 1px shade($base_color, .85), -1px 0 1px shade($base_color, .85); - } - - &:last-child:not(:only-child) { - box-shadow: -1px 0 1px shade($base_color, .85); - } - - &:first-child:not(:only-child) { - box-shadow: 1px 0 1px shade($base_color, .85); - } - } - - &:checked { - &:not(:first-child):not(:last-child):not(:only-child) { - box-shadow: 1px 0 1px shade($base_color, .8), -1px 0 1px shade($base_color, .8); - } - - &:last-child:not(:only-child) { - box-shadow: -1px 0 1px shade($base_color, .8); - } - - &:first-child:not(:only-child) { - box-shadow: 1px 0 1px shade($base_color, .8); - } - } - } - - &.right tab, - &.left tab { - &:hover { - &:not(:first-child):not(:last-child):not(:only-child) { - box-shadow: 0 1px 1px shade($base_color, .85), 0 -1px 1px shade($base_color, .85); - } - - &:last-child:not(:only-child) { - box-shadow: 0 -1px 1px shade($base_color, .85); - } - - &:first-child:not(:only-child) { - box-shadow: 0 1px 1px shade($base_color, .85); - } - } - - &:checked { - &:not(:first-child):not(:last-child):not(:only-child) { - box-shadow: 0 1px 1px shade($base_color, .8), 0 -1px 1px shade($base_color, .8); - } - - &:last-child:not(:only-child) { - box-shadow: 0 -1px 1px shade($base_color, .8); - } - - &:first-child:not(:only-child) { - box-shadow: 0 1px 1px shade($base_color, .8); - } - } - } &.top tab { - border-style: solid; - border-color: $borders_color; - border-width: 0; - border-bottom-width: 1px; - transition: border-bottom-color .2s linear; + box-shadow: inset 0 -1px $borders_color; + transition: box-shadow .2s ease-out; &:hover { - outline: none; + outline: none; + &:not(:first-child):not(:last-child):not(:only-child) { + box-shadow: 1px 0 1px shade($base_color, .85), -1px 0 1px shade($base_color, .85), inset 0 -1px $borders_color; + } + + &:last-child:not(:only-child) { + box-shadow: -1px 0 1px shade($base_color, .85), inset 0 -1px $borders_color; + } + + &:first-child:not(:only-child) { + box-shadow: 1px 0 1px shade($base_color, .85), inset 0 -1px $borders_color; + } } &:checked { - border-bottom-color: $selected_bg_color; outline: none; - > box, - > label, - > widget > box { - border-bottom-color: $selected_bg_color; - } - label { margin-bottom: 0; color: $selected_bg_color; @@ -308,30 +241,46 @@ &:hover { background-color: mix($bg_color, $base_color, .6); } + + &:not(:first-child):not(:last-child):not(:only-child) { + box-shadow: 1px 0 1px shade($base_color, .8), -1px 0 1px shade($base_color, .8), inset 0 -2px $selected_bg_color; + } + + &:last-child:not(:only-child) { + box-shadow: -1px 0 1px shade($base_color, .8), inset 0 -2px $selected_bg_color; + + } + + &:first-child:not(:only-child) { + box-shadow: 1px 0 1px shade($base_color, .8), inset 0 -2px $selected_bg_color; + + } } } &.right tab { - border-style: solid; - border-color: $borders_color; - border-width: 0; - border-left-width: 1px; - transition: border-left-color .3s ease-out; + box-shadow: inset 1px 0 $borders_color; + transition: box-shadow .3s ease-out; &:hover { outline: none; + + &:not(:first-child):not(:last-child):not(:only-child) { + box-shadow: 0 1px 1px shade($base_color, .85), 0 -1px 1px shade($base_color, .85), inset 1px 0 $borders_color; + } + + &:last-child:not(:only-child) { + box-shadow: 0 -1px 1px shade($base_color, .85), inset 1px 0 $borders_color; + } + + &:first-child:not(:only-child) { + box-shadow: 0 1px 1px shade($base_color, .85), inset 1px 0 $borders_color; + } } &:checked { - border-left-color: $selected_bg_color; outline: none; - > box, - > label, - > widget > box { - border-left-color: $selected_bg_color; - } - label { margin-left: 0; color: $selected_bg_color; @@ -340,30 +289,43 @@ &:hover { background-color: mix($bg_color, $base_color, .6); } + + &:not(:first-child):not(:last-child):not(:only-child) { + box-shadow: 0 1px 1px shade($base_color, .8), 0 -1px 1px shade($base_color, .8), inset 2px 0 $selected_bg_color; + } + + &:last-child:not(:only-child) { + box-shadow: 0 -1px 1px shade($base_color, .8), inset 2px 0 $selected_bg_color; + } + + &:first-child:not(:only-child) { + box-shadow: 0 1px 1px shade($base_color, .8), inset 2px 0 $selected_bg_color; + } } } &.bottom tab { - border-style: solid; - border-color: $borders_color; - border-width: 0; - border-top-width: 1px; - transition: border-top-color .3s ease-out; + box-shadow: inset 0 1px $borders_color; + transition: box-shadow .3s ease-out; &:hover { outline: none; + &:not(:first-child):not(:last-child):not(:only-child) { + box-shadow: 1px 0 1px shade($base_color, .85), -1px 0 1px shade($base_color, .85), inset 0 1px $borders_color; + } + + &:last-child:not(:only-child) { + box-shadow: -1px 0 1px shade($base_color, .85), inset 0 1px $borders_color; + } + + &:first-child:not(:only-child) { + box-shadow: 1px 0 1px shade($base_color, .85), inset 0 1px $borders_color; + } } &:checked { - border-top-color: $selected_bg_color; outline: none; - > box, - > label, - > widget > box { - border-top-color: $selected_bg_color; - } - label { margin-top: 0; color: $selected_bg_color; @@ -372,30 +334,44 @@ &:hover { background-color: mix($bg_color, $base_color, .6); } + + &:not(:first-child):not(:last-child):not(:only-child) { + box-shadow: 1px 0 1px shade($base_color, .8), -1px 0 1px shade($base_color, .8), inset 0 2px $selected_bg_color; + } + + &:last-child:not(:only-child) { + box-shadow: -1px 0 1px shade($base_color, .8), inset 0 2px $selected_bg_color; + } + + &:first-child:not(:only-child) { + box-shadow: 1px 0 1px shade($base_color, .8), inset 0 2px $selected_bg_color; + } } } &.left tab { - border-style: solid; - border-color: $borders_color; - border-width: 0; - border-right-width: 1px; - transition: border-right-color .3s ease-out; + box-shadow: inset -1px 0 $borders_color; + transition: box-shadow .3s ease-out; &:hover { outline: none; + + &:not(:first-child):not(:last-child):not(:only-child) { + box-shadow: 0 1px 1px shade($base_color, .85), 0 -1px 1px shade($base_color, .85), inset -1px 0 $borders_color; + } + + &:last-child:not(:only-child) { + box-shadow: 0 -1px 1px shade($base_color, .85), inset -1px 0 $borders_color; + } + + &:first-child:not(:only-child) { + box-shadow: 0 1px 1px shade($base_color, .85), inset -1px 0 $borders_color; + } } &:checked { - border-right-color: $selected_bg_color; outline: none; - > box, - > label, - > widget > box { - border-right-color: $selected_bg_color; - } - label { margin-right: 0; color: $selected_bg_color; @@ -404,6 +380,18 @@ &:hover { background-color: mix($bg_color, $base_color, .6); } + + &:not(:first-child):not(:last-child):not(:only-child) { + box-shadow: 0 1px 1px shade($base_color, .8), 0 -1px 1px shade($base_color, .8), inset -2px 0 $selected_bg_color; + } + + &:last-child:not(:only-child) { + box-shadow: 0 -1px 1px shade($base_color, .8), inset -2px 0 $selected_bg_color; + } + + &:first-child:not(:only-child) { + box-shadow: 0 1px 1px shade($base_color, .8), inset -2px 0 $selected_bg_color; + } } } } From f55b6a71aa772836ac3a5cfac3226e91e2c43c52 Mon Sep 17 00:00:00 2001 From: Dustin Falgout Date: Tue, 21 Mar 2017 01:22:27 -0500 Subject: [PATCH 04/10] Update README.md --- README.md | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index a447f20..5ffae41 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ ## Install It -### Official Distro Packages +### Distro Packages |Distro|Install Command/Links| |:----:|:----:| -|![arch](https://dl.dropboxusercontent.com/u/60521097/archlogo26x26.png) ![antergos](https://dl.dropboxusercontent.com/u/60521097/logo-square26x26.png)|`sudo pacman -S numix-themes`| -|![openSUSE](https://dl.dropboxusercontent.com/u/60521097/Geeko-button-bling7.png)|[1 Click Install](http://software.opensuse.org/ymp/openSUSE:Factory/standard/numix-gtk-theme.ymp)  \|  [OBS Repo](http://software.opensuse.org/download.html?project=openSUSE%3AFactory&package=numix-gtk-theme)| -|![fedora](https://dl.dropboxusercontent.com/u/60521097/fedora-logo.png)|`sudo dnf install numix-gtk-theme`| -|[![debian](https://www.debian.org/logos/openlogo-nd-25.jpg)](https://www.debian.org/) ![ubuntu](https://dl.dropboxusercontent.com/u/60521097/ubuntu_orange_hex.png)|`sudo apt install numix-gtk-theme`| +|![arch][arch]  ![antergos][antergos]|`sudo pacman -S numix-themes`| +|![opensuse][opensuse]|[1 Click Install](http://software.opensuse.org/ymp/openSUSE:Factory/standard/numix-gtk-theme.ymp)  \|  [OBS Repo](http://software.opensuse.org/download.html?project=openSUSE%3AFactory&package=numix-gtk-theme)| +|![fedora][fedora]|`sudo dnf install numix-gtk-theme`| +|![debian][debian]  ![ubuntu][ubuntu]|`sudo apt install numix-gtk-theme`| ## Build It @@ -22,28 +22,16 @@ To install Sass, install Ruby and the gem command using your distribution's pack You'll also need the ```glib-compile-schemas``` and ```gdk-pixbuf-pixdata``` commands in your path to generate the gresource binary. Install them using your distribution's package manager. -#### Debian, Ubuntu +|Distro|Commands| +|:----:|:----:| +|![arch][arch]  ![antergos][antergos]|`sudo pacman -S glib2 gdk-pixbuf2`| +|![opensuse][opensuse]|`sudo zipper install glib2-devel gdk-pixbuf-devel`| +|![fedora][fedora]|`sudo dnf install glib2-devel gdk-pixbuf2-devel`| +|[![debian][debian]  ![ubuntu][ubuntu]|`sudo apt-get install libglib2.0-dev libgdk-pixbuf2.0-dev libxml2-utils`| - ```sh -sudo apt-get install libglib2.0-dev libgdk-pixbuf2.0-dev libxml2-utils -``` - -#### Fedora +After installing all the dependencies, change to the cloned directory and, run the following in Terminal, ```sh -sudo dnf install glib2-devel gdk-pixbuf2-devel -``` - -#### Arch Linux - -```sh -sudo pacman -S glib2 gdk-pixbuf2 -``` - -After installing all the dependencies, switch to the cloned directory and, run the following in Terminal, - -```sh -make sudo make install ``` @@ -86,3 +74,12 @@ Murrine theme engine Report bugs or contribute at [GitHub](https://github.com/numixproject/numix-gtk-theme) License: GPL-3.0+ + + +[antergos]: https://www.dropbox.com/s/tju7maccr328w87/logo-square26x26.png?dl=1 "antergos" +[arch]: https://www.dropbox.com/s/q8ypd345cqcd0b5/archlogo26x26.png?dl=1 "arch" +[fedora]: https://www.dropbox.com/s/b8q448vuwopb0cl/fedora-logo.png?dl=1 "fedora" +[openSUSE]: https://www.dropbox.com/s/jhirpw85ztgl59h/Geeko-button-bling7.png?dl=1 "openSUSE" +[ubuntu]: https://www.dropbox.com/s/nev98nld2u1qbgl/ubuntu_orange_hex.png?dl=1 "ubuntu" +[debian]: https://www.dropbox.com/s/jg7pypm1zk9qjt6/openlogo-nd-25.png?dl=1 "debian" + From deddc89cb68aeb97879cd9100026deafcacc3760 Mon Sep 17 00:00:00 2001 From: Dustin Falgout Date: Tue, 21 Mar 2017 01:23:40 -0500 Subject: [PATCH 05/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5ffae41..36534cd 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ You'll also need the ```glib-compile-schemas``` and ```gdk-pixbuf-pixdata``` co |![arch][arch]  ![antergos][antergos]|`sudo pacman -S glib2 gdk-pixbuf2`| |![opensuse][opensuse]|`sudo zipper install glib2-devel gdk-pixbuf-devel`| |![fedora][fedora]|`sudo dnf install glib2-devel gdk-pixbuf2-devel`| -|[![debian][debian]  ![ubuntu][ubuntu]|`sudo apt-get install libglib2.0-dev libgdk-pixbuf2.0-dev libxml2-utils`| +|![debian][debian]  ![ubuntu][ubuntu]|`sudo apt-get install libglib2.0-dev libgdk-pixbuf2.0-dev libxml2-utils`| After installing all the dependencies, change to the cloned directory and, run the following in Terminal, From c8828c73ce25600bb6b27579ba5c25480ebffbb4 Mon Sep 17 00:00:00 2001 From: Khurshid Alam Date: Wed, 29 Mar 2017 19:35:48 +0530 Subject: [PATCH 06/10] [Gtk-3.22] Progressbar under Treeview: Minor fixes * Do not draw progressbar border using box shadows, progressbar is now more flatter. * Do not use different color for progressbar in disabled state. In transmission, in normal state, progressbar (not selected) has no color, while in backdrop state it gets it's color back. This shouldn't be happenning. * Use border for progressbar.through These fixes are mainly for light variant. Dark variant requires much more work. --- src/gtk-3.20/scss/widgets/_view.scss | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/gtk-3.20/scss/widgets/_view.scss b/src/gtk-3.20/scss/widgets/_view.scss index 9ee6115..2d83494 100644 --- a/src/gtk-3.20/scss/widgets/_view.scss +++ b/src/gtk-3.20/scss/widgets/_view.scss @@ -177,9 +177,6 @@ border-radius: $roundness; border: 1px solid $selected_borders_color; background-color: $selected_bg_color; - //background-image: linear-gradient(to bottom, $selected_bg_color, darken($selected_bg_color, .1)); - box-shadow: inset 0 1px if($variant == 'light', transparentize($white, .7), transparentize($white, .85)), - 0 1px if($variant == 'light', transparentize($black, .8), transparentize($black, .9)); &:selected { &:focus, & { @@ -205,10 +202,11 @@ } } - &:disabled { + // Do not use different progressbar color for disabled state, + /*&:disabled { @include linear-gradient($bg_color); border-color: border_insensitive($bg_color); - } + }*/ &:backdrop { @if $variant == 'light' { @@ -223,18 +221,14 @@ } &.trough { // progress bar trough in treeviews - background-color: transparentize($fg_color, .9); border-radius: $roundness; + border: 1px solid alpha(border_normal($bg_color), .5); + background-color: transparentize($fg_color, .9); &:selected { &:focus, & { - background-color: if($variant == 'light', transparentize($selected_fg_color, .7), darken($selected_bg_color, .1)); - - @if $variant == 'light' { - border-width: 1px 0; - border-style: solid; - border-color: $selected_bg_color; - } + background-color: if($variant == 'light', transparentize($bg_color, .7), darken($selected_bg_color, .1)); + @if $variant == 'light' { border: 1px solid $selected_borders_color; } } } } From ab172c25d20c12689aa9309a8e6e539f87a5c407 Mon Sep 17 00:00:00 2001 From: Khurshid Alam Date: Wed, 29 Mar 2017 21:30:13 +0530 Subject: [PATCH 07/10] [Gtk-3.22] Re-Introduce disabled state under treeview.progressbar --- src/gtk-3.20/scss/widgets/_progress.scss | 2 +- src/gtk-3.20/scss/widgets/_view.scss | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/gtk-3.20/scss/widgets/_progress.scss b/src/gtk-3.20/scss/widgets/_progress.scss index 832692a..dfe7a9b 100644 --- a/src/gtk-3.20/scss/widgets/_progress.scss +++ b/src/gtk-3.20/scss/widgets/_progress.scss @@ -22,7 +22,7 @@ trough { border: 1px solid alpha(border_normal($bg_color), .5); - background-color: shade($bg_color, 1.08); + background-color: shade($bg_color, 1.1); background-image: none; border-radius: $roundness; } diff --git a/src/gtk-3.20/scss/widgets/_view.scss b/src/gtk-3.20/scss/widgets/_view.scss index 2d83494..d41f393 100644 --- a/src/gtk-3.20/scss/widgets/_view.scss +++ b/src/gtk-3.20/scss/widgets/_view.scss @@ -199,14 +199,12 @@ background-color: mix($backdrop_base_color, $selected_bg_color, .9); } + + &:disabled { background-color: shade($selected_bg_color, 1.08); } //required if disabled state is turned on } } - // Do not use different progressbar color for disabled state, - /*&:disabled { - @include linear-gradient($bg_color); - border-color: border_insensitive($bg_color); - }*/ + &:disabled { background-color: shade($selected_bg_color, 1.08); } &:backdrop { @if $variant == 'light' { @@ -223,14 +221,18 @@ &.trough { // progress bar trough in treeviews border-radius: $roundness; border: 1px solid alpha(border_normal($bg_color), .5); - background-color: transparentize($fg_color, .9); + background-color: shade($bg_color, 1.1); &:selected { &:focus, & { - background-color: if($variant == 'light', transparentize($bg_color, .7), darken($selected_bg_color, .1)); + background-color: if($variant == 'light', shade($bg_color, 1.1), darken($selected_bg_color, .1)); @if $variant == 'light' { border: 1px solid $selected_borders_color; } + + &:disabled { background-color: shade($bg_color, 1.08); } } } + + &:disabled { background-color: shade($bg_color, 1.08); } } header { From 35e546393478878544469f0383b2db2c7658a408 Mon Sep 17 00:00:00 2001 From: Khurshid Alam Date: Wed, 29 Mar 2017 21:44:29 +0530 Subject: [PATCH 08/10] Fix indentation --- src/gtk-3.20/scss/widgets/_view.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gtk-3.20/scss/widgets/_view.scss b/src/gtk-3.20/scss/widgets/_view.scss index d41f393..caa4cdf 100644 --- a/src/gtk-3.20/scss/widgets/_view.scss +++ b/src/gtk-3.20/scss/widgets/_view.scss @@ -200,7 +200,7 @@ background-color: mix($backdrop_base_color, $selected_bg_color, .9); } - &:disabled { background-color: shade($selected_bg_color, 1.08); } //required if disabled state is turned on + &:disabled { background-color: shade($selected_bg_color, 1.08); } //required if disabled state is turned on } } @@ -220,7 +220,7 @@ &.trough { // progress bar trough in treeviews border-radius: $roundness; - border: 1px solid alpha(border_normal($bg_color), .5); + border: 1px solid alpha(border_normal($bg_color), .5); background-color: shade($bg_color, 1.1); &:selected { @@ -228,11 +228,11 @@ background-color: if($variant == 'light', shade($bg_color, 1.1), darken($selected_bg_color, .1)); @if $variant == 'light' { border: 1px solid $selected_borders_color; } - &:disabled { background-color: shade($bg_color, 1.08); } + &:disabled { background-color: shade($bg_color, 1.08); } } } - &:disabled { background-color: shade($bg_color, 1.08); } + &:disabled { background-color: shade($bg_color, 1.08); } } header { From bf8f3b078ae3d76b99b25e4c61710552871d2fc7 Mon Sep 17 00:00:00 2001 From: Khurshid Alam Date: Sat, 8 Apr 2017 22:58:43 +0530 Subject: [PATCH 09/10] Use darker background for solid-csd window. Fixes #659 --- src/gtk-3.20/scss/widgets/_window.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gtk-3.20/scss/widgets/_window.scss b/src/gtk-3.20/scss/widgets/_window.scss index cd0b3d3..6af8287 100644 --- a/src/gtk-3.20/scss/widgets/_window.scss +++ b/src/gtk-3.20/scss/widgets/_window.scss @@ -33,7 +33,7 @@ .solid-csd & { border-radius: 0; margin: 1px; - background-color: $bg_color; + background-color: $titlebar_bg_color; // Unity/compiz regression: Issue: https://github.com/numixproject/numix-gtk-theme/issues/206 box-shadow: none; } From 487d8e60e92a1a1a450ab602b7822a2abc8b9fec Mon Sep 17 00:00:00 2001 From: Khurshid Alam Date: Fri, 14 Apr 2017 22:11:26 +0530 Subject: [PATCH 10/10] [Gtk-3.22] Tweaks in popover.events list for gnome-calendar --- src/gtk-3.20/scss/widgets/_menu.scss | 33 ++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/gtk-3.20/scss/widgets/_menu.scss b/src/gtk-3.20/scss/widgets/_menu.scss index 50f7257..f3e1207 100644 --- a/src/gtk-3.20/scss/widgets/_menu.scss +++ b/src/gtk-3.20/scss/widgets/_menu.scss @@ -286,6 +286,39 @@ } } + //gnome-calendar-fix + popover.events { + grid.vertical { + &, & list, & list row, & list box { + margin: 0; + border-radius: 0; + background-color: $menu_bg_color; + } + } + + grid.vertical box.vertical { + border-top-left-radius: 0; + border-top-right-radius: 0; + } + } + + popover { + list.calendar-list row { padding: 0px; } + + datechooser { + & grid.vertical navigator button { + min-height: 20px; + min-width: 20px; + margin: 5px; + } + + & grid.horizontal day.day { + min-height: 24px; + min-width: 24px; + } + } + } + modelbutton.flat, menuitem.button.flat { padding: ($spacing - 1px) ($spacing + 1px);