* - small stuff

lainsce · Aug 17, 2021 · 648199c · 648199c
1 parent 78e38b1
commit 648199c
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 37 deletions.
diff --git a/data/app.css b/data/app.css
@@ -2,8 +2,24 @@
 @define-color accent_bg_color @yellow_4;
 @define-color accent_fg_color alpha(black, .75);
 
+.flat-button {
+ background: none;
+ margin: 0;
+ font-weight: 400;
+}
+
+.flat-button:hover,
+.flat-button:checked {
+ background: alpha(@theme_fg_color, 0.1);
+}
+
+.flat-button:active,
+.flat-button:checked:active {
+ background: alpha(@theme_fg_color, 0.2);
+}
+
 .rename-button .toggle {
- border-radius: 0px;
+ border-radius: 5px;
  background: none;
 }
 
@@ -85,6 +101,10 @@
  transition: 100ms ease-in-out;
 }
 
+.notejot-sbar:backdrop {
+ opacity: 0.66;
+}
+
 .empty-state {
  background-color: @theme_bg_color;
 }

diff --git a/data/icons/scalable/notebook-config-symbolic.svg b/data/icons/scalable/notebook-config-symbolic.svg
diff --git a/data/ui/main_window.ui b/data/ui/main_window.ui
@@ -164,6 +164,9 @@
  </style>
  </object>
  </child>
+ <style>
+ <class name="notejot-sbar"/>
+ </style>
  </object>
  </child>
  </object>

diff --git a/src/Widgets/Note.vala b/src/Widgets/Note.vala
@@ -89,22 +89,10 @@ namespace Notejot {
  win.titlebar.get_style_context ().remove_class (@"notejot-action-dark-$uid");
  }
 
- if (Notejot.Application.gsettings.get_boolean("dark-mode")) {
- textfield.get_style_context ().add_class ("notejot-tview-dark-%d".printf(uid));
- } else {
- textfield.get_style_context ().remove_class ("notejot-tview-dark-%d".printf(uid));
- }
-
  Notejot.Application.gsettings.changed.connect (() => {
  if (!Notejot.Application.gsettings.get_boolean("dark-mode")) {
  win.titlebar.get_style_context ().remove_class (@"notejot-action-dark-$uid");
  }
-
- if (Notejot.Application.gsettings.get_boolean("dark-mode")) {
- textfield.get_style_context ().add_class ("notejot-tview-dark-%d".printf(uid));
- } else {
- textfield.get_style_context ().remove_class ("notejot-tview-dark-%d".printf(uid));
- }
  });
  }
 
@@ -147,15 +135,12 @@ namespace Notejot {
  background: mix(@theme_base_color, %s, 0.1);
  }
  .notejot-action-%d:backdrop {
- background: mix(%s, @theme_base_color, 0.9);
  opacity: 0.66;
  }
  .notejot-stack-%d:backdrop {
- background: mix(%s, @theme_base_color, 0.9);
  opacity: 0.66;
  }
  .notejot-stack-%d:backdrop .notejot-bar {
- background: mix(%s, @theme_base_color, 0.9);
  opacity: 0.66;
  }
  .notejot-stack-%d box {
@@ -164,9 +149,6 @@ namespace Notejot {
  .notejot-tview-%d text {
  background: mix(@theme_base_color, %s, 0.1);
  }
- .notejot-tview-dark-%d text {
- background: shade(mix(@theme_base_color, %s, 0.1), 0.75);
- }
  """.printf( uid,
  color,
  uid,
@@ -176,14 +158,9 @@ namespace Notejot {
  uid,
  color,
  uid,
- color,
- uid,
- color,
  uid,
- color,
  uid,
  uid,
- color,
  uid,
  color
  );