From def31cec0e73143ccf7cf6e68220b5db92be92f3 Mon Sep 17 00:00:00 2001 From: Khurshid Alam Date: Tue, 20 Oct 2015 19:26:48 +0530 Subject: [PATCH 1/7] Fixes wrong menu color in gtk3.16 apps issue: #253 --- gtk-3.0/scss/_global.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss index 3dfab07a6..faad1adb1 100755 --- a/gtk-3.0/scss/_global.scss +++ b/gtk-3.0/scss/_global.scss @@ -47,8 +47,8 @@ $titlebar_fg_color: $dark_fg_color; $menu_bg_color: $dark_bg_color; $menu_fg_color: $dark_fg_color; -$menubar_bg_color: $bg_color; -$menubar_fg_color: $fg_color; +$menubar_bg_color: $dark_bg_color; +$menubar_fg_color: $dark_fg_color; $panel_bg_color: $dark_bg_color; $panel_fg_color: $dark_fg_color; From 4e14e6d492a2b4e1c272325f8bd651d7db456e8b Mon Sep 17 00:00:00 2001 From: Francesco Landolfi Date: Tue, 27 Oct 2015 17:10:21 +0100 Subject: [PATCH 2/7] Update _nautilus.scss Fixes #256: no icon padding. --- gtk-3.0/scss/apps/_nautilus.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gtk-3.0/scss/apps/_nautilus.scss b/gtk-3.0/scss/apps/_nautilus.scss index 32cbae7bc..48294bac2 100644 --- a/gtk-3.0/scss/apps/_nautilus.scss +++ b/gtk-3.0/scss/apps/_nautilus.scss @@ -23,6 +23,11 @@ .sidebar .frame { border: 0; } + .sidebar-icon { + padding-left: 10px; + padding-right: 10px; + } + GtkPaned { border-width: 0 1px 0 0; border-style: solid; From a09f22006c5d3f1827bdf5bf1a6d430588433386 Mon Sep 17 00:00:00 2001 From: Francesco Landolfi Date: Tue, 27 Oct 2015 21:04:36 +0100 Subject: [PATCH 3/7] Update _nautilus.scss Changed from fixed value to global value. --- gtk-3.0/scss/apps/_nautilus.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk-3.0/scss/apps/_nautilus.scss b/gtk-3.0/scss/apps/_nautilus.scss index 48294bac2..94cf2ef72 100644 --- a/gtk-3.0/scss/apps/_nautilus.scss +++ b/gtk-3.0/scss/apps/_nautilus.scss @@ -24,8 +24,8 @@ .sidebar .frame { border: 0; } .sidebar-icon { - padding-left: 10px; - padding-right: 10px; + padding-left: $spacing; + padding-right: $spacing; } GtkPaned { From 5b81b2ddc2c1bf75a0b341c526c033aa15209cd0 Mon Sep 17 00:00:00 2001 From: Test User Date: Sat, 31 Oct 2015 12:46:06 +0100 Subject: [PATCH 4/7] Refines unity-greeter --- gtk-3.0/scss/apps/_unity-greeter.scss | 77 ++++++++++++++------------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/gtk-3.0/scss/apps/_unity-greeter.scss b/gtk-3.0/scss/apps/_unity-greeter.scss index eb60d2afe..12ed0ce20 100644 --- a/gtk-3.0/scss/apps/_unity-greeter.scss +++ b/gtk-3.0/scss/apps/_unity-greeter.scss @@ -5,35 +5,38 @@ @include exports("unity-greeter") { -.lightdm.menu { - background-image: none; - background-color: alpha($black, 0.6); - border-color: alpha($white, 0.2); - border-radius: 4px; - padding: 1px; - - color: $white; -} - -.lightdm-combo .menu { - background-color: shade($dark_bg_color, 1.08); - border-radius: 0px; - padding: 0px; + .lightdm.menu { + background-image: none; + background-color: fade-out($black, .4); + border-color: fade-out($white, .8); + border-radius: 4px; + padding: 1px; - color: $white; -} + color: $white; + } -.lightdm.menu .menuitem *, -.lightdm.menu .menuitem.check:active, -.lightdm.menu .menuitem.radio:active { - color: $white; -} + .lightdm-combo .menu { + background-color: shade($dark_bg_color, 1.08); + border-radius: 0; + padding: 0; + color: $white; + } -.lightdm.menubar { - background-image: none; - background-color: alpha(#00ff00, 0.5); -} + .lightdm.menu .menuitem *, + .lightdm.menu .menuitem.check:active, + .lightdm.menu .menuitem.radio:active { + color: $white; + } + .lightdm.menubar { + background-image: none; + background-color: fade-out(#0f0, .5); + } + + .lightdm.menubar .menuitem { + color: $menubar_bg_color; + padding: 0 5px; + } .lightdm-combo.combobox-entry .button, .lightdm-combo .cell, @@ -42,16 +45,16 @@ .lightdm.button{ background-image: none; - background-color: alpha($black, 0.3); - border-color: alpha($white, 0.9); + background-color: fade-out($black, .7); + border-color: fade-out($white, .1); border-radius: 5px; padding: 5px; color: $white; } .lightdm.button:hover { background-image: none; - background-color: alpha($white, 0.3); - border-color: alpha($white, 0.6); + background-color: fade-out($white, .7); + border-color: fade-out($white, .4); border-radius: 5px; padding: 5px; color: $white; @@ -63,8 +66,8 @@ .lightdm.entry { background-image: none; - background-color: alpha($black, 0.3); - border-color: alpha($white, 0.6); + background-color: fade-out($black, .7); + border-color: fade-out($white, .4); border-radius: 5px; padding: 7px; color: $white; @@ -77,13 +80,13 @@ border-image: none; } .lightdm.entry:focused { - border-color: alpha($white, 0.6); + border-color: fade-out($white, .4); border-width: 1px; border-style: solid; color: $white; } .lightdm.entry:selected { - background-color: alpha($white, 0.2); + background-color: fade-out($white, .8); } @keyframes dashentry_spinner { @@ -106,13 +109,13 @@ border-width: 0; } .lightdm.toggle-button.selected:hover { - background-color: alpha($white, 0.3); - border-color: alpha($white, 0.3); + background-color: fade-out($white, .7); + border-color: fade-out($white, .7); border-width: 1px; } .lightdm.toggle-button.selected { - background-color: alpha($black, 0.3); - border-color: alpha($white, 0.3); + background-color: fade-out($black, .7); + border-color: fade-out($white, .7); border-width: 1px; } } From 2e4fc30bb2e667a6c1de1759ed36b4cc3c49fbe8 Mon Sep 17 00:00:00 2001 From: Test User Date: Sat, 31 Oct 2015 12:54:38 +0100 Subject: [PATCH 5/7] Fixes typo --- gtk-3.0/scss/apps/_unity-greeter.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk-3.0/scss/apps/_unity-greeter.scss b/gtk-3.0/scss/apps/_unity-greeter.scss index 12ed0ce20..41f8ea177 100644 --- a/gtk-3.0/scss/apps/_unity-greeter.scss +++ b/gtk-3.0/scss/apps/_unity-greeter.scss @@ -34,7 +34,7 @@ } .lightdm.menubar .menuitem { - color: $menubar_bg_color; + color: $menubar_fg_color; padding: 0 5px; } From f87be2ffc884a4aa53c0bda4f97cc42e1a8d1487 Mon Sep 17 00:00:00 2001 From: Test User Date: Sat, 31 Oct 2015 14:04:20 +0100 Subject: [PATCH 6/7] Removes unnecessary things --- gtk-3.0/scss/apps/_unity-greeter.scss | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gtk-3.0/scss/apps/_unity-greeter.scss b/gtk-3.0/scss/apps/_unity-greeter.scss index 41f8ea177..9e8403989 100644 --- a/gtk-3.0/scss/apps/_unity-greeter.scss +++ b/gtk-3.0/scss/apps/_unity-greeter.scss @@ -28,14 +28,9 @@ color: $white; } - .lightdm.menubar { - background-image: none; - background-color: fade-out(#0f0, .5); - } - + .lightdm.menubar *, .lightdm.menubar .menuitem { - color: $menubar_fg_color; - padding: 0 5px; + padding: 2px 2px; } .lightdm-combo.combobox-entry .button, From 5488077d637f6aa678a979f2ed20a3944f630ce3 Mon Sep 17 00:00:00 2001 From: Test User Date: Sat, 31 Oct 2015 14:09:05 +0100 Subject: [PATCH 7/7] Hound complained --- gtk-3.0/scss/apps/_unity-greeter.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk-3.0/scss/apps/_unity-greeter.scss b/gtk-3.0/scss/apps/_unity-greeter.scss index 9e8403989..5ca899ef0 100644 --- a/gtk-3.0/scss/apps/_unity-greeter.scss +++ b/gtk-3.0/scss/apps/_unity-greeter.scss @@ -30,7 +30,7 @@ .lightdm.menubar *, .lightdm.menubar .menuitem { - padding: 2px 2px; + padding: 2px; } .lightdm-combo.combobox-entry .button,