[gnome-flashback] theme: update

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 7179ecc834280521c31dd934a25d67c6f9259b12
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Dec 27 23:31:00 2019 +0200

    theme: update
    
    common.css should include all css that will be usefull to all
    themes (supported and unsupported).
    
    fallback.css should include extra css that might be needed to make
    gnome-flashback usable with unsupported themes.
    
    https://gitlab.gnome.org/GNOME/gnome-flashback/issues/30

 data/theme/Adwaita/gnome-flashback-dark.css        | 49 -----------------
 data/theme/Adwaita/gnome-flashback.css             | 49 -----------------
 .../theme/HighContrast/gnome-flashback-inverse.css | 64 +++-------------------
 data/theme/HighContrast/gnome-flashback.css        | 50 +----------------
 data/theme/common.css                              | 56 +++++++++++++++++++
 data/theme/fallback.css                            | 13 ++---
 6 files changed, 69 insertions(+), 212 deletions(-)
---
diff --git a/data/theme/Adwaita/gnome-flashback-dark.css b/data/theme/Adwaita/gnome-flashback-dark.css
index 95a494b..0d53d84 100644
--- a/data/theme/Adwaita/gnome-flashback-dark.css
+++ b/data/theme/Adwaita/gnome-flashback-dark.css
@@ -4,57 +4,21 @@ gf-popup-window {
   background-color: #393f3f;
   color: #eeeeec;
   border: 1px solid rgba(28, 31, 31, 0.9);
-  border-radius: 10px;
 }
 
 gf-popup-window.solid {
   border: 1px solid #1f2222;
-  border-radius: 0px;
-}
-
-#gf-candidate-popup {
-  border-radius: 3px;
-}
-
-#gf-candidate-popup.solid {
-  border-radius: 0px;
-}
-
-#gf-candidate-popup gf-candidate-box label {
-  padding: 4px 6px;
-}
-
-#gf-candidate-popup gf-candidate-box label:last-child {
-  padding-left: 0px;
 }
 
 #gf-candidate-popup gf-candidate-box:selected,
 #gf-candidate-popup gf-candidate-box:hover {
   background-color: #215d9c;
   color: #ffffff;
-  border-radius: 3px;
-}
-
-#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;
-}
-
-#gf-osd-window {
 }
 
 #gf-osd-window levelbar block.overdrive {
@@ -62,21 +26,8 @@ gf-popup-window.solid {
   border-color: #e01b24;
 }
 
-#gf-bubble {
-}
-
-gf-icon {
-  margin: 2px;
-}
-
 gf-icon label {
-  border-radius: 3px;
   color: #ffffff;
-  padding: 2px;
-}
-
-gf-icon:hover image {
-  -gtk-icon-effect: highlight;
 }
 
 gf-icon:selected label {
diff --git a/data/theme/Adwaita/gnome-flashback.css b/data/theme/Adwaita/gnome-flashback.css
index 6813e85..d1bac3e 100644
--- a/data/theme/Adwaita/gnome-flashback.css
+++ b/data/theme/Adwaita/gnome-flashback.css
@@ -4,57 +4,21 @@ gf-popup-window {
   background-color: #e8e8e7;
   color: #2e3436;
   border: 1px solid rgba(0, 0, 0, 0.23);
-  border-radius: 10px;
 }
 
 gf-popup-window.solid {
   border: 1px solid #a5a5a1;
-  border-radius: 0px;
-}
-
-#gf-candidate-popup {
-  border-radius: 3px;
-}
-
-#gf-candidate-popup.solid {
-  border-radius: 0px;
-}
-
-#gf-candidate-popup gf-candidate-box label {
-  padding: 4px 6px;
-}
-
-#gf-candidate-popup gf-candidate-box label:last-child {
-  padding-left: 0px;
 }
 
 #gf-candidate-popup gf-candidate-box:selected,
 #gf-candidate-popup gf-candidate-box:hover {
   background-color: #4a90d9;
   color: #ffffff;
-  border-radius: 3px;
-}
-
-#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;
-}
-
-#gf-osd-window {
 }
 
 #gf-osd-window levelbar block.overdrive {
@@ -62,21 +26,8 @@ gf-popup-window.solid {
   border-color: #e01b24;
 }
 
-#gf-bubble {
-}
-
-gf-icon {
-  margin: 2px;
-}
-
 gf-icon label {
-  border-radius: 3px;
   color: #ffffff;
-  padding: 2px;
-}
-
-gf-icon:hover image {
-  -gtk-icon-effect: highlight;
 }
 
 gf-icon:selected label {
diff --git a/data/theme/HighContrast/gnome-flashback-inverse.css 
b/data/theme/HighContrast/gnome-flashback-inverse.css
index 76da8a4..8655e92 100644
--- a/data/theme/HighContrast/gnome-flashback-inverse.css
+++ b/data/theme/HighContrast/gnome-flashback-inverse.css
@@ -1,60 +1,24 @@
 @import url("resource:///org/gnome/gnome-flashback/theme/common.css");
 
 gf-popup-window {
-  background-color: #ffffff;
-  color: #000000;
-  border: 1px solid rgba(0, 0, 0, 0.23);
-  border-radius: 10px;
+  background-color: #000000;
+  color: #ffffff;
+  border: 1px solid rgb(115, 115, 115);
 }
 
 gf-popup-window.solid {
   border: 1px solid #8d8d8d;
-  border-radius: 0px;
-}
-
-#gf-candidate-popup {
-  border-radius: 3px;
-}
-
-#gf-candidate-popup.solid {
-  border-radius: 0px;
-}
-
-#gf-candidate-popup gf-candidate-box label {
-  padding: 4px 6px;
-}
-
-#gf-candidate-popup gf-candidate-box label:last-child {
-  padding-left: 0px;
 }
 
 #gf-candidate-popup gf-candidate-box:selected,
 #gf-candidate-popup gf-candidate-box:hover {
