diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..d821048 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..8b73af7 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..4fbd725 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/uberwriter.iml b/.idea/uberwriter.iml new file mode 100644 index 0000000..d0876a7 --- /dev/null +++ b/.idea/uberwriter.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/data/media/style.css b/data/media/style.css index f5c25fd..90dbbd1 100644 --- a/data/media/style.css +++ b/data/media/style.css @@ -35,29 +35,24 @@ bind "z" { "redo" () }; } -#UberwriterWindow { +.uberwriter_window { gtk-key-bindings: window-bindings; /*border-radius: 7px 7px 3px 3px;*/ - background: @light_editor_bg; - + background-color: @light_editor_bg; } -#UberwriterWindow.small #UberwriterEditor { +#UberwriterWindow.small .uberwriter-editor { font: Inconsolata 12; } -#UberwriterWindow.medium #UberwriterEditor { +#UberwriterWindow.medium .uberwriter-editor { font: Inconsolata 15; } -#UberwriterWindow.large #UberwriterEditor { +#UberwriterWindow.large .uberwriter-editor { font: Inconsolata 17; } -#UberwriterWindow.large #UberwriterEditor *{ - font: initial; -} - #UberwriterWindow GtkAlignment { margin-top: 30px; margin-bottom: 60px; @@ -67,7 +62,7 @@ background: #333; } -#UberwriterWindow.dark_mode #UberwriterEditor { +#UberwriterWindow.dark_mode .uberwriter-editor { color: #CCC; background: @dark_bg; @@ -79,7 +74,7 @@ background-color: transparent; } -#UberwriterEditor { +.uberwriter-editor { border: none; background: @light_editor_bg; /*background: und-color: transparent;*/ @@ -89,29 +84,29 @@ gtk-key-bindings: editor-bindings; } -#UberwriterEditor:selected { +.uberwriter-editor:selected { background-color: #4D9FCE; color: #FFF; } -#UberwriterEditor GtkButton { +.uberwriter-editor GtkButton { margin: 0; padding: 0; /*background: #CCC;*/ } -#UberwriterWindow GtkToolbar { +.uberwriter-editor GtkToolbar { /*background: transparent;*/ border: none; padding: 0; } -#status_bar_box GtkLabel { +.status_bar_box GtkLabel { color: #666; } -#status_bar_box GtkButton { +.status_bar_box GtkButton { /* finding reset */ background-color: initial; text-shadow: inherit; @@ -143,28 +138,28 @@ transition: 500ms ease-in; } -#status_bar_box GtkButton:hover, -#status_bar_box GtkButton:active:hover { +.status_bar_box GtkButton:hover, +.status_bar_box GtkButton:active:hover { transition: 0s ease-in; color: #333; background: #EEE; } -#status_bar_box GtkButton:active { +.status_bar_box GtkButton:active { color: #EEE; background-color: #EEE; background-image: none; box-shadow: 0 0 2px rgba(0,0,0,0.4) } -.dark_mode #status_bar_box GtkButton { +.dark_mode .status_bar_box GtkButton { } -.dark_mode #status_bar_box GtkButton:hover, -.dark_mode #status_bar_box GtkButton:active { +.dark_mode .status_bar_box GtkButton:hover, +.dark_mode .status_bar_box GtkButton:active { background-color: shade(@dark_bg, 0.8); } -#status_bar_box GtkSeparator { +.status_bar_box GtkSeparator { border-color: #999; border-right: none; } @@ -235,4 +230,4 @@ #UberwriterWindow #AutoCorrect GtkImage { padding: 3px 5px; -} \ No newline at end of file +} diff --git a/uberwriter/UberwriterTextEditor.py b/uberwriter/UberwriterTextEditor.py index cf8cde0..723bb4c 100644 --- a/uberwriter/UberwriterTextEditor.py +++ b/uberwriter/UberwriterTextEditor.py @@ -142,6 +142,7 @@ class TextEditor(Gtk.TextView): self.connect('redo', self.redo) self.connect('undo', self.undo) + self.get_style_context().add_class("uberwriter-editor") @property def text(self): diff --git a/uberwriter/UberwriterWindow.py b/uberwriter/UberwriterWindow.py index 56695c8..e7f91ed 100644 --- a/uberwriter/UberwriterWindow.py +++ b/uberwriter/UberwriterWindow.py @@ -982,7 +982,7 @@ class UberwriterWindow(Window): self.status_bar = builder.get_object('status_bar_box') self.statusbar_revealer = builder.get_object('status_bar_revealer') - self.status_bar.set_name('status_bar_box') + self.status_bar.get_style_context().add_class('status_bar_box') self.status_bar_visible = True self.was_motion = True self.buffer_modified_for_status_bar = False @@ -995,6 +995,7 @@ class UberwriterWindow(Window): # Setup light background self.TextEditor = TextEditor() self.TextEditor.set_name('UberwriterEditor') + self.get_style_context().add_class('uberwriter_window') base_leftmargin = 40 # self.TextEditor.set_left_margin(base_leftmargin) @@ -1217,4 +1218,4 @@ class UberwriterWindow(Window): except Exception as e: logger.debug("(First Run?) Error loading settings from home dir. \ Error: %r", e) - return True \ No newline at end of file + return True