Merge branch 'wip/3.19'

README.md

@@ -19,7 +19,7 @@ Arc is a flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell w
 
 ### Requirements
 
-* Gnome/GTK 3.14, 3.16 or 3.18
+* Gnome/GTK 3.14, 3.16, 3.18 or 3.20
 * The `gnome-themes-standard` package
 * The murrine engine. This has different names depending on your distro.
   * `gtk-engine-murrine` (Arch Linux)
@@ -109,7 +109,7 @@ Other options to pass to autogen.sh are
     --disable-xfwm             disable XFWM support
     --disable-xfce-notify      disable XFCE Notify support
 
-    --with-gnome=<version>     build the theme for a specific Gnome version (3.14, 3.16, 3.18)
+    --with-gnome=<version>     build the theme for a specific Gnome version (3.14, 3.16, 3.18, 3.20)
                                Note: Normally the correct version is detected automatically and this
                                option should not be needed.
 

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;

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;

common/gnome-shell/3.18/sass/_common.scss

@@ -502,6 +502,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
 //
@@ -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

common/gnome-shell/3.20

@@ -0,0 +1 @@
+3.18

common/gtk-3.0/3.14/sass/_drawing.scss

@@ -1,18 +1,5 @@
 // Drawing mixins
 
-// generic drawing of more complex things
-
-@mixin _shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) {
-//
-// Helper function to stack up to 4 box-shadows;
-//
-
-  @if $shadow4!=none { box-shadow: $shadow1, $shadow2, $shadow3, $shadow4; }
-  @else if $shadow3!=none { box-shadow: $shadow1, $shadow2, $shadow3; }
-  @else if $shadow2!=none { box-shadow: $shadow1, $shadow2; }
-  @else { box-shadow: $shadow1; }
-}
-
 // Entries
 
 @mixin entry($t) {

common/gtk-3.0/3.16/sass/_drawing.scss

@@ -1,18 +1,5 @@
 // Drawing mixins
 
-// generic drawing of more complex things
-
-@mixin _shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) {
-//
-// Helper function to stack up to 4 box-shadows;
-//
-
-  @if $shadow4!=none { box-shadow: $shadow1, $shadow2, $shadow3, $shadow4; }
-  @else if $shadow3!=none { box-shadow: $shadow1, $shadow2, $shadow3; }
-  @else if $shadow2!=none { box-shadow: $shadow1, $shadow2; }
-  @else { box-shadow: $shadow1; }
-}
-
 // Entries
 
 @mixin entry($t) {

common/gtk-3.0/3.18/sass/_drawing.scss

@@ -1,18 +1,5 @@
 // Drawing mixins
 
-// generic drawing of more complex things
-
-@mixin _shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) {
-//
-// Helper function to stack up to 4 box-shadows;
-//
-
-  @if $shadow4!=none { box-shadow: $shadow1, $shadow2, $shadow3, $shadow4; }
-  @else if $shadow3!=none { box-shadow: $shadow1, $shadow2, $shadow3; }
-  @else if $shadow2!=none { box-shadow: $shadow1, $shadow2; }
-  @else { box-shadow: $shadow1; }
-}
-
 // Entries
 
 @mixin entry($t) {

common/gtk-3.0/3.20/.nvmrc

@@ -0,0 +1 @@
+stable

common/gtk-3.0/3.20/README.md

@@ -0,0 +1,27 @@
+This theme uses libsass/gulp to process the sass/*.scss. Never edit any of the .css files manually.
+
+#### Editing the theme
+
+* Install `nvm` (https://github.com/creationix/nvm)
+
+* Run `nvm i` from the directory containing `.nvmrc`
+
+* Run `npm i` from the directory containing `gulpfile.js`. It's the same directory as the one that contains `.nvmrc` in this case.
+
+* Install `gulp` with `npm i -g gulp`
+
+* Edit the sass/*.scss files
+
+* Regenerate the .css files by executing `gulp` from the directory that contains `gulpfile.js`
+
+--
+
+#### Editing the images in the `assets` folder
+
+* Open the `assets.svg` file in inkscape. Each object in the .svg file corresponds to an image in the `assets` folder.
+
+* Find the object you want to edit and make your changes. Important: Don't change the obejct id.
+
+* Save `assets.svg` and delete the images corresponding to the edited .svg objects from the `assets` folder (or just delete everything in the `assets` folder).
+
+* Run `./render-assets.sh` from a terminal.

common/gtk-3.0/3.20/assets.txt

@@ -0,0 +1,84 @@
+checkbox-checked
+checkbox-checked-insensitive
+checkbox-unchecked
+checkbox-unchecked-insensitive
+checkbox-mixed
+checkbox-mixed-insensitive
+radio-checked
+radio-checked-insensitive
+radio-unchecked
+radio-unchecked-insensitive
+radio-mixed
+radio-mixed-insensitive
+checkbox-checked-selected
+checkbox-checked-insensitive-selected
+checkbox-unchecked-selected
+checkbox-unchecked-insensitive-selected
+checkbox-mixed-selected
+checkbox-mixed-insensitive-selected
+checkbox-checked-selectionmode
+checkbox-selectionmode
+radio-checked-selected
+radio-checked-insensitive-selected
+radio-unchecked-selected
+radio-unchecked-insensitive-selected
+radio-mixed-selected
+radio-mixed-insensitive-selected
+switch
+switch-active
+switch-insensitive
+switch-active-insensitive
+switch-header
+switch-active-header
+switch-insensitive-header
+switch-active-insensitive-header
+switch-selected
+switch-active-selected
+switch-insensitive-selected
+switch-active-insensitive-selected
+titlebutton-close
+titlebutton-close-backdrop
+titlebutton-close-hover
+titlebutton-close-active
+titlebutton-maximize
+titlebutton-maximize-backdrop
+titlebutton-maximize-hover
+titlebutton-maximize-active
+titlebutton-minimize
+titlebutton-minimize-backdrop
+titlebutton-minimize-hover
+titlebutton-minimize-active
+checkbox-checked-dark
+checkbox-checked-insensitive-dark
+checkbox-unchecked-dark
+checkbox-unchecked-insensitive-dark
+checkbox-mixed-dark
+checkbox-mixed-insensitive-dark
+checkbox-checked-selectionmode-dark
+checkbox-selectionmode-dark
+radio-checked-dark
+radio-checked-insensitive-dark
+radio-unchecked-dark
+radio-unchecked-insensitive-dark
+radio-mixed-dark
+radio-mixed-insensitive-dark
+switch-dark
+switch-active-dark
+switch-insensitive-dark
+switch-active-insensitive-dark
+switch-header-dark
+switch-active-header-dark
+switch-insensitive-header-dark
+switch-active-insensitive-header-dark
+titlebutton-close-dark
+titlebutton-close-backdrop-dark
+titlebutton-close-hover-dark
+titlebutton-close-active-dark
+titlebutton-maximize-dark
+titlebutton-maximize-backdrop-dark
+titlebutton-maximize-hover-dark
+titlebutton-maximize-active-dark
+titlebutton-minimize-dark
+titlebutton-minimize-backdrop-dark
+titlebutton-minimize-hover-dark
+titlebutton-minimize-active-dark