-  background-color: #000000;
-  color: #ffffff;
-  border-radius: 3px;
-}
-
-#gf-input-source-popup {
-}
-
-#gf-input-source-popup #gf-input-source {
-  min-width: 120px;
-  min-height: 120px;
-  font-size: 22px;
+  background-color: #ffffff;
+  color: #000000;
 }
 
 #gf-input-source-popup #gf-input-source:selected {
-  background-color: #000000;
-  color: #ffffff;
-  border-radius: 6px;
-}
-
-#gf-label-window {
-  font-size: 40px;
-}
-
-#gf-osd-window {
+  background-color: #ffffff;
+  color: #000000;
 }
 
 #gf-osd-window levelbar block.overdrive {
@@ -62,21 +26,9 @@ gf-popup-window.solid {
   border-color: #ef2929;
 }
 
-#gf-bubble {
-}
-
-gf-icon {
-  margin: 2px;
-}
-
+gf-icon image,
 gf-icon label {
-  border-radius: 3px;
   color: #ffffff;
-  padding: 2px;
-}
-
-gf-icon:hover image {
-  -gtk-icon-effect: highlight;
 }
 
 gf-icon:selected label {
diff --git a/data/theme/HighContrast/gnome-flashback.css b/data/theme/HighContrast/gnome-flashback.css
index 76da8a4..9bc60eb 100644
--- a/data/theme/HighContrast/gnome-flashback.css
+++ b/data/theme/HighContrast/gnome-flashback.css
@@ -4,57 +4,21 @@ gf-popup-window {
   background-color: #ffffff;
   color: #000000;
   border: 1px solid rgba(0, 0, 0, 0.23);
-  border-radius: 10px;
 }
 
 gf-popup-window.solid {
   border: 1px solid #8d8d8d;
-  border-radius: 0px;
-}
-
-#gf-candidate-popup {
-  border-radius: 3px;
-}
-
-#gf-candidate-popup.solid {
-  border-radius: 0px;
-}
-
-#gf-candidate-popup gf-candidate-box label {
-  padding: 4px 6px;
-}
-
-#gf-candidate-popup gf-candidate-box label:last-child {
-  padding-left: 0px;
 }
 
 #gf-candidate-popup gf-candidate-box:selected,
 #gf-candidate-popup gf-candidate-box:hover {
   background-color: #000000;
   color: #ffffff;
-  border-radius: 3px;
-}
-
-#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;
-}
-
-#gf-osd-window {
 }
 
 #gf-osd-window levelbar block.overdrive {
@@ -62,21 +26,9 @@ gf-popup-window.solid {
   border-color: #ef2929;
 }
 
-#gf-bubble {
-}
-
-gf-icon {
-  margin: 2px;
-}
-
+gf-icon image,
 gf-icon label {
-  border-radius: 3px;
   color: #ffffff;
-  padding: 2px;
-}
-
-gf-icon:hover image {
-  -gtk-icon-effect: highlight;
 }
 
 gf-icon:selected label {
diff --git a/data/theme/common.css b/data/theme/common.css
index e3dcc36..2193a87 100644
--- a/data/theme/common.css
+++ b/data/theme/common.css
@@ -9,3 +9,59 @@ gf-screensaver-panel image,
 gf-screensaver-panel label {
   color: #cccccc;
 }
+
+gf-popup-window {
+  border-radius: 10px;
+}
+
+gf-popup-window.solid {
+  border-radius: 0px;
+}
+
+#gf-candidate-popup {
+  border-radius: 3px;
+}
+
+#gf-candidate-popup.solid {
+  border-radius: 0px;
+}
+
+#gf-candidate-popup gf-candidate-box label {
+  padding: 4px 6px;
+}
+
+#gf-candidate-popup gf-candidate-box label:last-child {
+  padding-left: 0px;
+}
+
+#gf-candidate-popup gf-candidate-box:selected,
+#gf-candidate-popup gf-candidate-box:hover {
+  border-radius: 3px;
+}
+
+#gf-input-source-popup #gf-input-source {
+  min-width: 120px;
+  min-height: 120px;
+  font-size: 22px;
+}
+
+#gf-input-source-popup #gf-input-source:selected {
+  border-radius: 6px;
+}
+
+#gf-label-window {
+  font-size: 40px;
+}
+
+gf-icon {
+  margin: 2px;
+}
+
+gf-icon label {
+  border-radius: 3px;
+  padding: 2px;
+}
+
+gf-icon:hover image {
+  -gtk-icon-effect: highlight;
+}
diff --git a/data/theme/fallback.css b/data/theme/fallback.css
index d2fbda6..c8c4add 100644
--- a/data/theme/fallback.css
+++ b/data/theme/fallback.css
@@ -1,11 +1,6 @@
-gf-screensaver-panel {
-  font-weight: bold;
-  padding: 4px 10px;
-  background: #000000;
-  color: #cccccc;
-}
+@import url("resource:///org/gnome/gnome-flashback/theme/common.css");
 
-gf-screensaver-panel image,
-gf-screensaver-panel label {
-  color: #cccccc;
+#gf-input-source-popup #gf-input-source:selected {
+  background-color: #cccccc;
+  color: #ffffff;
 }