From cbced1ce284e72fb6ae8785ba166b7ff4bca7202 Mon Sep 17 00:00:00 2001
From: nana-4 <hnmaigo@gmail.com>
Date: Wed, 5 Feb 2020 01:08:20 +0900
Subject: [PATCH] theme: Reorder selectors in .message

The order was messed up when the recent Sass reorganization.
This reorders the selectors in .message to make sense again.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/957
---
 .../widgets/_message-list.scss                | 58 +++++++++----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/data/theme/gnome-shell-sass/widgets/_message-list.scss b/data/theme/gnome-shell-sass/widgets/_message-list.scss
index 9893b6897..936fc133c 100644
--- a/data/theme/gnome-shell-sass/widgets/_message-list.scss
+++ b/data/theme/gnome-shell-sass/widgets/_message-list.scss
@@ -34,36 +34,6 @@
 .message {
   @include notification_bubble;
 
-  // title
-  .message-title {
-    color: $fg_color;
-    font-weight: bold;
-    margin-bottom:4px;
-  }
-
-  // content
-  .message-content {
-    color: darken($fg_color, 10%);
-    padding: $base_padding 0;
-    margin:$base_margin * 2;
-    &:ltr {
-      margin-left: $base_margin;
-      padding-right:$base_padding;
-    }
-    &:rtl {
-      margin-right: $base_margin;
-      padding-left:$base_padding;
-    }
-  }
-
-  // close button
-  .message-close-button {
-    color: lighten($fg_color, 15%);
-    &:hover { color: if($variant=='light', lighten($fg_color, 30%), darken($fg_color, 10%)); }
-    &:active { color: if($variant=='light', lighten($fg_color, 40%), darken($fg_color, 20%)); }
-  }
-
-
   // icon container
   .message-icon-bin {
     padding: $base_padding;
@@ -90,6 +60,28 @@
     }
   }
 
+  // content
+  .message-content {
+    color: darken($fg_color, 10%);
+    padding: $base_padding 0;
+    margin:$base_margin * 2;
+    &:ltr {
+      margin-left: $base_margin;
+      padding-right:$base_padding;
+    }
+    &:rtl {
+      margin-right: $base_margin;
+      padding-left:$base_padding;
+    }
+  }
+
+  // title
+  .message-title {
+    color: $fg_color;
+    font-weight: bold;
+    margin-bottom:4px;
+  }
+
   // secondary container in title box
   .message-secondary-bin {
     padding: 0;
@@ -105,6 +97,12 @@
     }
   }
 
+  // close button
+  .message-close-button {
+    color: lighten($fg_color, 15%);
+    &:hover { color: if($variant=='light', lighten($fg_color, 30%), darken($fg_color, 10%)); }
+    &:active { color: if($variant=='light', lighten($fg_color, 40%), darken($fg_color, 20%)); }
+  }
 }
 
 /* Media Controls */