From 2efa3a8481537c671787a704ea781993ea17c6ac Mon Sep 17 00:00:00 2001 From: Timur Ismagilov Date: Sun, 20 Jun 2021 03:58:56 +0500 Subject: [PATCH] Tweak HTML+CSS --- static/default.css | 9 ++++----- views/hypha.qtpl | 4 ++-- views/hypha.qtpl.go | 4 ++-- views/mutators.qtpl | 12 ++++++------ views/mutators.qtpl.go | 12 ++++++------ 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/static/default.css b/static/default.css index 95b9df0..8a99cff 100644 --- a/static/default.css +++ b/static/default.css @@ -102,21 +102,20 @@ header { width: 100%; margin-bottom: 1rem; } *, *::before, *::after {box-sizing: border-box;} html { height:100%; padding:0; } -body {height:100%; margin:0; } body, input, kbd { font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif; color: black; } -main > form {margin-bottom:1rem;} textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif;} ::-webkit-file-upload-button, .btn { line-height: normal; display: inline-block; border: 1px #999 solid; border-radius: .25rem; text-decoration: none; padding: .25rem; font-size: 1rem; margin: 0; } .btn_weak { border: 1px #999 dashed; } +.btn_accent { font-weight: bold; } .btn:hover, .btn:active { cursor: pointer; } .edit { min-height: 80vh; } .edit__title { margin-top: 0; } .edit__preview { border: 2px dashed #ddd; } .edit-form { height: calc(100vh - 12rem); } -.edit-form__textarea {width:100%;height:calc(100% - 8rem);} +.edit-form__textarea { width: 100%; height: calc(100% - 8rem); min-height: 4rem; } .edit-form label { font-style: italic; } .edit-form__message { width: 100%; margin: 0.25em 0; } .edit-form__save { font-weight: bold; } @@ -249,6 +248,7 @@ header { background-color: #eee; } .header-links__link { color: black; } .header-links__link:hover { background-color: #ddd; } main { background-color: white; } +.shy-link { color: black; } blockquote { border-left: 2px #999 solid; } .wikilink_new {color:#a55858;} @@ -278,8 +278,7 @@ a:visited, .wikilink_external:visited { color: #ffb86c; } .hypha-tabs__tab a, .hypha-tabs__tab { color: #ddd; background-color: #232323; border: 0; } .layout-card__title, .hypha-tabs__tab_active { background-color: #343434; } - -.transclusion .transclusion__link { color: #ddd; } +.transclusion .transclusion__link, a.shy-link { color: #ddd; } input[type="text"], input[type="password"], ::-webkit-file-upload-button, diff --git a/views/hypha.qtpl b/views/hypha.qtpl index a814216..7dfe867 100644 --- a/views/hypha.qtpl +++ b/views/hypha.qtpl @@ -20,9 +20,9 @@

📝 Write a text

-

Write a note, a diary, an article, a story or anything textual using Mycomarkup. Full history of edits to the document will be saved.

+

Write a note, a diary, an article, a story or anything textual using Mycomarkup. Full history of edits to the document will be saved.

Make sure to follow this wiki's writing conventions if there are any.

- Create + Create
diff --git a/views/hypha.qtpl.go b/views/hypha.qtpl.go index a942fc8..6d882c5 100644 --- a/views/hypha.qtpl.go +++ b/views/hypha.qtpl.go @@ -68,9 +68,9 @@ func streamnonExistentHyphaNotice(qw422016 *qt422016.Writer, h *hyphae.Hypha, u

📝 Write a text

-

Write a note, a diary, an article, a story or anything textual using Mycomarkup. Full history of edits to the document will be saved.

+

Write a note, a diary, an article, a story or anything textual using Mycomarkup. Full history of edits to the document will be saved.

Make sure to follow this wiki's writing conventions if there are any.

- Learn more about mycomarkup

+

Learn more about mycomarkup

Actions

{% for _, el := range []struct{ @@ -81,8 +81,8 @@


- - + + Cancel @@ -104,9 +104,9 @@

- - - Cancel + + + Cancel

Note that the hypha is not saved yet. You can preview the changes ↓

{%s= renderedPage %}
diff --git a/views/mutators.qtpl.go b/views/mutators.qtpl.go index 9108524..3bd9981 100644 --- a/views/mutators.qtpl.go +++ b/views/mutators.qtpl.go @@ -87,7 +87,7 @@ func StreamToolbar(qw422016 *qt422016.Writer, u *user.User) { //line views/mutators.qtpl:40 qw422016.N().S(`
-

Learn more about mycomarkup

+

Learn more about mycomarkup

Actions

`) @@ -208,8 +208,8 @@ func StreamEditHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, text


- - + +

- - + +
Cancel + qw422016.N().S(`" class="btn btn_weak">Cancel

Note that the hypha is not saved yet. You can preview the changes ↓

`)