cleanup

lainsce · Jan 30, 2023 · 294d618 · 294d618
1 parent 1c554dc
commit 294d618
Show file tree

Hide file tree

Showing 26 changed files with 283 additions and 659 deletions.
diff --git a/build-aux/flatpak/io.github.lainsce.Quilter.json b/build-aux/flatpak/io.github.lainsce.Quilter.json
@@ -1,5 +1,5 @@
 {
-    "app-id" : "io.github.lainsce.QuilterDevel",
+    "id" : "io.github.lainsce.QuilterDevel",
     "runtime" : "org.gnome.Sdk",
     "runtime-version" : "43",
     "sdk" : "org.gnome.Sdk",

diff --git a/build-aux/post_install.py b/build-aux/post_install.py
diff --git a/data/app.gresource.xml b/data/app.gresource.xml
@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
     <gresource prefix="/io/github/lainsce/Quilter">
-      <!-- CSS file -->
-      <file alias="style.css" compressed="true">styles/style.css</file>
-
-      <!-- Custom Icon files -->
-      <file alias="sidebar-symbolic.svg">icons/symbolic/sidebar-symbolic.svg</file>
-      <file alias="outline-symbolic.svg">icons/symbolic/outline-symbolic.svg</file>
-      <file alias="back-symbolic.svg">icons/symbolic/back-symbolic.svg</file>
-      <file alias="paragraph-focus-symbolic.svg">icons/symbolic/paragraph-focus-symbolic.svg</file>
-      <file alias="sentence-focus-symbolic.svg">icons/symbolic/sentence-focus-symbolic.svg</file>
-      <file alias="full-width-symbolic.svg">icons/symbolic/full-width-symbolic.svg</file>
-      <file alias="half-width-symbolic.svg">icons/symbolic/half-width-symbolic.svg</file>
-      <file alias="edit-find-replace-all-symbolic.svg">icons/symbolic/edit-find-replace-all-symbolic.svg</file>
-      <file alias="markdown-symbolic.svg">icons/symbolic/markdown-symbolic.svg</file>
-
-      <!-- UI files -->
+      <file alias="style.css">style.css</file>
+      <file alias="style-dark.css">style-dark.css</file>
+      <file alias="style-hc.css">style-hc.css</file>
       <file alias="viewmenu.ui">ui/viewmenu.ui</file>
       <file alias="header_button.ui">ui/header_button.ui</file>
       <file alias="shortcuts.ui">ui/shortcuts.ui</file>
@@ -27,4 +15,15 @@
       <file alias="statusbar.ui">ui/statusbar.ui</file>
       <file alias="prefs_window.ui">ui/prefs_window.ui</file>
     </gresource>
+    <gresource prefix="/io/github/lainsce/Quilter/icons">
+      <file alias="scalable/actions/sidebar-symbolic.svg">icons/symbolic/sidebar-symbolic.svg</file>
+      <file alias="scalable/actions/outline-symbolic.svg">icons/symbolic/outline-symbolic.svg</file>
+      <file alias="scalable/actions/back-symbolic.svg">icons/symbolic/back-symbolic.svg</file>
+      <file alias="scalable/actions/paragraph-focus-symbolic.svg">icons/symbolic/paragraph-focus-symbolic.svg</file>
+      <file alias="scalable/actions/sentence-focus-symbolic.svg">icons/symbolic/sentence-focus-symbolic.svg</file>
+      <file alias="scalable/actions/full-width-symbolic.svg">icons/symbolic/full-width-symbolic.svg</file>
+      <file alias="scalable/actions/half-width-symbolic.svg">icons/symbolic/half-width-symbolic.svg</file>
+      <file alias="scalable/actions/edit-find-replace-all-symbolic.svg">icons/symbolic/edit-find-replace-all-symbolic.svg</file>
+      <file alias="scalable/actions/markdown-symbolic.svg">icons/symbolic/markdown-symbolic.svg</file>
+    </gresource>
 </gresources>
diff --git a/data/meson.build b/data/meson.build
@@ -59,17 +59,17 @@ i18n.merge_file(
 
 install_data(
     join_paths('schemes', meson.project_name() + '.xml'),
-    install_dir: join_paths(get_option('datadir'), 'gtksourceview-4', 'styles')
+    install_dir: join_paths(get_option('datadir'), 'gtksourceview-5', 'styles')
 )
 
 install_data(
     join_paths('schemes', meson.project_name() + '-sepia.xml'),
-    install_dir: join_paths(get_option('datadir'), 'gtksourceview-4', 'styles')
+    install_dir: join_paths(get_option('datadir'), 'gtksourceview-5', 'styles')
 )
 
 install_data(
     join_paths('schemes', meson.project_name() + '-dark.xml'),
-    install_dir: join_paths(get_option('datadir'), 'gtksourceview-4', 'styles')
+    install_dir: join_paths(get_option('datadir'), 'gtksourceview-5', 'styles')
 )
 
 install_data(

diff --git a/data/plugin/highlight.js/lib/highlight.min.js b/data/plugin/highlight.js/lib/highlight.min.js
diff --git a/data/style-dark.css b/data/style-dark.css
@@ -0,0 +1 @@
+/* Dummy */
diff --git a/data/style-hc.css b/data/style-hc.css
@@ -0,0 +1 @@
+/* Dummy */
diff --git a/data/styles/style.css → data/style.css b/data/styles/style.css → data/style.css
@@ -1,22 +1,19 @@
 .mono-font {
     font-family: 'Quilt Mono';
-    font-weight: 500;
+    font-weight: 400;
     font-size: 1.2rem;
-    letter-spacing: 0.2em;
 }
 
 .vier-font {
     font-family: 'Quilt Vier';
-    font-weight: 500;
+    font-weight: 400;
     font-size: 1.2rem;
-    letter-spacing: 0.2em;
 }
 
 .zwei-font {
     font-family: 'Quilt Zwei';
-    font-weight: 500;
+    font-weight: 400;
     font-size: 1.2rem;
-    letter-spacing: 0.2em;
 }
 
 .small-text *,
@@ -29,18 +26,21 @@
     letter-spacing: 0em;
 }
 
-.circular {
-    -gtk-outline-radius: 9999px;
+.circular radio {
+    background: none;
+    padding: 12px;
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 999px;
+    border-color: alpha(@window_fg_color, 0.3);
 }
 
-.circular radio,
-.circular radio:checked {
-    padding: 10px;
-    -gtk-icon-shadow: none;
+.circular radio:hover {
+    border-color: alpha(@window_fg_color, 0.6);
 }
 
-.circular radio:focus {
-    border-color: @theme_selected_bg_color;
+.circular radio:checked {
+    border-color: alpha(@window_fg_color, 0.3);
 }
 
 .color-dark radio {
@@ -59,16 +59,16 @@
 }
 
 .quilter-focus-button {
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
     min-width: 24px;
     min-height: 24px;
     padding: 10px;
-    border-radius: 8px;
-    border: 1px solid alpha (black, 0.25);
+    border-radius: 999px;
+    border: 1px solid alpha(black, 0.25);
 }
 
 .edit-view-paned {
-    border-right: 1px solid alpha (black, 0.25);
+    border-right: 1px solid alpha(black, 0.25);
 }
 
 .preview-row {
@@ -81,14 +81,14 @@
 .preview-row:active,
 .preview-row:hover,
 .preview-row:selected {
-    background: shade(@theme_bg_color, 1.2);
-    color: @theme_fg_color;
+    background: shade(@view_bg_color, 1.2);
+    color: @view_fg_color;
     border: 1px solid alpha(black, 0.25);
 }
 .preview-row:active:hover,
 .preview-row:selected:hover {
-    background: shade(@theme_bg_color, 1.1);
-    color: @theme_fg_color;
+    background: shade(@view_bg_color, 1.1);
+    color: @view_fg_color;
     border: 1px solid alpha(black, 0.25);
 }
 
@@ -120,7 +120,7 @@
 }
 
 .quilter-sidebar-box {
-    color: @theme_fg_color;
+    color: @view_fg_color;
     box-shadow: none;
 }
 
@@ -131,16 +131,16 @@
 }
 
 .quilter-sidebar-box button {
-    color: @theme_fg_color;
+    color: @view_fg_color;
     box-shadow: none;
     border: none;
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
 }
 .quilter-sidebar-box button:focus {
     background: alpha(black, 0.2);
 }
 .quilter-sidebar-box button:hover {
-    background: alpha(@theme_fg_color, 0.15);
+    background: alpha(@view_fg_color, 0.15);
 }
 
 .quilter-sidebar-box:focus,
@@ -158,12 +158,8 @@
 }
 
 .quilter-searchbar {
-    background: @theme_base_color;
-    box-shadow: 0 0 0 1px alpha(black, .15),
-              0 0 3px alpha(black, .2);
-    border: none;
+    background: @view_bg_color;
     padding: 6px;
-    border-radius: 0 0 5px 5px;
     margin: 12px;
     margin-top: 0px;
 }
@@ -183,6 +179,10 @@
     padding: 6px;
 }
 
+.quilter-sidebar row {
+    background: none;
+}
+
 .quilter-sidebar-sepia {
     background: shade(#f0e8dd, 0.95);
 }
@@ -206,5 +206,9 @@
 }
 
 .quilter-titlebar-sepia {
-    background: linear-gradient(to top, shade(#f0e8dd, 0.8), shade(#f0e8dd, 1.1));
+    background: shade(#f0e8dd, 0.90);
 }
+
+.flat-button {
+    font-weight: 500;
+}