From c5bed7e9639d9a6fd509c27230b1c68dda9b7bc9 Mon Sep 17 00:00:00 2001
From: nana-4 <hnmaigo@gmail.com>
Date: Thu, 6 Feb 2020 21:42:13 +0900
Subject: [PATCH] theme: Adjust calendar popover sizing

- Remove bottom blank space on the right column of the calendar popover
  so that the weather card is bottom-aligned with the clear button on
  the left column.
- Remove top blank space on the left column of the calendar popover so
  that the message list is top-aligned with the today button on the
  right column.
- Adjust .message-list-controls sizing to align with other card-styled
  elements.
- Use regular `spacing` instead of margin for some spacing.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/2088
Closes https://gitlab.gnome.org/GNOME/gnome-shell/issues/2120
---
 .../gnome-shell-sass/widgets/_calendar.scss   | 24 +++++++++----------
 .../widgets/_message-list.scss                | 11 ++++-----
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/data/theme/gnome-shell-sass/widgets/_calendar.scss b/data/theme/gnome-shell-sass/widgets/_calendar.scss
index e22e70618..eba91b631 100644
--- a/data/theme/gnome-shell-sass/widgets/_calendar.scss
+++ b/data/theme/gnome-shell-sass/widgets/_calendar.scss
@@ -5,16 +5,13 @@
 // overall menu
 #calendarArea {
   padding:0;
-  margin:0;
 }
 
 // Calendar menu side column
 .datemenu-calendar-column {
-  spacing: 0;
+  spacing: $base_spacing;
   border: 0 solid $bubble_borders_color;
-  padding: $base_padding * 2;
-  padding-bottom: 3em; // account for the notifications clear button
-  padding-top:0;
+  padding: 0 $base_padding * 2;
 
   &:ltr {margin-right: $base_margin * 2; border-left-width: 1px; }
   &:rtl {margin-left: $base_margin * 2; border-right-width: 1px; }
@@ -40,19 +37,16 @@
   // calendar
   .calendar {
     @include notification_bubble;
-    margin-bottom: $base_padding + $base_margin;
     padding: $base_padding;
 
     // more below for sub-elements
   }
 
   .datemenu-displays-section {
-    margin:0;
   }
 
   .datemenu-displays-box {
     spacing: $base_spacing;
-    margin:0;
 
     // world clocks and weather
     .world-clocks-button,
@@ -122,6 +116,7 @@
       @include fontsize($base_font_size - 4);
     }
   }
+
   .calendar-day { //border collapse hack - see calendar.js
     border-width: 0;
   }
@@ -130,8 +125,12 @@
     border-top-width: 1px;
   }
 
-  .calendar-day-left { border-left-width: 1px; }
+  .calendar-day-left {
+    border-left-width: 1px;
+  }
+
   .calendar-work-day {}
+
   .calendar-nonwork-day {
     color: $insensitive_fg_color;
   }
@@ -151,13 +150,14 @@
     &:active,&:selected {
       background-color: $selected_bg_color;
       color: $selected_fg_color;
+
       &:hover,&:focus {
         background-color:lighten($selected_bg_color, 3%);
         color: $selected_fg_color;
       }
     }
-
   }
+
   .calendar-day-with-events {
     color: lighten($fg_color,10%);
     font-weight: bold;
@@ -184,12 +184,13 @@
 
 /* Weather */
 .weather-box {
-  spacing: $base_spacing;
+  spacing: $base_spacing + $base_margin;
   padding:$base_padding;
 
   .weather-header {
     color: desaturate(darken($fg_color,40%), 10%);
     font-weight: bold;
+
     &.location {
       font-weight: normal;
       @include fontsize($base_font_size - 1);
@@ -197,7 +198,6 @@
   }
 
   .weather-grid {
-    margin-top: $base_margin;
     spacing-rows: $base_spacing;
     spacing-columns: $base_spacing * 2;
   }
diff --git a/data/theme/gnome-shell-sass/widgets/_message-list.scss b/data/theme/gnome-shell-sass/widgets/_message-list.scss
index c44ba79ec..bb62d2f54 100644
--- a/data/theme/gnome-shell-sass/widgets/_message-list.scss
+++ b/data/theme/gnome-shell-sass/widgets/_message-list.scss
@@ -11,7 +11,7 @@
 
 .message-list-sections {
   spacing: $base_spacing;
-  margin: $base_margin * 4; // to account for scrollbar
+  margin: 0 $base_margin * 4; // to account for scrollbar
 }
 
 .message-list-section,
@@ -19,14 +19,11 @@
   spacing: $base_spacing;
 }
 
-.message-list-section-list {
-  &:ltr {padding:0;}
-  &:rtl {padding:0;}
-}
-
 // do-not-disturb + clear button
 .message-list-controls {
-  margin: $base_margin $base_margin*2;
+  margin: ($base_margin * 2) ($base_margin * 4) 0;
+  // NOTE: remove the padding if notification_bubble could remove margin for drop shadow
+  padding: $base_margin;
   spacing: $base_spacing;
 }