From d9c9f7744e51fc73764ffb347d58d47e1143bab8 Mon Sep 17 00:00:00 2001 From: Are0h Date: Wed, 11 May 2022 17:41:56 -0700 Subject: [PATCH] Fixed white space issue, page edit style tweaks There was a white space issue that made text displayed title and tags text appear missaligned. It turned out to be a small layout problem that was cleaned up by getting rid of white space in the textarea element itself. Also got in there and fixed some lingering css issues that was causing the svg icon colors to be off in some of the butttons. --- brain/views/dash/page-edit.twig | 26 +++++++++++--------------- brain/views/dash/partials/editor.twig | 24 ++++++++++++------------ public/assets/css/dash.css | 7 +++++-- src/styles/main/_editor.scss | 6 +++++- src/styles/main/_posts.scss | 2 +- 5 files changed, 34 insertions(+), 31 deletions(-) diff --git a/brain/views/dash/page-edit.twig b/brain/views/dash/page-edit.twig index b6e11f7..8027e66 100644 --- a/brain/views/dash/page-edit.twig +++ b/brain/views/dash/page-edit.twig @@ -1,8 +1,8 @@ {% extends "dash/_frame.twig" %} {# - if page is in 'edit' mode, set variables - if not, just make them empty -#} + if page is in 'edit' mode, set variables + if not, just make them empty + #} {% if mode == 'edit' %} {% set id = page['id'] %} {% set uuid = page['uuid'] %} @@ -36,7 +36,7 @@ {% endblock %} {% block stylesheets %} - + {% endblock %} {% block mainContent %} @@ -118,9 +118,7 @@
- +
@@ -142,9 +140,7 @@
- + {% apply spaceless %} {{ include("dash/partials/options.twig") }} @@ -165,10 +161,10 @@ 
-                
-                  
-                
-
+ + + +
@@ -176,5 +172,5 @@ {% endblock %} {% block javascripts %} - + {% endblock %} diff --git a/brain/views/dash/partials/editor.twig b/brain/views/dash/partials/editor.twig index 00c4b5c..0b3455d 100644 --- a/brain/views/dash/partials/editor.twig +++ b/brain/views/dash/partials/editor.twig @@ -4,7 +4,7 @@ @@ -12,34 +12,34 @@ {% if mode == "edit" %} - {% else %} {% endif %} - - - -
\ No newline at end of file + + + + diff --git a/public/assets/css/dash.css b/public/assets/css/dash.css index 7809304..9241abc 100644 --- a/public/assets/css/dash.css +++ b/public/assets/css/dash.css @@ -3359,7 +3359,7 @@ select { #post-edit-index #post-edit-index-wrapper #post-header #post-header-wrapper #post-meta #post-options button.post-option-btn[data-active=true] { background: #f5ab35; } -#post-edit-index #post-edit-index-wrapper #post-header #post-header-wrapper #post-meta #post-options button.post-option-btn[data-active=true] svg.svg-toggle { +#post-edit-index #post-edit-index-wrapper #post-header #post-header-wrapper #post-meta #post-options button.post-option-btn[data-active=true] svg.icons { fill: #1d3040; } #post-edit-index #post-edit-index-wrapper #post-header #post-header-wrapper #post-meta #page-files-upload, @@ -3949,6 +3949,9 @@ select { vertical-align: top; text-align: center; } +#edit-control button svg.icons { + fill: #1d3040; +} #edit-control button:nth-child(1) { border-radius: 3px 0 0 3px; } @@ -3972,7 +3975,7 @@ select { background: #efebe3; } #edit-control .submit-start svg { - fill: #32cd32; + fill: #32cd32 !important; } #edit-control .submit-cool { background: #32cd32; diff --git a/src/styles/main/_editor.scss b/src/styles/main/_editor.scss index cc2aff9..9ac5342 100644 --- a/src/styles/main/_editor.scss +++ b/src/styles/main/_editor.scss @@ -17,6 +17,10 @@ display: inline-block; vertical-align: top; text-align: center; + + svg.icons { + fill: $primary; + } } button:nth-child(1) { @@ -47,7 +51,7 @@ background: $white; svg { - fill: $event-cool; + fill: $event-cool !important; } } diff --git a/src/styles/main/_posts.scss b/src/styles/main/_posts.scss index b663d6e..92666e0 100644 --- a/src/styles/main/_posts.scss +++ b/src/styles/main/_posts.scss @@ -333,7 +333,7 @@ button.post-option-btn[data-active='true'] { background: $tertiary; - svg.svg-toggle { + svg.icons { fill: $primary; } }