Some more granite tweaks

lassekongo83 · May 31, 2022 · 211014c · 211014c
1 parent fafa242
commit 211014c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/gtk/src/adw-gtk3/gtk-3.0/_granite.scss b/gtk/src/adw-gtk3/gtk-3.0/_granite.scss
@@ -274,13 +274,15 @@ GraniteWidgetsStaticNotebook .frame {
   background-color: $base_color;
 }
 
+paper,
 .card {
   transition: all 300ms cubic-bezier(0.25, 0.8, 0.25, 1);
   border: none;
-  border-radius: $button_radius;
   background-color: $base_color;  
   box-shadow: $card_shadow;
 
+  &, &.rounded { border-radius: $card_radius; }
+
   &.collapsed {
     background-color: $bg_color;
   }
@@ -329,13 +331,6 @@ GraniteWidgetsStaticNotebook .frame {
   }
 }
 
-// Mode switch
-.mode-switch,
-.mode-switch:checked {
-  background-color: $checkradio_bg_color;
-  background-image: none;
-}
-
 // Avatar
 .avatar {
   border-radius: 999px;
@@ -346,3 +341,10 @@ GraniteWidgetsStaticNotebook .frame {
 .overlay-bar {
   padding: 4px;
 }
+
+// Dynamic notebook
+.dynamic-notebook {
+  tab {
+    &.reorderable-page { padding: 8px; }
+  }
+}
diff --git a/gtk/src/adw-gtk3/gtk-3.0/gtk-dark.css b/gtk/src/adw-gtk3/gtk-3.0/gtk-dark.css
@@ -2846,9 +2846,11 @@ GraniteWidgetsStaticNotebook .frame { border: none; }
 
 .deck { background-color: #1e1e1e; }
 
-.card { transition: all 300ms cubic-bezier(0.25, 0.8, 0.25, 1); border: none; border-radius: 6px; background-color: #1e1e1e; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.03), 0 1px 3px 1px rgba(0, 0, 0, 0.07), 0 2px 6px 2px rgba(0, 0, 0, 0.03); }
+paper, .card { transition: all 300ms cubic-bezier(0.25, 0.8, 0.25, 1); border: none; background-color: #1e1e1e; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.03), 0 1px 3px 1px rgba(0, 0, 0, 0.07), 0 2px 6px 2px rgba(0, 0, 0, 0.03); }
 
-.card.collapsed { background-color: #242424; }
+paper, paper.rounded, .card, .card.rounded { border-radius: 12px; }
+
+paper.collapsed, .card.collapsed { background-color: #242424; }
 
 .source-list { -GtkTreeView-horizontal-separator: 1px; -GtkTreeView-vertical-separator: 6px; background-color: #242424; border: solid #454545; color: white; border-right-width: 1px; }
 
@@ -2862,12 +2864,12 @@ GraniteWidgetsStaticNotebook .frame { border: none; }
 
 .source-list row > GtkLabel, .source-list row > label, .source-list .list-row > GtkLabel, .source-list .list-row > label { padding-left: 6px; padding-right: 6px; }
 
-.mode-switch, .mode-switch:checked { background-color: #3584e4; background-image: none; }
-
 .avatar { border-radius: 999px; box-shadow: none; }
 
 .overlay-bar { padding: 4px; }
 
+.dynamic-notebook tab.reorderable-page { padding: 8px; }
+
 .nautilus-window headerbar .path-bar-box, .nautilus-window .titlebar .path-bar-box { border-radius: 6px; border: none; padding-right: 6px; color: white; outline-color: rgba(255, 255, 255, 0.3); background-color: #454545; }
 
 .nautilus-window headerbar .path-bar-box:backdrop, .nautilus-window .titlebar .path-bar-box:backdrop { color: #7c7c7c; background-color: #2f2f2f; text-shadow: none; -gtk-icon-shadow: none; }

diff --git a/gtk/src/adw-gtk3/gtk-3.0/gtk.css b/gtk/src/adw-gtk3/gtk-3.0/gtk.css
@@ -2826,9 +2826,11 @@ GraniteWidgetsStaticNotebook .frame { border: none; }
 
 .deck { background-color: #ffffff; }
 
-.card { transition: all 300ms cubic-bezier(0.25, 0.8, 0.25, 1); border: none; border-radius: 6px; background-color: #ffffff; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.03), 0 1px 3px 1px rgba(0, 0, 0, 0.07), 0 2px 6px 2px rgba(0, 0, 0, 0.03); }
+paper, .card { transition: all 300ms cubic-bezier(0.25, 0.8, 0.25, 1); border: none; background-color: #ffffff; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.03), 0 1px 3px 1px rgba(0, 0, 0, 0.07), 0 2px 6px 2px rgba(0, 0, 0, 0.03); }
 
-.card.collapsed { background-color: #fafafa; }
+paper, paper.rounded, .card, .card.rounded { border-radius: 12px; }
+
+paper.collapsed, .card.collapsed { background-color: #fafafa; }
 
 .source-list { -GtkTreeView-horizontal-separator: 1px; -GtkTreeView-vertical-separator: 6px; background-color: #fafafa; border: solid #dddddd; color: rgba(0, 0, 0, 0.8); border-right-width: 1px; }
 
@@ -2842,12 +2844,12 @@ GraniteWidgetsStaticNotebook .frame { border: none; }
 
 .source-list row > GtkLabel, .source-list row > label, .source-list .list-row > GtkLabel, .source-list .list-row > label { padding-left: 6px; padding-right: 6px; }
 
-.mode-switch, .mode-switch:checked { background-color: #3584e4; background-image: none; }
-
 .avatar { border-radius: 999px; box-shadow: none; }
 
 .overlay-bar { padding: 4px; }
 
+.dynamic-notebook tab.reorderable-page { padding: 8px; }
+
 .nautilus-window headerbar .path-bar-box, .nautilus-window .titlebar .path-bar-box { border-radius: 6px; border: none; padding-right: 6px; color: rgba(0, 0, 0, 0.8); outline-color: rgba(0, 0, 0, 0.1); background-color: #d6d6d6; }
 
 .nautilus-window headerbar .path-bar-box:backdrop, .nautilus-window .titlebar .path-bar-box:backdrop { color: rgba(173, 173, 173, 0.92); background-color: #f0f0f0; text-shadow: none; -gtk-icon-shadow: none; }