update

vinceliuice · Aug 8, 2021 · 0a959cf · 0a959cf
1 parent 4d6079a
commit 0a959cf
Show file tree

Hide file tree

Showing 8 changed files with 220 additions and 11 deletions.
diff --git a/src/_sass/_colors.scss b/src/_sass/_colors.scss
@@ -55,8 +55,10 @@
 }
 
 @function titlebar($state: 'normal') {
-  @if ($variant == 'light' and $topbar == 'light' and $state=='normal') { @return #F7F7F7; }
-  @if ($variant == 'light' and $topbar == 'light' and $state=='backdrop') { @return #F2F2F2; }
+  @if ($variant == 'light' and $topbar == 'light' and $state=='normal' and $blur == 'false') { @return #F7F7F7; }
+  @if ($variant == 'light' and $topbar == 'light' and $state=='backdrop' and $blur == 'false') { @return #F2F2F2; }
+  @if ($variant == 'light' and $topbar == 'light' and $state=='normal' and $blur == 'true') { @return #FFFFFF; }
+  @if ($variant == 'light' and $topbar == 'light' and $state=='backdrop' and $blur == 'true') { @return #FCFCFC; }
   @if ($variant == 'light' and $topbar == 'dark' and $state=='normal') { @return #2C2C2C; }
   @if ($variant == 'light' and $topbar == 'dark' and $state=='backdrop') { @return #3c3c3c; }
   @if ($variant == 'dark' and $state=='normal') { @return #202020; }
@@ -89,7 +91,7 @@ $panel-solid:                           if($topbar == 'light', #F7F7F7, #1F1F1F)
 $blur_opacity:                          if($variant == 'light', 0.85, 0.5);
 
 @if $blur == 'true' {
-  $background:                          if($variant == 'light', rgba(#F2F2F2, $blur_opacity), rgba(#333333, $blur_opacity));
+  $background:                          if($variant == 'light', rgba(#FFFFFF, $blur_opacity), rgba(#333333, $blur_opacity));
   $surface:                             if($variant == 'light', rgba(#FFFFFF, $blur_opacity), rgba(#3C3C3C, $blur_opacity));
   $base:                                if($variant == 'light', rgba(#FFFFFF, $blur_opacity), rgba(#2B2B2B, $blur_opacity)); // semi-surface with 1dp elevation
   $base-alt:                            if($variant == 'light', rgba(#FAFAFA, $blur_opacity), rgba(#303030, $blur_opacity));

diff --git a/src/_sass/gtk/apps/_gnome-3.22.scss b/src/_sass/gtk/apps/_gnome-3.22.scss
@@ -1670,12 +1670,17 @@ preferencesgroup, .geary-accounts-editor-pane {
 
 .geary-main-window {
   > deck > overlay > .geary-main-layout {
-    background-color: $base;
+    background-color: transparent;
+
+    @if $blur == 'true' {
+      > leaflet > headerbar,
+      > leaflet > leaflet > headerbar { background-color: rgba($titlebar, $blur_opacity/3); }
+    }
 
     > leaflet > separator.sidebar, // centry
     > leaflet > leaflet > separator.sidebar { // left
       // border-right: none;
-      background-color: $titlebar;
+      background-color: if($blur == 'true', rgba($titlebar, $blur_opacity/3), $titlebar);
       box-shadow: inset 0 -1px $divider;
       transition: background-color $duration $ease-out,
                   color $duration $ease-out,
@@ -1688,13 +1693,47 @@ preferencesgroup, .geary-accounts-editor-pane {
       background-color: $divider;
     }
 
+    .geary-folder-frame {
+      treeview.sidebar.view:not(:hover):not(:selected) {
+        background-color: transparent;
+        background-image: none;
+      }
+    }
+
     > leaflet > leaflet > box.vertical > .geary-conversation-frame {
       > scrolledwindow {
         margin: -1px 0; // hide .view top border
         // > treeview.view {}
       }
     }
   }
+
+  geary-conversation-viewer#conversation_viewer { // right side
+    list.background.conversation-listbox.content {
+      > row.activatable {
+        border: 1px solid $divider;
+        border-bottom-width: 0;
+        background-color: $base;
+
+        &:first-child {
+          border-top-left-radius: 8px;
+          border-top-right-radius: 8px;
+        }
+      }
+
+      .geary-attachment-pane {
+        border-radius: 0 0 8px 8px;
+
+        actionbar.background {
+          background-color: transparent;
+
+          > revealer > box {
+            border-radius: 0 0 6px 6px;
+          }
+        }
+      }
+    }
+  }
 }
 
 /**************

diff --git a/src/gtk/3.0/gtk-compact.css b/src/gtk/3.0/gtk-compact.css
@@ -5790,7 +5790,7 @@ window#GearyMainWindow.background.csd stack#conversation_viewer .geary-composer-
 }
 
 .geary-main-window > deck > overlay > .geary-main-layout {
-  background-color: #FFFFFF;
+  background-color: transparent;
 }
 
 .geary-main-window > deck > overlay > .geary-main-layout > leaflet > separator.sidebar,
@@ -5809,10 +5809,38 @@ window#GearyMainWindow.background.csd stack#conversation_viewer .geary-composer-
   background-color: rgba(0, 0, 0, 0.12);
 }
 
+.geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected), .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame filechooser stack.view scrolledwindow treeview.sidebar.view:not(:hover):not(:selected), filechooser stack.view scrolledwindow .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected), .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.sidebar.view:not(:hover):not(:selected):not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected):not(.progressbar):not(.trough) {
+  background-color: transparent;
+  background-image: none;
+}
+
 .geary-main-window > deck > overlay > .geary-main-layout > leaflet > leaflet > box.vertical > .geary-conversation-frame > scrolledwindow {
   margin: -1px 0;
 }
 
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content > row.activatable {
+  border: 1px solid rgba(0, 0, 0, 0.12);
+  border-bottom-width: 0;
+  background-color: #FFFFFF;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content > row.activatable:first-child {
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane {
+  border-radius: 0 0 8px 8px;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane actionbar.background {
+  background-color: transparent;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane actionbar.background > revealer > box {
+  border-radius: 0 0 6px 6px;
+}
+
 /**************
  * Extensions *
  **************/

diff --git a/src/gtk/3.0/gtk-dark-compact.css b/src/gtk/3.0/gtk-dark-compact.css
@@ -5790,7 +5790,7 @@ window#GearyMainWindow.background.csd stack#conversation_viewer .geary-composer-
 }
 
 .geary-main-window > deck > overlay > .geary-main-layout {
-  background-color: #2B2B2B;
+  background-color: transparent;
 }
 
 .geary-main-window > deck > overlay > .geary-main-layout > leaflet > separator.sidebar,
@@ -5809,10 +5809,38 @@ window#GearyMainWindow.background.csd stack#conversation_viewer .geary-composer-
   background-color: rgba(255, 255, 255, 0.12);
 }
 
+.geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected), .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame filechooser stack.view scrolledwindow treeview.sidebar.view:not(:hover):not(:selected), filechooser stack.view scrolledwindow .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected), .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.sidebar.view:not(:hover):not(:selected):not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected):not(.progressbar):not(.trough) {
+  background-color: transparent;
+  background-image: none;
+}
+
 .geary-main-window > deck > overlay > .geary-main-layout > leaflet > leaflet > box.vertical > .geary-conversation-frame > scrolledwindow {
   margin: -1px 0;
 }
 
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content > row.activatable {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  border-bottom-width: 0;
+  background-color: #2B2B2B;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content > row.activatable:first-child {
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane {
+  border-radius: 0 0 8px 8px;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane actionbar.background {
+  background-color: transparent;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane actionbar.background > revealer > box {
+  border-radius: 0 0 6px 6px;
+}
+
 /**************
  * Extensions *
  **************/

diff --git a/src/gtk/3.0/gtk-dark.css b/src/gtk/3.0/gtk-dark.css
@@ -5790,7 +5790,7 @@ window#GearyMainWindow.background.csd stack#conversation_viewer .geary-composer-
 }
 
 .geary-main-window > deck > overlay > .geary-main-layout {
-  background-color: #2B2B2B;
+  background-color: transparent;
 }
 
 .geary-main-window > deck > overlay > .geary-main-layout > leaflet > separator.sidebar,
@@ -5809,10 +5809,38 @@ window#GearyMainWindow.background.csd stack#conversation_viewer .geary-composer-
   background-color: rgba(255, 255, 255, 0.12);
 }
 
+.geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected), .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame filechooser stack.view scrolledwindow treeview.sidebar.view:not(:hover):not(:selected), filechooser stack.view scrolledwindow .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected), .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.sidebar.view:not(:hover):not(:selected):not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected):not(.progressbar):not(.trough) {
+  background-color: transparent;
+  background-image: none;
+}
+
 .geary-main-window > deck > overlay > .geary-main-layout > leaflet > leaflet > box.vertical > .geary-conversation-frame > scrolledwindow {
   margin: -1px 0;
 }
 
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content > row.activatable {
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  border-bottom-width: 0;
+  background-color: #2B2B2B;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content > row.activatable:first-child {
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane {
+  border-radius: 0 0 8px 8px;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane actionbar.background {
+  background-color: transparent;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane actionbar.background > revealer > box {
+  border-radius: 0 0 6px 6px;
+}
+
 /**************
  * Extensions *
  **************/

diff --git a/src/gtk/3.0/gtk-light-compact.css b/src/gtk/3.0/gtk-light-compact.css
@@ -5790,7 +5790,7 @@ window#GearyMainWindow.background.csd stack#conversation_viewer .geary-composer-
 }
 
 .geary-main-window > deck > overlay > .geary-main-layout {
-  background-color: #FFFFFF;
+  background-color: transparent;
 }
 
 .geary-main-window > deck > overlay > .geary-main-layout > leaflet > separator.sidebar,
@@ -5809,10 +5809,38 @@ window#GearyMainWindow.background.csd stack#conversation_viewer .geary-composer-
   background-color: rgba(0, 0, 0, 0.12);
 }
 
+.geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected), .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame filechooser stack.view scrolledwindow treeview.sidebar.view:not(:hover):not(:selected), filechooser stack.view scrolledwindow .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected), .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.sidebar.view:not(:hover):not(:selected):not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected):not(.progressbar):not(.trough) {
+  background-color: transparent;
+  background-image: none;
+}
+
 .geary-main-window > deck > overlay > .geary-main-layout > leaflet > leaflet > box.vertical > .geary-conversation-frame > scrolledwindow {
   margin: -1px 0;
 }
 
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content > row.activatable {
+  border: 1px solid rgba(0, 0, 0, 0.12);
+  border-bottom-width: 0;
+  background-color: #FFFFFF;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content > row.activatable:first-child {
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane {
+  border-radius: 0 0 8px 8px;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane actionbar.background {
+  background-color: transparent;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane actionbar.background > revealer > box {
+  border-radius: 0 0 6px 6px;
+}
+
 /**************
  * Extensions *
  **************/

diff --git a/src/gtk/3.0/gtk-light.css b/src/gtk/3.0/gtk-light.css
@@ -5790,7 +5790,7 @@ window#GearyMainWindow.background.csd stack#conversation_viewer .geary-composer-
 }
 
 .geary-main-window > deck > overlay > .geary-main-layout {
-  background-color: #FFFFFF;
+  background-color: transparent;
 }
 
 .geary-main-window > deck > overlay > .geary-main-layout > leaflet > separator.sidebar,
@@ -5809,10 +5809,38 @@ window#GearyMainWindow.background.csd stack#conversation_viewer .geary-composer-
   background-color: rgba(0, 0, 0, 0.12);
 }
 
+.geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected), .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame filechooser stack.view scrolledwindow treeview.sidebar.view:not(:hover):not(:selected), filechooser stack.view scrolledwindow .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected), .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.sidebar.view:not(:hover):not(:selected):not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected):not(.progressbar):not(.trough) {
+  background-color: transparent;
+  background-image: none;
+}
+
 .geary-main-window > deck > overlay > .geary-main-layout > leaflet > leaflet > box.vertical > .geary-conversation-frame > scrolledwindow {
   margin: -1px 0;
 }
 
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content > row.activatable {
+  border: 1px solid rgba(0, 0, 0, 0.12);
+  border-bottom-width: 0;
+  background-color: #FFFFFF;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content > row.activatable:first-child {
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane {
+  border-radius: 0 0 8px 8px;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane actionbar.background {
+  background-color: transparent;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane actionbar.background > revealer > box {
+  border-radius: 0 0 6px 6px;
+}
+
 /**************
  * Extensions *
  **************/

diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css
@@ -5790,7 +5790,7 @@ window#GearyMainWindow.background.csd stack#conversation_viewer .geary-composer-
 }
 
 .geary-main-window > deck > overlay > .geary-main-layout {
-  background-color: #FFFFFF;
+  background-color: transparent;
 }
 
 .geary-main-window > deck > overlay > .geary-main-layout > leaflet > separator.sidebar,
@@ -5809,10 +5809,38 @@ window#GearyMainWindow.background.csd stack#conversation_viewer .geary-composer-
   background-color: rgba(0, 0, 0, 0.12);
 }
 
+.geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected), .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame filechooser stack.view scrolledwindow treeview.sidebar.view:not(:hover):not(:selected), filechooser stack.view scrolledwindow .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected), .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.sidebar.view:not(:hover):not(:selected):not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow .geary-main-window > deck > overlay > .geary-main-layout .geary-folder-frame treeview.sidebar.view:not(:hover):not(:selected):not(.progressbar):not(.trough) {
+  background-color: transparent;
+  background-image: none;
+}
+
 .geary-main-window > deck > overlay > .geary-main-layout > leaflet > leaflet > box.vertical > .geary-conversation-frame > scrolledwindow {
   margin: -1px 0;
 }
 
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content > row.activatable {
+  border: 1px solid rgba(0, 0, 0, 0.12);
+  border-bottom-width: 0;
+  background-color: #FFFFFF;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content > row.activatable:first-child {
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane {
+  border-radius: 0 0 8px 8px;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane actionbar.background {
+  background-color: transparent;
+}
+
+.geary-main-window geary-conversation-viewer#conversation_viewer list.background.conversation-listbox.content .geary-attachment-pane actionbar.background > revealer > box {
+  border-radius: 0 0 6px 6px;
+}
+
 /**************
  * Extensions *
  **************/