From 59b3defdafff14f1c464d63a977905524415c3b4 Mon Sep 17 00:00:00 2001
From: Alexander Mikhaylenko <alexm@gnome.org>
Date: Wed, 27 Oct 2021 13:42:04 +0500
Subject: [PATCH] style: Use .card from libadwaita

---
 data/de.haeckerfelix.Shortwave.gresource.xml |  2 --
 data/gtk/station_dialog.ui                   | 13 ++++++-----
 data/gtk/station_row.ui                      |  2 ++
 data/gtk/style-dark.css                      |  1 -
 data/gtk/style-hc.css                        |  1 -
 data/gtk/style.css                           | 24 +-------------------
 6 files changed, 10 insertions(+), 33 deletions(-)
 delete mode 100644 data/gtk/style-dark.css
 delete mode 100644 data/gtk/style-hc.css

diff --git a/data/de.haeckerfelix.Shortwave.gresource.xml b/data/de.haeckerfelix.Shortwave.gresource.xml
index 059423ec..25d5c648 100644
--- a/data/de.haeckerfelix.Shortwave.gresource.xml
+++ b/data/de.haeckerfelix.Shortwave.gresource.xml
@@ -23,8 +23,6 @@
       <file compressed="true" preprocess="xml-stripblanks">gtk/help_overlay.ui</file>
 
       <file compressed="true" alias="style.css">gtk/style.css</file>
-      <file compressed="true" alias="style-dark.css">gtk/style-dark.css</file>
-      <file compressed="true" alias="style-hc.css">gtk/style-hc.css</file>
 
       <file compressed="true">images/wood.png</file>
       <file compressed="true">images/metal.png</file>
diff --git a/data/gtk/station_dialog.ui b/data/gtk/station_dialog.ui
index bad6c0c4..466b4dc7 100644
--- a/data/gtk/station_dialog.ui
+++ b/data/gtk/station_dialog.ui
@@ -222,13 +222,14 @@
                         <property name="orientation">vertical</property>
                         <property name="visible">False</property>
                         <child>
-                          <object class="ShumateMap" id="map">
-                            <property name="sensitive">False</property>
-                            <property name="height_request">300</property>
+                          <object class="GtkFrame">
                             <property name="halign">center</property>
-                            <style>
-                              <class name="station-dialog-map"/>
-                            </style>
+                            <property name="child">
+                              <object class="ShumateMap" id="map">
+                                <property name="sensitive">False</property>
+                                <property name="height_request">300</property>
+                              </object>
+                            </property>
                           </object>
                         </child>
                         <child>
diff --git a/data/gtk/station_row.ui b/data/gtk/station_row.ui
index cad0cfaa..7db0579e 100644
--- a/data/gtk/station_row.ui
+++ b/data/gtk/station_row.ui
@@ -59,6 +59,8 @@
     </child>
     <style>
       <class name="tile"/>
+      <class name="card"/>
+      <class name="activatable"/>
     </style>
   </template>
 </interface>
diff --git a/data/gtk/style-dark.css b/data/gtk/style-dark.css
deleted file mode 100644
index 9fe79549..00000000
--- a/data/gtk/style-dark.css
+++ /dev/null
@@ -1 +0,0 @@
-@define-color station_card_bg_color alpha(white, .055);
diff --git a/data/gtk/style-hc.css b/data/gtk/style-hc.css
deleted file mode 100644
index 9ee7acb1..00000000
--- a/data/gtk/style-hc.css
+++ /dev/null
@@ -1 +0,0 @@
-@define-color station_card_border_color @borders;
diff --git a/data/gtk/style.css b/data/gtk/style.css
index deabd44d..517bb4df 100644
--- a/data/gtk/style.css
+++ b/data/gtk/style.css
@@ -1,7 +1,3 @@
-@define-color station_card_bg_color #ffffff;
-@define-color station_card_fg_color @theme_fg_color;
-@define-color station_card_border_color alpha(currentColor, .18);
-
 .transparent {
   background-color: transparent;
 }
@@ -17,19 +13,6 @@ scrolledwindow.flat-headerbar scrollbar.vertical:not(.overlay-indicator) {
 .tile {
   padding: 0px;
   border-radius: 12px;
-  border: 1px solid @station_card_border_color;
-  color: @station_card_fg_color;
-  background-color: @station_card_bg_color;
-  background-clip: padding-box;
-  transition: background 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-}
-
-.tile:hover {
-  background-image: image(alpha(currentColor, .03));
-}
-
-.tile:active   {
-  background-image: image(alpha(currentColor, .08));
 }
 
 .favicon-big {
@@ -131,11 +114,6 @@ scrolledwindow.flat-headerbar scrollbar.vertical:not(.overlay-indicator) {
   box-shadow: inset 0 -1px transparent;
 }
 
-.station-dialog-map{
-  border-radius: 12px;
-  border: 1px solid @station_card_border_color;
-}
-
-.map-pin{
+.map-pin {
   color: black;
 }
-- 
GitLab