[gnome-flashback] input-sources: fix GfInputSourcePopup style
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback] input-sources: fix GfInputSourcePopup style
- Date: Tue, 19 Jan 2016 13:19:59 +0000 (UTC)
commit 79d740d2625f06103c5c7294888ba413bd7bbb05
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Tue Jan 19 14:53:33 2016 +0200
input-sources: fix GfInputSourcePopup style
data/theme/Adwaita/gnome-flashback-dark.css | 13 +++++++++++++
data/theme/Adwaita/gnome-flashback.css | 13 +++++++++++++
data/theme/HighContrast/gnome-flashback.css | 13 +++++++++++++
gnome-flashback/Adwaita.css | 9 ---------
gnome-flashback/HighContrast.css | 9 ---------
.../libinput-sources/gf-input-source-popup.c | 3 +--
6 files changed, 40 insertions(+), 20 deletions(-)
---
diff --git a/data/theme/Adwaita/gnome-flashback-dark.css b/data/theme/Adwaita/gnome-flashback-dark.css
index 8a06101..5f7a14e 100644
--- a/data/theme/Adwaita/gnome-flashback-dark.css
+++ b/data/theme/Adwaita/gnome-flashback-dark.css
@@ -2,6 +2,7 @@
gf-popup-window {
background-color: #393f3f;
+ color: #eeeeec;
border: 1px solid rgba(28, 31, 31, 0.9);
border-radius: 10px;
}
@@ -14,6 +15,18 @@ gf-popup-window.solid {
#gf-input-source-popup {
}
+#gf-input-source-popup #gf-input-source {
+ min-width: 120px;
+ min-height: 120px;
+ font-size: 22px;
+}
+
+#gf-input-source-popup #gf-input-source:selected {
+ background-color: #215d9c;
+ color: #ffffff;
+ border-radius: 6px;
+}
+
#gf-label-window {
font-size: 40px;
}
diff --git a/data/theme/Adwaita/gnome-flashback.css b/data/theme/Adwaita/gnome-flashback.css
index 0d89002..0f3407c 100644
--- a/data/theme/Adwaita/gnome-flashback.css
+++ b/data/theme/Adwaita/gnome-flashback.css
@@ -2,6 +2,7 @@
gf-popup-window {
background-color: #e8e8e7;
+ color: #2e3436;
border: 1px solid rgba(0, 0, 0, 0.23);
border-radius: 10px;
}
@@ -14,6 +15,18 @@ gf-popup-window.solid {
#gf-input-source-popup {
}
+#gf-input-source-popup #gf-input-source {
+ min-width: 120px;
+ min-height: 120px;
+ font-size: 22px;
+}
+
+#gf-input-source-popup #gf-input-source:selected {
+ background-color: #4a90d9;
+ color: #ffffff;
+ border-radius: 6px;
+}
+
#gf-label-window {
font-size: 40px;
}
diff --git a/data/theme/HighContrast/gnome-flashback.css b/data/theme/HighContrast/gnome-flashback.css
index 21ac68e..53215f8 100644
--- a/data/theme/HighContrast/gnome-flashback.css
+++ b/data/theme/HighContrast/gnome-flashback.css
@@ -2,6 +2,7 @@
gf-popup-window {
background-color: #ffffff;
+ color: #000000;
border: 1px solid rgba(0, 0, 0, 0.23);
border-radius: 10px;
}
@@ -14,6 +15,18 @@ gf-popup-window.solid {
#gf-input-source-popup {
}
+#gf-input-source-popup #gf-input-source {
+ min-width: 120px;
+ min-height: 120px;
+ font-size: 22px;
+}
+
+#gf-input-source-popup #gf-input-source:selected {
+ background-color: #000000;
+ color: #ffffff;
+ border-radius: 6px;
+}
+
#gf-label-window {
font-size: 40px;
}
diff --git a/gnome-flashback/Adwaita.css b/gnome-flashback/Adwaita.css
index 6c63a6e..e69de29 100644
--- a/gnome-flashback/Adwaita.css
+++ b/gnome-flashback/Adwaita.css
@@ -1,9 +0,0 @@
-GfInputSourcePopup #input-source
-{
- font-size: 22px;
-}
-
-GfInputSourcePopup #input-source:selected
-{
- border-radius: 10px;
-}
diff --git a/gnome-flashback/HighContrast.css b/gnome-flashback/HighContrast.css
index 6c63a6e..e69de29 100644
--- a/gnome-flashback/HighContrast.css
+++ b/gnome-flashback/HighContrast.css
@@ -1,9 +0,0 @@
-GfInputSourcePopup #input-source
-{
- font-size: 22px;
-}
-
-GfInputSourcePopup #input-source:selected
-{
- border-radius: 10px;
-}
diff --git a/gnome-flashback/libinput-sources/gf-input-source-popup.c
b/gnome-flashback/libinput-sources/gf-input-source-popup.c
index 4077e7b..0602992 100644
--- a/gnome-flashback/libinput-sources/gf-input-source-popup.c
+++ b/gnome-flashback/libinput-sources/gf-input-source-popup.c
@@ -166,8 +166,7 @@ setup_popup_window (GfInputSourcePopup *popup)
g_object_set_data (G_OBJECT (label), "index", GINT_TO_POINTER (index));
g_signal_connect (label, "draw", G_CALLBACK (draw_cb), popup);
- gtk_widget_set_name (label, "input-source");
- gtk_widget_set_size_request (label, 120, 120);
+ gtk_widget_set_name (label, "gf-input-source");
gtk_box_pack_start (GTK_BOX (popup->sources_box), label, FALSE, FALSE, 0);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]