From 441949b7c8e3351ebb70ed0e13ecbb3a3c223d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Mon, 13 Mar 2017 21:22:19 +0100
Subject: [PATCH] data: Update style

---
 data/gnome-classic.css | 103 ++++++++++++++++++++++++++---------------
 data/gnome-shell-sass  |   2 +-
 2 files changed, 67 insertions(+), 38 deletions(-)

diff --git a/data/gnome-classic.css b/data/gnome-classic.css
index ee4ec52b..994619d8 100644
--- a/data/gnome-classic.css
+++ b/data/gnome-classic.css
@@ -563,6 +563,18 @@ StScrollBar {
     background-color: #eeeeec;
     border-radius: 0.3em; }
 
+/* Pad OSD */
+.pad-osd-window {
+  padding: 32px;
+  background-color: rgba(0, 0, 0, 0.8); }
+  .pad-osd-window .pad-osd-title-box {
+    spacing: 12px; }
+  .pad-osd-window .pad-osd-title-menu-box {
+    spacing: 6px; }
+
+.combo-box-label {
+  width: 15em; }
+
 /* App Switcher */
 .switcher-popup {
   padding: 8px;
@@ -727,9 +739,20 @@ StScrollBar {
 .datemenu-displays-section {
   padding-bottom: 3em; }
 
+.datemenu-displays-box {
+  spacing: 1em; }
+
+.datemenu-calendar-column {
+  border: 0 solid #fafafa; }
+  .datemenu-calendar-column:ltr {
+    border-left-width: 1px; }
+  .datemenu-calendar-column:rtl {
+    border-right-width: 1px; }
+
 .datemenu-today-button,
 .world-clocks-button,
-.message-list-section-title {
+.weather-button,
+.events-section-title {
   border-radius: 4px;
   padding: .4em; }
 
@@ -742,12 +765,15 @@ StScrollBar {
 .datemenu-today-button:hover, .datemenu-today-button:focus,
 .world-clocks-button:hover,
 .world-clocks-button:focus,
-.message-list-section-title:hover,
-.message-list-section-title:focus {
+.weather-button:hover,
+.weather-button:focus,
+.events-section-title:hover,
+.events-section-title:focus {
   background-color: #fafafa; }
 .datemenu-today-button:active,
 .world-clocks-button:active,
-.message-list-section-title:active {
+.weather-button:active,
+.events-section-title:active {
   color: white;
   background-color: #4a90d9; }
 
@@ -755,13 +781,17 @@ StScrollBar {
   font-size: 1.5em; }
 
 .world-clocks-header,
-.message-list-section-title {
+.weather-header,
+.events-section-title {
   color: black;
   font-weight: bold; }
 
 .world-clocks-grid {
   spacing-rows: 0.4em; }
 
+.weather-box {
+  spacing: 0.4em; }
+
 .calendar-month-label {
   color: #222728;
   font-weight: bold;
@@ -846,69 +876,68 @@ StScrollBar {
 .message-list {
   width: 31.5em; }
 
+.message-list-clear-button.button {
+  background-color: transparent;
+  margin: 1.5em 1.5em 0; }
+  .message-list-clear-button.button:hover, .message-list-clear-button.button:focus {
+    background-color: #fafafa; }
+
 .message-list-sections {
-  spacing: 1.5em; }
+  spacing: 1em; }
 
 .message-list-section,
 .message-list-section-list {
-  spacing: 0.7em; }
-
-.message-list-section-title-box {
   spacing: 0.4em; }
 
-.message-list-section-close > StIcon {
-  icon-size: 16px;
-  border-radius: 8px;
-  color: #ededed;
-  background-color: black; }
-
-/* FIXME: how do you do this in sass? */
-.message-list-section-close:hover > StIcon,
-.message-list-section-close:focus > StIcon {
-  background-color: black; }
-
 .message {
-  background-color: #fafafa;
   border-radius: 3px; }
   .message:hover, .message:focus {
-    background-color: white; }
+    background-color: #fafafa; }
 
 .message-icon-bin {
-  padding: 8px 0px 8px 8px; }
+  padding: 10px 3px 10px 10px; }
   .message-icon-bin:rtl {
-    padding: 8px 8px 8px 0px; }
+    padding: 10px 10px 10px 3px; }
 
 .message-icon-bin > StIcon {
-  icon-size: 32px; }
-
-.message-secondary-bin:ltr {
-  padding-left: 8px; }
-.message-secondary-bin:rtl {
-  padding-right: 8px; }
+  color: black;
+  icon-size: 16px;
+  -st-icon-style: symbolic; }
 
 .message-secondary-bin {
-  color: black; }
+  padding: 0 12px; }
+
+.message-secondary-bin > .event-time {
+  color: black;
+  font-size: 0.7em;
+  /* HACK: the label should be baseline-aligned with a 1em label,
+           fake this with some bottom padding */
+  padding-bottom: 0.13em; }
 
 .message-secondary-bin > StIcon {
   icon-size: 16px; }
 
 .message-title {
-  font-weight: bold;
-  font-size: 1.1em; }
+  color: #222728; }
 
 .message-content {
-  padding: 8px;
-  font-size: .9em; }
+  color: black;
+  padding: 10px; }
 
 .message-media-control {
-  padding: 6px; }
+  padding: 12px;
+  color: black; }
   .message-media-control:last-child:ltr {
     padding-right: 18px; }
   .message-media-control:last-child:rtl {
     padding-left: 18px; }
+  .message-media-control:hover {
+    color: #2e3436; }
+  .message-media-control:insensitive {
+    color: black; }
 
 .media-message-cover-icon {
-  icon-size: 32px; }
+  icon-size: 48px !important; }
   .media-message-cover-icon.fallback {
     color: white;
     background-color: #ededed;
diff --git a/data/gnome-shell-sass b/data/gnome-shell-sass
index b2190083..e94bce1f 160000
--- a/data/gnome-shell-sass
+++ b/data/gnome-shell-sass
@@ -1 +1 @@
-Subproject commit b2190083c256564258fce97645ae6da72e9d0f7f
+Subproject commit e94bce1fcfbcbe00f6a6375e992192c9e1a4ffb5