diff --git a/data/app.css b/data/app.css index dd9a7d7b..0213e5d9 100644 --- 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 index b855c5a8..b641323f 100644 --- a/data/icons/scalable/notebook-config-symbolic.svg +++ b/data/icons/scalable/notebook-config-symbolic.svg @@ -23,20 +23,21 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="31.678384" - inkscape:cx="9.1071565" - inkscape:cy="8.4915948" + inkscape:zoom="22.627417" + inkscape:cx="12.97099" + inkscape:cy="11.402097" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:document-rotation="0" - showgrid="true" + showgrid="false" units="px" inkscape:window-width="2560" inkscape:window-height="1011" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" - inkscape:pagecheckerboard="0"> + inkscape:pagecheckerboard="0" + showguides="true"> @@ -60,29 +61,39 @@ + d="M 2.0996094 0 C 1.4902094 0 1 0.446 1 1 L 1 2 L 1 14 L 1 15 C 1 15.554 1.4902094 16 2.0996094 16 L 3 16 L 6 16 L 8 16 C 6.125 16 6.0073242 14.243164 6 14.023438 L 6 14 L 3 14 L 3 2 L 11 2 L 11 6 L 12 6 L 12 2 L 13 2 L 13 6 L 15 6 L 15 2 C 15 0.90929723 14.090703 0 13 0 L 10.900391 0 L 3 0 L 2.0996094 0 z M 9 15.980469 L 9 16 L 9.0214844 16 C 9.0141097 15.993734 9.007338 15.986777 9 15.980469 z " /> + d="M 3 2 L 3 14 L 6 14 L 6 10 C 6 6.25 9.515625 6.0146484 9.9550781 6 L 11 6 L 11 2 L 3 2 z " /> + y="3" /> + y="5" /> + + + + + style="fill:none;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 14,6 c 0,0 1,0 1,1 V 6 Z" + id="path3084" /> diff --git a/data/ui/main_window.ui b/data/ui/main_window.ui index 283dfc90..94e73a9f 100644 --- a/data/ui/main_window.ui +++ b/data/ui/main_window.ui @@ -164,6 +164,9 @@ + diff --git a/src/Widgets/Note.vala b/src/Widgets/Note.vala index 80743b6d..d39be164 100644 --- 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 );