Merge branch 'wip/3.19'

4 files changed, 259 insertions, 9 deletions

diff --git a/common/gnome-shell/3.18/gnome-shell-dark.css b/common/gnome-shell/3.18/gnome-shell-dark.css
index 0abc8c1..6e29ddc 100644
--- a/common/gnome-shell/3.18/gnome-shell-dark.css
+++ b/common/gnome-shell/3.18/gnome-shell-dark.css
@@ -379,6 +379,48 @@ StScrollBar {
   width: 48px;
   height: 48px; }
 
+.audio-device-selection-dialog {
+  spacing: 30px; }
+
+.audio-selection-content {
+  spacing: 20px;
+  padding: 24px; }
+
+.audio-selection-title {
+  font-weight: bold;
+  text-align: center; }
+
+.audio-selection-box {
+  spacing: 20px; }
+
+.audio-selection-device {
+  border: 1px solid #2b2e39;
+  border-radius: 3px; }
+  .audio-selection-device:active, .audio-selection-device:hover, .audio-selection-device:focus {
+    background-color: #5294E2;
+    border-color: #5294E2; }
+
+.audio-selection-device-box {
+  padding: 20px;
+  spacing: 20px; }
+
+.audio-selection-device-icon {
+  icon-size: 64px; }
+
+.geolocation-dialog {
+  spacing: 30px; }
+  .geolocation-dialog-main-layout {
+    spacing: 12px; }
+  .geolocation-dialog-content {
+    spacing: 20px; }
+  .geolocation-dialog-icon {
+    icon-size: 48px; }
+  .geolocation-dialog-title {
+    font-weight: bold; }
+  .geolocation-dialog-reason {
+    color: #D3DAE3;
+    font-weight: bold; }
+
 .network-dialog-secret-table {
   spacing-rows: 15px;
   spacing-columns: 1em; }
@@ -388,7 +430,7 @@ StScrollBar {
   spacing-columns: 1em; }
 
 .popup-menu {
-  min-width: 200px;
+  min-width: 15em;
   color: #D3DAE3;
   border-image: url("dark-assets/menu/menu.svg") 9 9 9 9; }
   .popup-menu .popup-sub-menu {
@@ -644,6 +686,8 @@ StScrollBar {
   #panel .panel-status-indicators-box,
   #panel .panel-status-menu-box {
     spacing: 2px; }
+  #panel .power-status.panel-status-indicators-box {
+    spacing: 0; }
   #panel .screencast-indicator {
     color: #FC4138; }
   #panel .clock-display > * > *:last-child {
@@ -689,7 +733,7 @@ StScrollBar {
     color: transparent; }
 
 .aggregate-menu {
-  width: 280px; }
+  min-width: 21em; }
   .aggregate-menu .popup-menu-icon {
     padding: 0 4px; }
 
@@ -872,8 +916,19 @@ StScrollBar {
   color: rgba(211, 218, 227, 0.3);
   opacity: 1; }
 
