From 646c67661b1275c569ba233d5b25686bf2aa34b1 Mon Sep 17 00:00:00 2001
From: Test User <andreas.angerer89@gmail.com>
Date: Mon, 28 Dec 2015 14:09:23 +0100
Subject: [PATCH 1/8] Small fixes
---
gtk-3.0/scss/apps/_unity-greeter.scss | 6 +++---
gtk-3.0/scss/widgets/_calendar.scss | 25 +++++++++++++++++++++----
2 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/gtk-3.0/scss/apps/_unity-greeter.scss b/gtk-3.0/scss/apps/_unity-greeter.scss
index 5ca899e..52955f5 100644
--- a/gtk-3.0/scss/apps/_unity-greeter.scss
+++ b/gtk-3.0/scss/apps/_unity-greeter.scss
@@ -64,7 +64,7 @@
background-color: fade-out($black, .7);
border-color: fade-out($white, .4);
border-radius: 5px;
- padding: 7px;
+ padding: 6px;
color: $white;
text-shadow: none;
}
@@ -93,10 +93,10 @@
animation: dashentry_spinner 1s infinite linear;
}
+
.lightdm.option-button {
- padding: 5px;
background: none;
- border: 0;
+ border-width: 0;
}
.lightdm.toggle-button {
diff --git a/gtk-3.0/scss/widgets/_calendar.scss b/gtk-3.0/scss/widgets/_calendar.scss
index 409eb5b..f299ea4 100644
--- a/gtk-3.0/scss/widgets/_calendar.scss
+++ b/gtk-3.0/scss/widgets/_calendar.scss
@@ -4,19 +4,36 @@
@include exports("calendar") {
GtkCalendar {
+ margin: 4px;
padding: $spacing;
outline-offset: -1px;
-
+
&:inconsistent { color: mix($fg_color, $bg_color, .5); }
- &.view, &.highlight, &.header, &.button {
+ &:selected {
&, &:focus, &:hover, &:insensitive {
- border: 0;
background-color: transparent;
- background-image: none;
+ color: $selected_bg_color;
}
}
+ &.view, &.highlight, &.header, &.button {
+ &, &:focus, &:hover, &:insensitive {
+ background-color: transparent;
+ background-image: none;
+ border-width: 0;
+ border-radius: 0;
+ }
+ }
+
+ &.button {
+ &, &:focus, &:hover, &:insensitive {
+ color: $white;
+ border-width: 0;
+ box-shadow: none;
+ }
+ }
+
&.highlight { color: $selected_bg_color; }
}
From fa2e9edda6f8860e01334289cd87489d6b867bb4 Mon Sep 17 00:00:00 2001
From: Test User <andreas.angerer89@gmail.com>
Date: Mon, 28 Dec 2015 14:14:42 +0100
Subject: [PATCH 2/8] Hound complained
---
gtk-3.0/scss/widgets/_calendar.scss | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/gtk-3.0/scss/widgets/_calendar.scss b/gtk-3.0/scss/widgets/_calendar.scss
index f299ea4..fd679aa 100644
--- a/gtk-3.0/scss/widgets/_calendar.scss
+++ b/gtk-3.0/scss/widgets/_calendar.scss
@@ -7,7 +7,7 @@
margin: 4px;
padding: $spacing;
outline-offset: -1px;
-
+
&:inconsistent { color: mix($fg_color, $bg_color, .5); }
&:selected {
@@ -16,7 +16,6 @@
color: $selected_bg_color;
}
}
-
&.view, &.highlight, &.header, &.button {
&, &:focus, &:hover, &:insensitive {
background-color: transparent;
@@ -25,7 +24,6 @@
border-radius: 0;
}
}
-
&.button {
&, &:focus, &:hover, &:insensitive {
color: $white;
@@ -33,10 +31,8 @@
box-shadow: none;
}
}
-
&.highlight { color: $selected_bg_color; }
}
-
/* gnome-calendar */
.calendar-view {
background-color: $base_color;
From 3f5d2a0f6a314223197e474d2074f3ce3d403548 Mon Sep 17 00:00:00 2001
From: Test User <andreas.angerer89@gmail.com>
Date: Mon, 28 Dec 2015 14:17:00 +0100
Subject: [PATCH 3/8] Styling
---
gtk-3.0/scss/apps/_unity-greeter.scss | 1 -
gtk-3.0/scss/widgets/_calendar.scss | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/gtk-3.0/scss/apps/_unity-greeter.scss b/gtk-3.0/scss/apps/_unity-greeter.scss
index 52955f5..3cb208f 100644
--- a/gtk-3.0/scss/apps/_unity-greeter.scss
+++ b/gtk-3.0/scss/apps/_unity-greeter.scss
@@ -93,7 +93,6 @@
animation: dashentry_spinner 1s infinite linear;
}
-
.lightdm.option-button {
background: none;
border-width: 0;
diff --git a/gtk-3.0/scss/widgets/_calendar.scss b/gtk-3.0/scss/widgets/_calendar.scss
index fd679aa..e64fc52 100644
--- a/gtk-3.0/scss/widgets/_calendar.scss
+++ b/gtk-3.0/scss/widgets/_calendar.scss
@@ -16,6 +16,7 @@
color: $selected_bg_color;
}
}
+
&.view, &.highlight, &.header, &.button {
&, &:focus, &:hover, &:insensitive {
background-color: transparent;
@@ -24,6 +25,7 @@
border-radius: 0;
}
}
+
&.button {
&, &:focus, &:hover, &:insensitive {
color: $white;
@@ -31,8 +33,10 @@
box-shadow: none;
}
}
+
&.highlight { color: $selected_bg_color; }
}
+
/* gnome-calendar */
.calendar-view {
background-color: $base_color;
From c96c8d61b91c8c87c140a931635f9b44ce450489 Mon Sep 17 00:00:00 2001
From: Test User <andreas.angerer89@gmail.com>
Date: Sun, 3 Jan 2016 10:06:24 +0100
Subject: [PATCH 4/8] Restores highlighting rectangle
---
gtk-3.0/scss/widgets/_calendar.scss | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/gtk-3.0/scss/widgets/_calendar.scss b/gtk-3.0/scss/widgets/_calendar.scss
index e64fc52..3885530 100644
--- a/gtk-3.0/scss/widgets/_calendar.scss
+++ b/gtk-3.0/scss/widgets/_calendar.scss
@@ -5,18 +5,11 @@
@include exports("calendar") {
GtkCalendar {
margin: 4px;
- padding: $spacing;
+ padding: 1px 5px;
outline-offset: -1px;
&:inconsistent { color: mix($fg_color, $bg_color, .5); }
- &:selected {
- &, &:focus, &:hover, &:insensitive {
- background-color: transparent;
- color: $selected_bg_color;
- }
- }
-
&.view, &.highlight, &.header, &.button {
&, &:focus, &:hover, &:insensitive {
background-color: transparent;
@@ -42,5 +35,6 @@
background-color: $base_color;
color: $text_color;
}
+
}
From 12d6ea95658c1d66a2bd81c183186b5994f88096 Mon Sep 17 00:00:00 2001
From: Test User <andreas.angerer89@gmail.com>
Date: Sun, 3 Jan 2016 10:07:51 +0100
Subject: [PATCH 5/8] Hound
---
gtk-3.0/scss/widgets/_calendar.scss | 1 -
1 file changed, 1 deletion(-)
diff --git a/gtk-3.0/scss/widgets/_calendar.scss b/gtk-3.0/scss/widgets/_calendar.scss
index 3885530..a385969 100644
--- a/gtk-3.0/scss/widgets/_calendar.scss
+++ b/gtk-3.0/scss/widgets/_calendar.scss
@@ -35,6 +35,5 @@
background-color: $base_color;
color: $text_color;
}
-
}
From da251e887833dd17c4c677fc7e4d1130a41f2418 Mon Sep 17 00:00:00 2001
From: Test User <andreas.angerer89@gmail.com>
Date: Sun, 3 Jan 2016 10:09:23 +0100
Subject: [PATCH 6/8] Removes unnecessary declaration
---
gtk-3.0/scss/widgets/_calendar.scss | 1 -
1 file changed, 1 deletion(-)
diff --git a/gtk-3.0/scss/widgets/_calendar.scss b/gtk-3.0/scss/widgets/_calendar.scss
index a385969..8782b3c 100644
--- a/gtk-3.0/scss/widgets/_calendar.scss
+++ b/gtk-3.0/scss/widgets/_calendar.scss
@@ -4,7 +4,6 @@
@include exports("calendar") {
GtkCalendar {
- margin: 4px;
padding: 1px 5px;
outline-offset: -1px;
From 85a7646f24e233048a410e49a5fea26173942ad9 Mon Sep 17 00:00:00 2001
From: Test User <andreas.angerer89@gmail.com>
Date: Sun, 3 Jan 2016 11:49:16 +0100
Subject: [PATCH 7/8] Fixes theming of option-button
---
gtk-3.0/scss/apps/_unity-greeter.scss | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gtk-3.0/scss/apps/_unity-greeter.scss b/gtk-3.0/scss/apps/_unity-greeter.scss
index 3cb208f..5bbfee3 100644
--- a/gtk-3.0/scss/apps/_unity-greeter.scss
+++ b/gtk-3.0/scss/apps/_unity-greeter.scss
@@ -98,6 +98,10 @@
border-width: 0;
}
+ .lightdm.option-button:insensitive:insensitive {
+ background: none;
+ }
+
.lightdm.toggle-button {
background: none;
border-width: 0;
From 0f0cb6db86b52449aaab7f7dd3a3be299443fac6 Mon Sep 17 00:00:00 2001
From: Test User <andreas.angerer89@gmail.com>
Date: Sat, 30 Jan 2016 11:07:23 +0100
Subject: [PATCH 8/8] Decreased padding to 3px
---
gtk-3.0/scss/widgets/_calendar.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gtk-3.0/scss/widgets/_calendar.scss b/gtk-3.0/scss/widgets/_calendar.scss
index 8782b3c..5c7ca32 100644
--- a/gtk-3.0/scss/widgets/_calendar.scss
+++ b/gtk-3.0/scss/widgets/_calendar.scss
@@ -4,7 +4,7 @@
@include exports("calendar") {
GtkCalendar {
- padding: 1px 5px;
+ padding: 1px 3px;
outline-offset: -1px;
&:inconsistent { color: mix($fg_color, $bg_color, .5); }