marko10_000
/
apostrophe
forked from Mirrors/apostrophe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove hard-coding from Gtk-related CSS 

It's unecessary, since Adwaita and most popular themes provide a defined
set of public colors.

For reference, see: https://github.com/GNOME/gtk/blob/master/gtk/theme/Adwaita/_colors-public.scss
github/fork/yochananmarqos/patch-1
Gonçalo Silva 2019-04-19 12:01:43 +01:00
parent dccc645430
commit e87de1424e
18 changed files with 43 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/media/css/gtk_adwaita.css
View File

@ -1,5 +0,0 @@
@define-color foreground_color #2e3436;
@define-color background_color #f6f5f4;
@define-color math_text_color #00364c;
@import url("_gtk_base.css");

5
data/media/css/gtk_adwaita_dark.css
View File

@ -1,5 +0,0 @@
@define-color foreground_color #eeeeec;
@define-color background_color #353535;
@define-color math_text_color #ffc9b3;
@import url("_gtk_base.css");

5
data/media/css/gtk_arc.css
View File

@ -1,5 +0,0 @@
@define-color foreground_color #3b3e45;
@define-color background_color #f5f6f7;
@define-color math_text_color #00364c;
@import url("_gtk_base.css");

5
data/media/css/gtk_arc_dark.css
View File

@ -1,5 +0,0 @@
@define-color foreground_color #d3dae3;
@define-color background_color #383c4a;
@define-color math_text_color #ffc9b3;
@import url("_gtk_base.css");

5
data/media/css/gtk_arc_darker.css
View File

@ -1,5 +0,0 @@
@define-color foreground_color #3b3e45;
@define-color background_color #f5f6f7;
@define-color math_text_color #00364C;
@import url("_gtk_base.css");

54
data/media/css/_gtk_base.css → data/media/css/gtk_base.css
View File

@ -17,12 +17,15 @@
bind "<ctl><shift>z" { "redo" () };
}
@define-color math_text_color mix(@theme_fg_color, #00b5ff, 0.15);
/* Main window and text colors */
.uberwriter-window {
/*border-radius: 7px 7px 3px 3px;*/
background: @background_color;
caret-color: @foreground_color;
background: @theme_base_color;
color: @theme_fg_color;
caret-color: @theme_fg_color;
}
.uberwriter-window .uberwriter-editor {
@ -50,27 +53,25 @@
}
#titlebar-container {
background: @background_color;
background: @theme_base_color;
}
.uberwriter-editor {
border: none;
background-color: transparent;
text-decoration-color: #ff0000;
/*-GtkWidget-cursor-color: shade(#4D9FCE, 0.9);*/
/*-GtkWidget-cursor-aspect-ratio: 0.1;*/
text-decoration-color: @error_color;
-gtk-key-bindings: editor-bindings;
}
.uberwriter-editor text {
background-color: @background_color;
color: @foreground_color;
caret-color: @foreground_color;
background-color: @theme_base_color;
color: @theme_fg_color;
caret-color: @theme_fg_color;
}
.uberwriter-editor:selected {
background-color: #4D9FCE;
color: #FFF;
.uberwriter-editor text selection {
background-color: @theme_selected_bg_color;
color: @theme_selected_fg_color;
}
.uberwriter-editor button {
@ -85,10 +86,9 @@
padding: 0;
}
.stats-counter {
color: alpha(@foreground_color, 0.6);
background-color: @background_color;
color: alpha(@theme_fg_color, 0.6);
background-color: @theme_base_color;
text-shadow: inherit;
box-shadow: initial;
background-clip: initial;
@ -108,8 +108,8 @@
.stats-counter:hover,
.stats-counter:checked {
color: @foreground_color;
background-color: lighter(@background_color);
color: @theme_fg_color;
background-color: mix(@theme_base_color, @theme_bg_color, 0.5);
}
#PreviewMenuItem image {
@ -128,9 +128,9 @@
/*font: serif 10;*/
font-family: serif;
font-size: 10px;
background: @background_color;
background: @theme_bg_color;
border-radius: 4px;
border-color: @background_color;
border-color: @theme_bg_color;
margin: 5px;
padding: 5px;
}
@ -141,7 +141,7 @@
border: 1px solid #333;
background: @ligth_bg;
border-radius: 3px;
border-color: @background_color;
border-color: @theme_bg_color;
} */
#LexikonBubble label {
@ -149,8 +149,8 @@
}
#LexikonBubble {
background-color: @background_color;
border: 5px solid @background_color;
background-color: @theme_bg_color;
border: 5px solid @theme_bg_color;
}
#LexikonBubble .lexikon-heading {
@ -168,15 +168,15 @@
}
.quick-preview-popup {
background-color: @background_color;
background-color: @theme_bg_color;
}
.quick-preview-popup grid {
background-color: @background_color;
color: @foreground_color;
border-color: @background_color;
background-color: @theme_bg_color;
color: @theme_fg_color;
border-color: @theme_bg_color;
}
.quick-preview-popup label {
color: @foreground_color;
color: @theme_fg_color;
}

