From e5e9720654ae778083053cc0d44c74253a5977aa Mon Sep 17 00:00:00 2001 From: Timur Ismagilov Date: Wed, 16 Jun 2021 02:46:25 +0500 Subject: [PATCH] Make editor buttons dark in the dark theme --- static/default.css | 12 +++++++----- views/mutators.qtpl | 12 ++++++------ views/mutators.qtpl.go | 12 ++++++------ 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/static/default.css b/static/default.css index b4bf91c..95b9df0 100644 --- a/static/default.css +++ b/static/default.css @@ -80,7 +80,7 @@ header { width: 100%; margin-bottom: 1rem; } } @media screen and (min-width: 1150px) { - .edit-toolbar__buttons { grid-template-columns: 1fr 1fr; } + .edit-toolbar__buttons { grid-template-columns: 1fr 1fr; grid-column-gap: .125rem; } } @media screen and (min-width: 1250px) { @@ -107,6 +107,11 @@ body, input, kbd { font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sa 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:hover, .btn:active { cursor: pointer; } + .edit { min-height: 80vh; } .edit__title { margin-top: 0; } .edit__preview { border: 2px dashed #ddd; } @@ -116,6 +121,7 @@ textarea {font-size:16px; font-family: 'PT Sans', 'Liberation Sans', sans-serif; .edit-form__message { width: 100%; margin: 0.25em 0; } .edit-form__save { font-weight: bold; } .edit-toolbar__buttons, .edit-toolbar__ad { margin: .5rem; } +.edit-toolbar__btn { font-size: .75rem; margin-bottom: .125rem; } .icon {margin-right: .25rem; vertical-align: bottom; } @@ -204,10 +210,6 @@ caption { caption-side: top; font-size: small; } .relative-hyphae__entry_this { padding: .25rem .5rem; font-weight: bold; } .relative-hyphae__link { text-decoration: none; display: block; padding: .25rem .5rem; } -::-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; } - /* Color stuff */ /* Lighter stuff #eee */ ::-webkit-file-upload-button, .btn { background-color: #eee; color: black; } diff --git a/views/mutators.qtpl b/views/mutators.qtpl index 1281b04..5fc8bf7 100644 --- a/views/mutators.qtpl +++ b/views/mutators.qtpl @@ -33,7 +33,7 @@ {"numberedlist", "insertNumberedList()", "*. number list"}, } %} @@ -51,14 +51,14 @@ {"time", "insertTimeUTC()", "Insert current time"}, } %} {% endfor %} {% if u.Group != "anon" %} @@ -81,9 +81,9 @@


- - - Cancel + + + Cancel {%s= Toolbar(user.FromRequest(rq)) %} diff --git a/views/mutators.qtpl.go b/views/mutators.qtpl.go index b06ed53..9108524 100644 --- a/views/mutators.qtpl.go +++ b/views/mutators.qtpl.go @@ -65,7 +65,7 @@ func StreamToolbar(qw422016 *qt422016.Writer, u *user.User) { //line views/mutators.qtpl:34 qw422016.N().S(` @@ -208,13 +208,13 @@ func StreamEditHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, text


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