From 81f9104d9f29781a5d0448cc6d88c3e7bb4cf672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Silva?= Date: Fri, 19 Apr 2019 12:08:11 +0100 Subject: [PATCH] Split gtk and web CSS into separate directories Helps clean up the CSS selection on the export dialog, as only Web CSS is useful in that scenario. --- data/media/css/{gtk_base.css => gtk/base.css} | 0 .../media/css/{web_adwaita.css => web/adwaita.css} | 2 +- .../{web_adwaita_dark.css => web/adwaita_dark.css} | 2 +- data/media/css/{web_arc.css => web/arc.css} | 2 +- .../css/{web_arc_dark.css => web/arc_dark.css} | 2 +- data/media/css/web/arc_darker.css | 1 + data/media/css/{web__base.css => web/base.css} | 5 ++--- .../{web_highcontrast.css => web/highcontrast.css} | 2 +- .../highcontrast_inverse.css} | 2 +- data/media/css/web_arc_darker.css | 1 - uberwriter/application.py | 2 +- uberwriter/theme.py | 14 +++++++------- uberwriter/window.py | 2 +- 13 files changed, 18 insertions(+), 19 deletions(-) rename data/media/css/{gtk_base.css => gtk/base.css} (100%) rename data/media/css/{web_adwaita.css => web/adwaita.css} (93%) rename data/media/css/{web_adwaita_dark.css => web/adwaita_dark.css} (93%) rename data/media/css/{web_arc.css => web/arc.css} (93%) rename data/media/css/{web_arc_dark.css => web/arc_dark.css} (93%) create mode 100644 data/media/css/web/arc_darker.css rename data/media/css/{web__base.css => web/base.css} (95%) rename data/media/css/{web_highcontrast.css => web/highcontrast.css} (93%) rename data/media/css/{web_highcontrast_inverse.css => web/highcontrast_inverse.css} (93%) delete mode 100644 data/media/css/web_arc_darker.css diff --git a/data/media/css/gtk_base.css b/data/media/css/gtk/base.css similarity index 100% rename from data/media/css/gtk_base.css rename to data/media/css/gtk/base.css diff --git a/data/media/css/web_adwaita.css b/data/media/css/web/adwaita.css similarity index 93% rename from data/media/css/web_adwaita.css rename to data/media/css/web/adwaita.css index 500aaf6..e784b20 100644 --- a/data/media/css/web_adwaita.css +++ b/data/media/css/web/adwaita.css @@ -1,4 +1,4 @@ -@import url("web__base.css"); +@import url("base.css"); :root { --text-color: #2e3436; diff --git a/data/media/css/web_adwaita_dark.css b/data/media/css/web/adwaita_dark.css similarity index 93% rename from data/media/css/web_adwaita_dark.css rename to data/media/css/web/adwaita_dark.css index 9aa875f..df71e44 100644 --- a/data/media/css/web_adwaita_dark.css +++ b/data/media/css/web/adwaita_dark.css @@ -1,4 +1,4 @@ -@import url("web__base.css"); +@import url("web/web__base.css"); :root { --text-color: #eeeeec; diff --git a/data/media/css/web_arc.css b/data/media/css/web/arc.css similarity index 93% rename from data/media/css/web_arc.css rename to data/media/css/web/arc.css index 7f4c1c1..688fb87 100644 --- a/data/media/css/web_arc.css +++ b/data/media/css/web/arc.css @@ -1,4 +1,4 @@ -@import url("web__base.css"); +@import url("web/web__base.css"); :root { --text-color: #3b3e45; diff --git a/data/media/css/web_arc_dark.css b/data/media/css/web/arc_dark.css similarity index 93% rename from data/media/css/web_arc_dark.css rename to data/media/css/web/arc_dark.css index ad36e2e..aeba9ac 100644 --- a/data/media/css/web_arc_dark.css +++ b/data/media/css/web/arc_dark.css @@ -1,4 +1,4 @@ -@import url("web__base.css"); +@import url("web/web__base.css"); :root { --text-color: #d3dae3; diff --git a/data/media/css/web/arc_darker.css b/data/media/css/web/arc_darker.css new file mode 100644 index 0000000..3eeede8 --- /dev/null +++ b/data/media/css/web/arc_darker.css @@ -0,0 +1 @@ +@import url("web/web_arc.css"); \ No newline at end of file diff --git a/data/media/css/web__base.css b/data/media/css/web/base.css similarity index 95% rename from data/media/css/web__base.css rename to data/media/css/web/base.css index 3dd9ecc..dd54a03 100644 --- a/data/media/css/web__base.css +++ b/data/media/css/web/base.css @@ -1,11 +1,11 @@ @font-face { font-family: fira-sans; - src: url("../fonts/fira-sans-v9-vietnamese_latin_cyrillic-ext_cyrillic_greek-ext_latin-ext_greek-regular.woff2") format("woff2"); + src: url("../../fonts/fira-sans-v9-vietnamese_latin_cyrillic-ext_cyrillic_greek-ext_latin-ext_greek-regular.woff2") format("woff2"); } @font-face { font-family: fira-mono; - src: url("../fonts/fira-mono-v7-latin_cyrillic-ext_cyrillic_greek-ext_latin-ext_greek-regular.woff2") format("woff2"); + src: url("../../fonts/fira-mono-v7-latin_cyrillic-ext_cyrillic_greek-ext_latin-ext_greek-regular.woff2") format("woff2"); } @font-face { @@ -56,7 +56,6 @@ body { background-color: var(--background-color); font-family: "Fira Sans", fira-sans, sans-serif, color-emoji; line-height: 1.5; - text-size-adjust: 100%; word-wrap: break-word; padding: 2em; } diff --git a/data/media/css/web_highcontrast.css b/data/media/css/web/highcontrast.css similarity index 93% rename from data/media/css/web_highcontrast.css rename to data/media/css/web/highcontrast.css index ef01c0d..8e12c4f 100644 --- a/data/media/css/web_highcontrast.css +++ b/data/media/css/web/highcontrast.css @@ -1,4 +1,4 @@ -@import url("web__base.css"); +@import url("web/web__base.css"); a { text-decoration: underline; diff --git a/data/media/css/web_highcontrast_inverse.css b/data/media/css/web/highcontrast_inverse.css similarity index 93% rename from data/media/css/web_highcontrast_inverse.css rename to data/media/css/web/highcontrast_inverse.css index 247f968..e4ed265 100644 --- a/data/media/css/web_highcontrast_inverse.css +++ b/data/media/css/web/highcontrast_inverse.css @@ -1,4 +1,4 @@ -@import url("web__base.css"); +@import url("web/web__base.css"); a { text-decoration: underline; diff --git a/data/media/css/web_arc_darker.css b/data/media/css/web_arc_darker.css deleted file mode 100644 index cc6a95e..0000000 --- a/data/media/css/web_arc_darker.css +++ /dev/null @@ -1 +0,0 @@ -@import url("web_arc.css"); \ No newline at end of file diff --git a/uberwriter/application.py b/uberwriter/application.py index 65ff0c6..4a0f34c 100644 --- a/uberwriter/application.py +++ b/uberwriter/application.py @@ -126,7 +126,7 @@ class Application(Gtk.Application): # Shortcuts - # TODO: be aware that a couple of shortcuts are defined in gtk_base.css + # TODO: be aware that a couple of shortcuts are defined in base.css self.set_accels_for_action("app.focus_mode", ["d"]) self.set_accels_for_action("app.hemingway_mode", ["t"]) diff --git a/uberwriter/theme.py b/uberwriter/theme.py index 3302ec4..db47156 100644 --- a/uberwriter/theme.py +++ b/uberwriter/theme.py @@ -55,13 +55,13 @@ class Theme: defaultThemes = [ # https://gitlab.gnome.org/GNOME/gtk/tree/master/gtk/theme/Adwaita - Theme('Adwaita', get_css_path('web_adwaita.css'), False, 'Adwaita-dark'), - Theme('Adwaita-dark', get_css_path('web_adwaita_dark.css'), True, 'Adwaita'), + Theme('Adwaita', get_css_path('web/adwaita.css'), False, 'Adwaita-dark'), + Theme('Adwaita-dark', get_css_path('web/adwaita_dark.css'), True, 'Adwaita'), # https://github.com/NicoHood/arc-theme/tree/master/common/gtk-3.0/3.20/sass - Theme('Arc', get_css_path('web_arc.css'), False, 'Arc-Dark'), - Theme('Arc-Darker', get_css_path('web_arc_darker.css'), False, 'Arc-Dark'), - Theme('Arc-Dark', get_css_path('web_arc_dark.css'), True, 'Arc'), + Theme('Arc', get_css_path('web/arc.css'), False, 'Arc-Dark'), + Theme('Arc-Darker', get_css_path('web/arc_darker.css'), False, 'Arc-Dark'), + Theme('Arc-Dark', get_css_path('web/arc_dark.css'), True, 'Arc'), # https://gitlab.gnome.org/GNOME/gtk/tree/master/gtk/theme/HighContrast - Theme('HighContrast', get_css_path('web_highcontrast.css'), False, 'HighContrastInverse'), - Theme('HighContrastInverse', get_css_path('web_highcontrast_inverse.css'), True, 'HighContrast') + Theme('HighContrast', get_css_path('web/highcontrast.css'), False, 'HighContrastInverse'), + Theme('HighContrastInverse', get_css_path('web/highcontrast_inverse.css'), True, 'HighContrast') ] diff --git a/uberwriter/window.py b/uberwriter/window.py index bbee472..8274b12 100644 --- a/uberwriter/window.py +++ b/uberwriter/window.py @@ -176,7 +176,7 @@ class Window(Gtk.ApplicationWindow): # Set theme css style_provider = Gtk.CssProvider() - style_provider.load_from_path(helpers.get_css_path("gtk_base.css")) + style_provider.load_from_path(helpers.get_css_path("gtk/base.css")) Gtk.StyleContext.add_provider_for_screen( self.get_screen(), style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)