are0h
/
Fipamo
1
2
Fork 0
Code Issues 19 Pull Requests 1 Packages Projects 1 Releases 22 Wiki Activity

Fixed white space issue, page edit style tweaks

Browse Source 
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.
pull/84/head
Are0h 3 years ago
parent b2c7dae322
commit d9c9f7744e
5 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File

26
brain/views/dash/page-edit.twig
Unescape Escape View File

@ -1,8 +1,8 @@
{% extends "dash/_frame.twig" %} {% extends "dash/_frame.twig" %}
{# {#
if page is in 'edit' mode, set variables if page is in 'edit' mode, set variables
if not, just make them empty if not, just make them empty
#} #}
{% if mode == 'edit' %} {% if mode == 'edit' %}
{% set id = page['id'] %} {% set id = page['id'] %}
{% set uuid = page['uuid'] %} {% set uuid = page['uuid'] %}
@ -36,7 +36,7 @@
{% endblock %} {% endblock %}
{% block stylesheets %} {% block stylesheets %}
<link rel="stylesheet" type="text/css" href="/assets/css/dash.css?=dfettb"> <link rel="stylesheet" type="text/css" href="/assets/css/dash.css?=dfehuim">
{% endblock %} {% endblock %}
{% block mainContent %} {% block mainContent %}
@ -118,9 +118,7 @@
<div id="post-header-wrapper" class="columns"> <div id="post-header-wrapper" class="columns">
<div id="post-edit-title" class="column"> <div id="post-edit-title" class="column">
<label>TITLE</label> <label>TITLE</label>
<textarea id="post-title-text" type="text" name="post-title-text" class="post-edit" placeholder="TITLE"> <textarea id="post-title-text" type="text" name="post-title-text" class="post-edit" placeholder="TITLE">{{ title }}</textarea>
{{- title -}}
</textarea>
<div id="layouts"> <div id="layouts">
<label>LAYOUTS</label> <label>LAYOUTS</label>
@ -142,9 +140,7 @@
</div> </div>
<div id="post-meta" class="column"> <div id="post-meta" class="column">
<label>TAGS</label> <label>TAGS</label>
<textarea id="post-tags" type="text" name="post-tags" class="form-control" placeholder="tags [comma seperated]"> <textarea id="post-tags" type="text" name="post-tags" class="form-control" placeholder="tags [comma seperated]">{{ tags }}</textarea>
{{- tags -}}
</textarea>
<label>OPTIONS</label> <label>OPTIONS</label>
{% apply spaceless %} {% apply spaceless %}
{{ include("dash/partials/options.twig") }} {{ include("dash/partials/options.twig") }}
@ -165,10 +161,10 @@
<div id="edit-post-wrapper"> <div id="edit-post-wrapper">
<textarea id="edit" spellcheck="false">{{ content }}</textarea> <textarea id="edit" spellcheck="false">{{ content }}</textarea>
<pre id="highlight"> <pre id="highlight">
<code id="highlight-content" class="language-md"> <code id="highlight-content" class="language-md">
</code> </code>
</pre> </pre>
</div> </div>
</div> </div>
</div> </div>
@ -176,5 +172,5 @@
{% endblock %} {% endblock %}
{% block javascripts %} {% block javascripts %}
<script src="/assets/scripts/Start.js?=dfdfvd" type="text/javascript"></script> <script src="/assets/scripts/Start.js?=tyuo" type="text/javascript"></script>
{% endblock %} {% endblock %}

24
brain/views/dash/partials/editor.twig
Unescape Escape View File

@ -4,7 +4,7 @@
<button id="edit-strikethrough" class="content-editor-btn-text editor-button" title="strikethrough">D</button> <button id="edit-strikethrough" class="content-editor-btn-text editor-button" title="strikethrough">D</button>
<button id="edit-link" class="content-editor-btn-icon editor-button" title="insert link"> <button id="edit-link" class="content-editor-btn-icon editor-button" title="insert link">
<svg id="edit-link" viewbox="0 0 20 20" class="icons"> <svg id="edit-link" viewbox="0 0 20 20" class="icons">
<use id="edit-link" xlink:href="/assets/images/global/sprite.svg#entypo-link"/> <use id="edit-link" xlink:href="/assets/images/global/sprite.svg#entypo-link"/>
</svg> </svg>
</button> </button>
<button id="edit-header1" class="content-editor-btn-text editor-button" title="header 1">H1</button> <button id="edit-header1" class="content-editor-btn-text editor-button" title="header 1">H1</button>
@ -12,34 +12,34 @@
<button id="edit-header3" class="content-editor-btn-text editor-button" title="header 3">H3</button> <button id="edit-header3" class="content-editor-btn-text editor-button" title="header 3">H3</button>
<button id="edit-image" class="content-editor-btn-icon editor-button" title="insert image"> <button id="edit-image" class="content-editor-btn-icon editor-button" title="insert image">
<svg id="edit-image" viewbox="0 0 20 20" class="icons"> <svg id="edit-image" viewbox="0 0 20 20" class="icons">
<use id="edit-image" xlink:href="/assets/images/global/sprite.svg#entypo-image"/> <use id="edit-image" xlink:href="/assets/images/global/sprite.svg#entypo-image"/>
</svg> </svg>
</button> </button>
{% if mode == "edit" %} {% if mode == "edit" %}
<button id="edit-update" class="post-sumbit-btn submit-start editor-button" data-action='blog-update' data-id=page.id type='submit' title="bold"> <button id="edit-update" class="post-sumbit-btn submit-start editor-button" data-action='blog-update' data-id="{{ page['uuid'] }} type='submit' title=" bold">
<svg id="submit-update" viewbox="0 0 20 20" class="icons"> <svg id="submit-update" viewbox="0 0 20 20" class="icons">
<use id="submit-update" xlink:href="/assets/images/global/sprite.svg#entypo-save" data-action='blog-update' data-id="{{ page['uuid'] }}"/> <use id="submit-update" xlink:href="/assets/images/global/sprite.svg#entypo-save" data-action='blog-update' data-id="{{ page['uuid'] }}"/>
</svg> </svg>
<svg id="submit-good" class="icon-hide" viewbox="0 0 20 20" class="icons"> <svg id="submit-good" class="icon-hide" viewbox="0 0 20 20" class="icons">
<use xlink:href="/assets/images/global/sprite.svg#entypo-thumbs-up"/> <use xlink:href="/assets/images/global/sprite.svg#entypo-thumbs-up"/>
</svg> </svg>
<svg id="submit-error" class="icon-hide" viewbox="0 0 20 20" class="icons"> <svg id="submit-error" class="icon-hide" viewbox="0 0 20 20" class="icons">
<use xlink:href="/assets/images/global/sprite.svg#entypo-thumbs-down"/> <use xlink:href="/assets/images/global/sprite.svg#entypo-thumbs-down"/>
</svg> </svg>
</button> </button>
<button id="edit-delete" class="content-editor-btn-icon editor-button submit-delete" for="post-delete" title='delete post'> <button id="edit-delete" class="content-editor-btn-icon editor-button submit-delete" for="post-delete" title='delete post'>
<svg id="edit-delete" viewbox="0 0 20 20" class="icons"> <svg id="edit-delete" viewbox="0 0 20 20" class="icons">
<use id="edit-delete" xlink:href="/assets/images/global/sprite.svg#entypo-cross"/> <use id="edit-delete" xlink:href="/assets/images/global/sprite.svg#entypo-cross"/>
</svg> </svg>
</button> </button>
{% else %} {% else %}
<button id="edit-save" class="post-sumbit-btn submit-start editor-button" data-action='blog-add' type='submit'> <button id="edit-save" class="post-sumbit-btn submit-start editor-button" data-action='blog-add' type='submit'>
<svg id="submit-save" viewbox="0 0 20 20" class="icons"> <svg id="submit-save" viewbox="0 0 20 20" class="icons">
<use id="submit-save" xlink:href="/assets/images/global/sprite.svg#entypo-plus"/> <use id="submit-save" xlink:href="/assets/images/global/sprite.svg#entypo-plus"/>
</svg> </svg>
</button> </button>
{% endif %} {% endif %}
</div> </div>

7
public/assets/css/dash.css
Unescape Escape View File

@ -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] { #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; 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; fill: #1d3040;
} }
#post-edit-index #post-edit-index-wrapper #post-header #post-header-wrapper #post-meta #page-files-upload, #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; vertical-align: top;
text-align: center; text-align: center;
} }
#edit-control button svg.icons {
fill: #1d3040;
}
#edit-control button:nth-child(1) { #edit-control button:nth-child(1) {
border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px;
} }
@ -3972,7 +3975,7 @@ select {
background: #efebe3; background: #efebe3;
} }
#edit-control .submit-start svg { #edit-control .submit-start svg {
fill: #32cd32; fill: #32cd32 !important;
} }
#edit-control .submit-cool { #edit-control .submit-cool {
background: #32cd32; background: #32cd32;

6
src/styles/main/_editor.scss
Unescape Escape View File

@ -17,6 +17,10 @@
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
text-align: center; text-align: center;
svg.icons {
fill: $primary;
}
} }
button:nth-child(1) { button:nth-child(1) {
@ -47,7 +51,7 @@
background: $white; background: $white;
svg { svg {
fill: $event-cool; fill: $event-cool !important;
} }
} }

2
src/styles/main/_posts.scss
Unescape Escape View File

@ -333,7 +333,7 @@
button.post-option-btn[data-active='true'] { button.post-option-btn[data-active='true'] {
background: $tertiary; background: $tertiary;
svg.svg-toggle { svg.icons {
fill: $primary; fill: $primary;
} }
} }

Write Preview
Loading…
Cancel
Save