From d7c90b40bd6fd13e6c72db8b122398338790552c Mon Sep 17 00:00:00 2001
From: Megax <megax@yeahunter.hu>
Date: Sun, 10 Apr 2016 16:49:46 +0200
Subject: [PATCH 01/12] * Nemo sidebar treeview fix.
---
gtk-3.20/scss/apps/_nemo.scss | 82 +++++++++++++++++------------------
1 file changed, 40 insertions(+), 42 deletions(-)
diff --git a/gtk-3.20/scss/apps/_nemo.scss b/gtk-3.20/scss/apps/_nemo.scss
index d8526d5..8357f3a 100644
--- a/gtk-3.20/scss/apps/_nemo.scss
+++ b/gtk-3.20/scss/apps/_nemo.scss
@@ -27,6 +27,20 @@
-NemoPathbarButton-border-radius: $roundness;
}
+ .sidebar .view {
+ -NemoPlacesTreeView-disk-full-bg-color: shade($bg_color, .8);
+ -NemoPlacesTreeView-disk-full-fg-color: $selected_bg_color;
+ -NemoPlacesTreeView-disk-full-bar-width: 1px;
+ -NemoPlacesTreeView-disk-full-bar-radius: 1px;
+ -NemoPlacesTreeView-disk-full-bottom-padding: 2px;
+ -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);
+ }
+ }
+
.nemo-window {
toolbar {
border-width: 0 0 1px;
@@ -44,20 +58,6 @@
margin: 0px;
}
- .sidebar .view {
- -NemoPlacesTreeView-disk-full-bg-color: shade($toolbar_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);
- }
- }
-
.sidebar frame {
border: 0;
}
@@ -90,36 +90,36 @@
}
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;
+ button {
+ @include button($bg_color, $fg_color);
}
- &.image-button {
- padding: ($spacing + 1px) ($spacing - 1px) ($spacing + 1px) $spacing;
+ 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;
}
}
-
- separator, separator:disabled {
- color: shade($bg_color, ($contrast + .1));
- border-color: currentColor;
- -GtkWidget-window-dragging: true;
- }
-
- &.primary-toolbar button {
- padding: 5px 6px;
- }
- }
}
NemoQueryEditor {
@@ -146,8 +146,6 @@
border-bottom-color: border_normal($toolbar_bg_color);
}
}
-
}
}
-
}
From 0a8fca7d2f88f942c33c338ca005b4a88f4c5247 Mon Sep 17 00:00:00 2001
From: Megax <megax@yeahunter.hu>
Date: Sun, 10 Apr 2016 17:30:02 +0200
Subject: [PATCH 02/12] * Treeview progressbar numix style.
---
gtk-3.20/scss/widgets/_notebook.scss | 5 ++--
gtk-3.20/scss/widgets/_sidebar.scss | 1 +
gtk-3.20/scss/widgets/_view.scss | 45 +++++++++++++++-------------
3 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/gtk-3.20/scss/widgets/_notebook.scss b/gtk-3.20/scss/widgets/_notebook.scss
index ba97327..df5dc79 100644
--- a/gtk-3.20/scss/widgets/_notebook.scss
+++ b/gtk-3.20/scss/widgets/_notebook.scss
@@ -62,9 +62,8 @@
background-color: $base_color;
background-image: none;
border-color: shade($base_color, .85);
- label {
- color: $text_color;
- }
+
+ //label { color: $text_color; }
}
&.top {
diff --git a/gtk-3.20/scss/widgets/_sidebar.scss b/gtk-3.20/scss/widgets/_sidebar.scss
index 18e5963..3316b8b 100755
--- a/gtk-3.20/scss/widgets/_sidebar.scss
+++ b/gtk-3.20/scss/widgets/_sidebar.scss
@@ -48,6 +48,7 @@
}
.frame, frame { border-width: 0; }
+
.sidebar-icon {
padding-left: $spacing * 2;
padding-right: $spacing * 2;
diff --git a/gtk-3.20/scss/widgets/_view.scss b/gtk-3.20/scss/widgets/_view.scss
index f0aa5c5..ef2a87e 100644
--- a/gtk-3.20/scss/widgets/_view.scss
+++ b/gtk-3.20/scss/widgets/_view.scss
@@ -167,39 +167,46 @@
@if $variant == light { color: $base_color; }
border: 1px solid $selected_borders_color;
- border-radius: 4px;
background-color: $selected_bg_color;
- background-image: linear-gradient(to bottom, $selected_bg_color, darken($selected_bg_color,10%));
- box-shadow: inset 0 1px if($variant == 'light', transparentize(white,0.7), transparentize(white,0.85)),
- 0 1px if($variant == 'light', transparentize(black, 0.8), transparentize(black,0.9));
+ //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, & {
- border-radius: 4px;
-
@if $variant == 'light' {
- color: $selected_bg_color;
+ color: $selected_fg_color;
box-shadow: none;
- } @else { box-shadow: inset 0 1px transparentize(white, 0.95); }
+ } @else {
+ box-shadow: inset 0 1px transparentize(white, .95);
+ }
- background-image: linear-gradient(to bottom,
- $base_color,
- darken($base_color,10%));
+ background-color: linear-gradient(to bottom, $base_color, darken($base_color, .1));
&:backdrop {
@if $variant == 'light' {
color: $selected_bg_color;
border-color: $selected_borders_color; // otherwise it gets inherited by .view(?!?)
- } @else { border-color: $backdrop_base_color; }
+ } @else {
+ border-color: $backdrop_base_color;
+ }
background-color: $backdrop_base_color;
}
}
}
+ &:disabled {
+ @include linear-gradient($bg_color);
+ border-color: border_disabled($bg_color);
+ }
+
&:backdrop {
- @if $variant == 'light' { color: $backdrop_base_color;
- } @else { border-color: $backdrop_base_color; }
+ @if $variant == 'light' {
+ color: $backdrop_base_color;
+ } @else {
+ border-color: $backdrop_base_color;
+ }
background-image: none;
box-shadow: none;
@@ -207,15 +214,11 @@
}
&.trough { // progress bar trough in treeviews
- background-color: transparentize($fg_color,0.9);
- border-radius: 4px;
+ background-color: transparentize($fg_color, .9);
&:selected {
&:focus, & {
- background-color: if($variant == 'light',
- transparentize($selected_fg_color, 0.7),
- darken($selected_bg_color, 10%));
- border-radius: 4px;
+ background-color: if($variant == 'light', transparentize($selected_fg_color, .7), darken($selected_bg_color, .1));
@if $variant == 'light' {
border-width: 1px 0;
@@ -224,6 +227,8 @@
}
}
}
+
+ &:disabled { background-color: $base_color; }
}
header {
From 367f1baf1172f37e9c9b30e7c9d200555799e7dd Mon Sep 17 00:00:00 2001
From: Megax <megax@yeahunter.hu>
Date: Sun, 10 Apr 2016 17:36:57 +0200
Subject: [PATCH 03/12] * Re-enabled.
---
gtk-3.20/scss/widgets/_notebook.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gtk-3.20/scss/widgets/_notebook.scss b/gtk-3.20/scss/widgets/_notebook.scss
index df5dc79..1d47213 100644
--- a/gtk-3.20/scss/widgets/_notebook.scss
+++ b/gtk-3.20/scss/widgets/_notebook.scss
@@ -63,7 +63,7 @@
background-image: none;
border-color: shade($base_color, .85);
- //label { color: $text_color; }
+ label { color: $text_color; }
}
&.top {
From 5c44531515bba56cee082ab0ad5c46a529dead09 Mon Sep 17 00:00:00 2001
From: Megax <megax@yeahunter.hu>
Date: Sun, 10 Apr 2016 19:34:56 +0200
Subject: [PATCH 04/12] * Minimal notebook fix. Fixed 1px padding nemu desktop
and other (gnome-terminal) application.
---
gtk-3.20/scss/apps/_nemo.scss | 2 +-
gtk-3.20/scss/widgets/_notebook.scss | 50 ++++++++++++++++++----------
2 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/gtk-3.20/scss/apps/_nemo.scss b/gtk-3.20/scss/apps/_nemo.scss
index 8357f3a..0faca10 100644
--- a/gtk-3.20/scss/apps/_nemo.scss
+++ b/gtk-3.20/scss/apps/_nemo.scss
@@ -31,7 +31,7 @@
-NemoPlacesTreeView-disk-full-bg-color: shade($bg_color, .8);
-NemoPlacesTreeView-disk-full-fg-color: $selected_bg_color;
-NemoPlacesTreeView-disk-full-bar-width: 1px;
- -NemoPlacesTreeView-disk-full-bar-radius: 1px;
+ -NemoPlacesTreeView-disk-full-bar-radius: 0px;
-NemoPlacesTreeView-disk-full-bottom-padding: 2px;
-NemoPlacesTreeView-disk-full-max-length: 75px;
diff --git a/gtk-3.20/scss/widgets/_notebook.scss b/gtk-3.20/scss/widgets/_notebook.scss
index 1d47213..4bee67a 100644
--- a/gtk-3.20/scss/widgets/_notebook.scss
+++ b/gtk-3.20/scss/widgets/_notebook.scss
@@ -7,22 +7,15 @@
@include exports("notebook") {
notebook {
- padding: 0;
- border-width: 1px 0 0;
- border-style: solid;
- border-color: border_normal($base_color);
- border-radius: 0;
- background-color: $base_color;
- background-image: none;
- background-clip: border-box;
- color: $text_color;
-
- &.frame { border-width: 1px; }
-
> header {
+ padding: 0;
margin: 0;
border-width: 0;
+ border-radius: 0;
+ background-image: none;
+ background-clip: border-box;
background-color: shade($base_color, .9);
+ color: $text_color;
&.frame {
border-color: border_normal($base_color);
@@ -48,7 +41,7 @@
}
tab {
- padding: ($spacing + 1px) ($spacing * 2);
+ padding: ($spacing + 1) ($spacing * 2);
border: 1px solid transparent;
background-color: transparent;
background-image: none;
@@ -91,6 +84,29 @@
border-bottom-right-radius: 0;
}
+ button.flat {
+ &:hover { color: shade(currentColor, .95); }
+
+ &, &:backdrop { color: gtkalpha(currentColor, 0.3); }
+
+ padding: 0;
+ margin-top: 4px;
+ margin-bottom: 4px;
+ // FIXME: generalize .small-button?
+ min-width: 20px;
+ min-height: 20px;
+
+ &:last-child {
+ margin-left: 4px;
+ margin-right: -4px;
+ }
+
+ &:first-child {
+ margin-left: -4px;
+ margin-right: 4px;
+ }
+ }
+
label { color: mix($text_color, $base_color, .3); }
/* close button styling */
@@ -108,8 +124,8 @@
.reorderable-page {
&:hover {
background-color: shade($base_color, .85);
- border-left: 0;
- border-right: 0;
+ //border-left: 0; // TODO: I turned it off because it made the tabs to collide, eg gedit. It needs fixing.
+ //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);
@@ -117,8 +133,8 @@
&:checked {
background-color: shade($base_color, .9);
- border-left: 0;
- border-right: 0;
+ //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);
}
From 0c763cafb5919b9dbad488bf137cf444d2f93af6 Mon Sep 17 00:00:00 2001
From: Megax <megax@yeahunter.hu>
Date: Sun, 10 Apr 2016 19:39:22 +0200
Subject: [PATCH 05/12] * Text warning fix.
---
gtk-3.20/scss/widgets/_notebook.scss | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/gtk-3.20/scss/widgets/_notebook.scss b/gtk-3.20/scss/widgets/_notebook.scss
index 4bee67a..d51ccd7 100644
--- a/gtk-3.20/scss/widgets/_notebook.scss
+++ b/gtk-3.20/scss/widgets/_notebook.scss
@@ -87,7 +87,7 @@
button.flat {
&:hover { color: shade(currentColor, .95); }
- &, &:backdrop { color: gtkalpha(currentColor, 0.3); }
+ &, &:backdrop { color: gtkalpha(currentColor, .3); }
padding: 0;
margin-top: 4px;
@@ -108,9 +108,6 @@
}
label { color: mix($text_color, $base_color, .3); }
-
- /* close button styling */
- button { @extend %close_button; }
}
.prelight-page {
From 5b77bf19ba776f01132d8d7dc52b20efc4ed6920 Mon Sep 17 00:00:00 2001
From: Megax <megax@yeahunter.hu>
Date: Sun, 10 Apr 2016 19:58:00 +0200
Subject: [PATCH 06/12] * Toolbar color fixed.
---
gtk-3.20/scss/widgets/_toolbar.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gtk-3.20/scss/widgets/_toolbar.scss b/gtk-3.20/scss/widgets/_toolbar.scss
index f93040e..0e0d688 100755
--- a/gtk-3.20/scss/widgets/_toolbar.scss
+++ b/gtk-3.20/scss/widgets/_toolbar.scss
@@ -52,7 +52,7 @@
@include exports("toolbar") {
toolbar {
- @include toolbar($bg_color, $fg_color);
+ @include toolbar($toolbar_bg_color, $toolbar_fg_color);
border-style: none;
From 139b364be54eefd607f0264a2d31107355de34bf Mon Sep 17 00:00:00 2001
From: Megax <megax@yeahunter.hu>
Date: Sun, 10 Apr 2016 21:55:36 +0200
Subject: [PATCH 07/12] * Fixed flowbox name.
---
gtk-3.20/scss/widgets/_grid.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gtk-3.20/scss/widgets/_grid.scss b/gtk-3.20/scss/widgets/_grid.scss
index 3b84110..12f03ed 100644
--- a/gtk-3.20/scss/widgets/_grid.scss
+++ b/gtk-3.20/scss/widgets/_grid.scss
@@ -33,7 +33,7 @@
}
.grid-child {
- &, flowBox & {
+ &, flowbox & {
padding: $spacing;
border-radius: $roundness;
From b2948a02e8f9f63c603245954e3f37785cc291e1 Mon Sep 17 00:00:00 2001
From: Megax <megax@yeahunter.hu>
Date: Sun, 10 Apr 2016 22:25:33 +0200
Subject: [PATCH 08/12] * switch padding fix.
---
gtk-3.20/scss/widgets/_toggle.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gtk-3.20/scss/widgets/_toggle.scss b/gtk-3.20/scss/widgets/_toggle.scss
index 0957d4b..9f24977 100755
--- a/gtk-3.20/scss/widgets/_toggle.scss
+++ b/gtk-3.20/scss/widgets/_toggle.scss
@@ -74,7 +74,7 @@ $suffix: if($variant == "dark", "-dark", "");
@include exports("switch") {
switch {
border-radius: 3px;
- padding: 5px;
+ padding: 1px;
border: none;
outline: none;
transition: all 0.4s linear;
From 4874ea6360c0b7852f327ad099a2925b26eef31f Mon Sep 17 00:00:00 2001
From: Megax <megax@yeahunter.hu>
Date: Sun, 10 Apr 2016 22:35:34 +0200
Subject: [PATCH 09/12] * .dim-label duplicated code.
https://github.com/shimmerproject/Numix/blob/master/gtk-3.20/scss/widgets/_misc.scss#L5
---
gtk-3.20/scss/widgets/_base.scss | 5 -----
1 file changed, 5 deletions(-)
diff --git a/gtk-3.20/scss/widgets/_base.scss b/gtk-3.20/scss/widgets/_base.scss
index fa6a5e7..2d5b27d 100755
--- a/gtk-3.20/scss/widgets/_base.scss
+++ b/gtk-3.20/scss/widgets/_base.scss
@@ -113,11 +113,6 @@ label {
}
}
-.dim-label {
- opacity: 0.55;
- text-shadow: none;
-}
-
assistant {
.sidebar {
background-color: $base_color;
From 435dbd17032d49f274b8636476f9854ed0f362bb Mon Sep 17 00:00:00 2001
From: Megax <megax@yeahunter.hu>
Date: Mon, 11 Apr 2016 06:45:54 +0200
Subject: [PATCH 10/12] Revert "* switch padding fix."
This reverts commit b2948a02e8f9f63c603245954e3f37785cc291e1.
---
gtk-3.20/scss/widgets/_toggle.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gtk-3.20/scss/widgets/_toggle.scss b/gtk-3.20/scss/widgets/_toggle.scss
index 9f24977..0957d4b 100755
--- a/gtk-3.20/scss/widgets/_toggle.scss
+++ b/gtk-3.20/scss/widgets/_toggle.scss
@@ -74,7 +74,7 @@ $suffix: if($variant == "dark", "-dark", "");
@include exports("switch") {
switch {
border-radius: 3px;
- padding: 1px;
+ padding: 5px;
border: none;
outline: none;
transition: all 0.4s linear;
From d7fd70eb9122b59f0b7e776398e011951a23dc0e Mon Sep 17 00:00:00 2001
From: Megax <megax@yeahunter.hu>
Date: Mon, 11 Apr 2016 16:38:16 +0200
Subject: [PATCH 11/12] * notebook other background color fix.
---
gtk-3.20/scss/widgets/_notebook.scss | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gtk-3.20/scss/widgets/_notebook.scss b/gtk-3.20/scss/widgets/_notebook.scss
index d51ccd7..23e5b14 100644
--- a/gtk-3.20/scss/widgets/_notebook.scss
+++ b/gtk-3.20/scss/widgets/_notebook.scss
@@ -7,6 +7,8 @@
@include exports("notebook") {
notebook {
+ background-color: $base_color;
+
> header {
padding: 0;
margin: 0;
From b4e8999b291278f31124db76a70f9671a7b04d6d Mon Sep 17 00:00:00 2001
From: Megax <megax@yeahunter.hu>
Date: Mon, 11 Apr 2016 17:27:30 +0200
Subject: [PATCH 12/12] * progressbar Transmission fix. Selection backdrop fix.
---
gtk-3.20/scss/widgets/_view.scss | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/gtk-3.20/scss/widgets/_view.scss b/gtk-3.20/scss/widgets/_view.scss
index ef2a87e..82280bc 100644
--- a/gtk-3.20/scss/widgets/_view.scss
+++ b/gtk-3.20/scss/widgets/_view.scss
@@ -191,11 +191,19 @@
border-color: $backdrop_base_color;
}
- background-color: $backdrop_base_color;
+ background-color: mix($backdrop_base_color, $selected_bg_color, .9);
}
}
}
+ /* transmission fix. */
+ &:insensitive {
+ &:insensitive {
+ @include linear-gradient($bg_color);
+ border-color: border_insensitive($bg_color);
+ }
+ }
+
&:disabled {
@include linear-gradient($bg_color);
border-color: border_disabled($bg_color);
@@ -227,8 +235,6 @@
}
}
}
-
- &:disabled { background-color: $base_color; }
}
header {