5
data/media/css/gtk_high_contrast.css
View File

@ -1,5 +0,0 @@
@define-color foreground_color #000000;
@define-color background_color #ffffff;
@define-color math_text_color #000000;
@import url("_gtk_base.css");

5
data/media/css/gtk_high_contrast_inverse.css
View File

@ -1,5 +0,0 @@
@define-color foreground_color #ffffff;
@define-color background_color #000000;
@define-color math_text_color #ffffff;
@import url("_gtk_base.css");

0
data/media/css/_web_base.css → data/media/css/web__base.css
View File

2
data/media/css/web_adwaita.css
View File

@ -1,4 +1,4 @@
@import url("_web_base.css");
@import url("web__base.css");
:root {
--text-color: #2e3436;

2
data/media/css/web_adwaita_dark.css
View File

@ -1,4 +1,4 @@
@import url("_web_base.css");
@import url("web__base.css");
:root {
--text-color: #eeeeec;

2
data/media/css/web_arc.css
View File

@ -1,4 +1,4 @@
@import url("_web_base.css");
@import url("web__base.css");
:root {
--text-color: #3b3e45;

2
data/media/css/web_arc_dark.css
View File

@ -1,4 +1,4 @@
@import url("_web_base.css");
@import url("web__base.css");
:root {
--text-color: #d3dae3;

2
data/media/css/web_high_contrast.css → data/media/css/web_highcontrast.css
View File

@ -1,4 +1,4 @@
@import url("_web_base.css");
@import url("web__base.css");
a {
text-decoration: underline;

2
data/media/css/web_high_contrast_inverse.css → data/media/css/web_highcontrast_inverse.css
View File

@ -1,4 +1,4 @@
@import url("_web_base.css");
@import url("web__base.css");
a {
text-decoration: underline;

2
uberwriter/application.py
View File

@ -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 gtk_base.css
self.set_accels_for_action("app.focus_mode", ["<Ctl>d"])
self.set_accels_for_action("app.hemingway_mode", ["<Ctl>t"])

25
uberwriter/theme.py
View File

@ -14,9 +14,8 @@ class Theme:
previous = None
settings = Settings.new()
def __init__(self, name, gtk_css_path, web_css_path, is_dark, inverse_name):
def __init__(self, name, web_css_path, is_dark, inverse_name):
self.name = name
self.gtk_css_path = gtk_css_path
self.web_css_path = web_css_path
self.is_dark = is_dark
self.inverse_name = inverse_name
@ -49,7 +48,6 @@ class Theme:
def __eq__(self, other):
return isinstance(other, self.__class__) and \
self.name == other.name and \
self.gtk_css_path == other.gtk_css_path and \
self.web_css_path == other.web_css_path and \
self.is_dark == other.is_dark and \
self.inverse_name == other.inverse_name
@ -57,20 +55,13 @@ class Theme:
defaultThemes = [
# https://gitlab.gnome.org/GNOME/gtk/tree/master/gtk/theme/Adwaita
Theme('Adwaita', get_css_path('gtk_adwaita.css'),
get_css_path('web_adwaita.css'), False, 'Adwaita-dark'),
Theme('Adwaita-dark', get_css_path('gtk_adwaita_dark.css'),
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('gtk_arc.css'),
get_css_path('web_arc.css'), False, 'Arc-Dark'),
Theme('Arc-Darker', get_css_path('gtk_arc_darker.css'),
get_css_path('web_arc_darker.css'), False, 'Arc-Dark'),
Theme('Arc-Dark', get_css_path('gtk_arc_dark.css'),
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('gtk_high_contrast.css'),
get_css_path('web_high_contrast.css'), False, 'HighContrastInverse'),
Theme('HighContrastInverse', get_css_path('gtk_high_contrast_inverse.css'),
get_css_path('web_high_contrast_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')
]

2
uberwriter/window.py
View File

@ -176,7 +176,7 @@ class Window(Gtk.ApplicationWindow):
# Set theme css
style_provider = Gtk.CssProvider()
style_provider.load_from_path(theme.gtk_css_path)
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)