+.calendar-week-number {
+  font-size: 70%;
+  font-weight: bold;
+  width: 2.3em;
+  height: 1.8em;
+  border-radius: 2px;
+  padding: 0.5em 0 0;
+  margin: 6px;
+  background-color: rgba(211, 218, 227, 0.3);
+  color: #383C4A; }
+
 .message-list {
-  width: 420px; }
+  width: 31.5em; }
   .message-list-sections {
     spacing: 1.5em; }
   .message-list-section, .message-list-section-list {
@@ -932,6 +987,28 @@ StScrollBar {
     padding: 8px;
     font-size: 1em; }
 
+.message-media-control {
+  padding: 6px;
+  color: rgba(211, 218, 227, 0.45); }
+  .message-media-control:last-child:ltr {
+    padding-right: 18px; }
+  .message-media-control:last-child:rtl {
+    padding-left: 18px; }
+  .message-media-control:hover {
+    color: #D3DAE3; }
+  .message-media-control:active {
+    color: #5294E2; }
+
+.media-message-cover-icon {
+  icon-size: 32px; }
+  .media-message-cover-icon.fallback {
+    color: rgba(211, 218, 227, 0.45);
+    background-color: #383C4A;
+    border-radius: 2px;
+    icon-size: 16px;
+    padding: 8px;
+    border: 1px solid #2b2e39; }
+
 .ripple-box {
   width: 52px;
   height: 52px;
diff --git a/common/gnome-shell/3.18/gnome-shell.css b/common/gnome-shell/3.18/gnome-shell.css
index 4054b2f..80f818c 100644
--- a/common/gnome-shell/3.18/gnome-shell.css
+++ b/common/gnome-shell/3.18/gnome-shell.css
@@ -379,6 +379,48 @@ StScrollBar {
   width: 48px;
   height: 48px; }
 
+.audio-device-selection-dialog {
+  spacing: 30px; }
+
+.audio-selection-content {
+  spacing: 20px;
+  padding: 24px; }
+
+.audio-selection-title {
+  font-weight: bold;
+  text-align: center; }
+
+.audio-selection-box {
+  spacing: 20px; }
+
+.audio-selection-device {
+  border: 1px solid #dcdfe3;
+  border-radius: 3px; }
+  .audio-selection-device:active, .audio-selection-device:hover, .audio-selection-device:focus {
+    background-color: #5294E2;
+    border-color: #5294E2; }
+
+.audio-selection-device-box {
+  padding: 20px;
+  spacing: 20px; }
+
+.audio-selection-device-icon {
+  icon-size: 64px; }
+
+.geolocation-dialog {
+  spacing: 30px; }
+  .geolocation-dialog-main-layout {
+    spacing: 12px; }
+  .geolocation-dialog-content {
+    spacing: 20px; }
+  .geolocation-dialog-icon {
+    icon-size: 48px; }
+  .geolocation-dialog-title {
+    font-weight: bold; }
+  .geolocation-dialog-reason {
+    color: #5c616c;
+    font-weight: bold; }
+
 .network-dialog-secret-table {
   spacing-rows: 15px;
   spacing-columns: 1em; }
@@ -388,7 +430,7 @@ StScrollBar {
   spacing-columns: 1em; }
 
 .popup-menu {
-  min-width: 200px;
+  min-width: 15em;
   color: #5c616c;
   border-image: url("light-assets/menu/menu.svg") 9 9 9 9; }
   .popup-menu .popup-sub-menu {
@@ -644,6 +686,8 @@ StScrollBar {
   #panel .panel-status-indicators-box,
   #panel .panel-status-menu-box {
     spacing: 2px; }
+  #panel .power-status.panel-status-indicators-box {
+    spacing: 0; }
   #panel .screencast-indicator {
     color: #FC4138; }
   #panel .clock-display > * > *:last-child {
@@ -689,7 +733,7 @@ StScrollBar {
     color: transparent; }
 
 .aggregate-menu {
-  width: 280px; }
+  min-width: 21em; }
   .aggregate-menu .popup-menu-icon {
     padding: 0 4px; }
 
@@ -872,8 +916,19 @@ StScrollBar {
   color: rgba(92, 97, 108, 0.3);
   opacity: 1; }
 
+.calendar-week-number {
+  font-size: 70%;
+  font-weight: bold;
+  width: 2.3em;
+  height: 1.8em;
+  border-radius: 2px;
+  padding: 0.5em 0 0;
+  margin: 6px;
+  background-color: rgba(92, 97, 108, 0.3);
+  color: #F5F6F7; }
+
 .message-list {
-  width: 420px; }
+  width: 31.5em; }
   .message-list-sections {
     spacing: 1.5em; }
   .message-list-section, .message-list-section-list {
@@ -932,6 +987,28 @@ StScrollBar {
     padding: 8px;
     font-size: 1em; }
 
+.message-media-control {
+  padding: 6px;
+  color: rgba(92, 97, 108, 0.55); }
+  .message-media-control:last-child:ltr {
+    padding-right: 18px; }
+  .message-media-control:last-child:rtl {
+    padding-left: 18px; }
+  .message-media-control:hover {
+    color: #5c616c; }
+  .message-media-control:active {
+    color: #5294E2; }
+
+.media-message-cover-icon {
+  icon-size: 32px; }
+  .media-message-cover-icon.fallback {
+    color: rgba(92, 97, 108, 0.55);
+    background-color: #F5F6F7;
+    border-radius: 2px;
+    icon-size: 16px;
+    padding: 8px;
+    border: 1px solid #dcdfe3; }
+
 .ripple-box {
   width: 52px;
   height: 52px;
diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss
index 62f3366..6094af9 100644
--- a/common/gnome-shell/3.18/sass/_common.scss
+++ b/common/gnome-shell/3.18/sass/_common.scss
@@ -503,6 +503,61 @@ StScrollBar {
 }
 
 //
+// Audio selection dialog
+//
+.audio-device-selection-dialog { spacing: 30px; }
+
+.audio-selection {
+
+  &-content {
+    spacing: 20px;
+    padding: 24px;
+  }
+
+  &-title {
+    font-weight: bold;
+    text-align: center;
+  }
+
+  &-box { spacing: 20px; }
+
+  &-device {
+    border: 1px solid $borders_color;
+    border-radius: 3px;
+
+    &:active,&:hover,&:focus {
+      background-color: $selected_bg_color;
+      border-color: $selected_bg_color;
+    }
+  }
+
+  &-device-box {
+    padding: 20px;
+    spacing: 20px;
+  }
+
+  &-device-icon { icon-size: 64px; }
+  
+}
+
+//
+// Geolocation Dialog
+//
+.geolocation-dialog {
+  spacing: 30px;
+
+  &-main-layout { spacing: 12px; }
+  &-content { spacing: 20px; }
+  &-icon { icon-size: 48px; }
+  &-title { font-weight: bold; }
+
+  &-reason {
+    color: $fg_color;
+    font-weight: bold;
+  }
+}
+
+//
 // Network Agent Dialog
 //
 .network-dialog-secret-table {
@@ -519,7 +574,7 @@ StScrollBar {
 // Popvers/Menus
 //
 .popup-menu {
-  min-width: 200px;
+  min-width: 15em;
   color: $fg_color;
   border-image: url("#{$asset_path}/menu/menu.svg") 9 9 9 9;
 
@@ -869,6 +924,11 @@ StScrollBar {
     spacing: 2px;
   }
 
+  // spacing between power icon and (optional) percentage label
+  .power-status.panel-status-indicators-box {
+    spacing: 0;
+  }
+
   .screencast-indicator { color: $error_color; }
 
   .clock-display > * > *:last-child {
@@ -927,7 +987,7 @@ StScrollBar {
 }
 
 .aggregate-menu {
-  width: 280px;
+  min-width: 21em;
   .popup-menu-icon { padding: 0 4px; }
 }
 
@@ -1131,11 +1191,22 @@ StScrollBar {
   opacity: 1;
 }
 
+.calendar-week-number {
+  font-size: 70%;
+  font-weight: bold;
+  width: 2.3em; height: 1.8em;
+  border-radius: 2px;
+  padding: 0.5em 0 0;
+  margin: 6px;
+  background-color: transparentize($fg_color,0.7);
+  color: $bg_color;
+}
+
 //
 // Message list
 //
 .message-list {
-  width: 420px;
+  width: 31.5em;
 
   &-sections { spacing: 1.5em; }
 
@@ -1216,6 +1287,30 @@ StScrollBar {
   }
 }
 
+.message-media-control {
+  padding: 6px;
+  color: $insensitive_fg_color;
+
+  &:last-child:ltr { padding-right: 18px; }
+  &:last-child:rtl { padding-left: 18px; }
+
+  &:hover { color: $fg_color; }
+  &:active { color: $selected_bg_color; }
+}
+
+.media-message-cover-icon {
+  icon-size: 32px;
+
+  &.fallback {
+    color: $insensitive_fg_color;
+    background-color: $bg_color;
+    border-radius: 2px;
+    icon-size: 16px;
+    padding: 8px;
+    border: 1px solid $borders_color;
+  }
+}
+
 
 //
 //Activities Ripples
diff --git a/common/gnome-shell/3.20 b/common/gnome-shell/3.20
new file mode 120000
index 0000000..55b698c
--- /dev/null
+++ b/common/gnome-shell/3.20
@@ -0,0 +1 @@
+3.18
\ No newline at end of file