From 48034fc25b6b38e6fb881d22632f8bd66d25e0ea Mon Sep 17 00:00:00 2001 From: Timur Ismagilov Date: Tue, 25 May 2021 12:34:04 +0500 Subject: [PATCH] Make some visual design changes --- assets/assets.qtpl.go | 9 +- assets/default.css | 9 +- views/modal.qtpl | 4 +- views/modal.qtpl.go | 4 +- views/readers.qtpl | 12 +- views/readers.qtpl.go | 260 +++++++++++++++++++++--------------------- 6 files changed, 148 insertions(+), 150 deletions(-) diff --git a/assets/assets.qtpl.go b/assets/assets.qtpl.go index 7969c74..509609b 100644 --- a/assets/assets.qtpl.go +++ b/assets/assets.qtpl.go @@ -125,9 +125,6 @@ func StreamDefaultCSS(qw422016 *qt422016.Writer) { .modal__title { font-size: 2rem; } .modal__title_small { font-size: 1.5rem; } .modal__confirmation-msg { margin: 0 0 .5rem 0; } -.modal__action { display: inline-block; font-size: 1rem; padding: .25rem; border-radius: .25rem; } -.modal__submit { border: 1px #999 solid; } -.modal__cancel { border: 1px #999 dashed; text-decoration: none; } .hypha-list { padding-left: 0; } .hypha-list__entry { list-style-type: none; } @@ -253,7 +250,7 @@ main h1, main h2, main h3, main h4, main h5, main h6 { margin: 1.5rem 0 0 0; } .heading__link:hover::after, .heading__link:active::after { color: #999; } article p { margin: .5rem 0; } article ul, ol { padding-left: 1.5rem; margin: .5rem 0; } -article code { padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; } +article code { padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; font-family: 'Menlo', 'PT Mono', monospace; } article pre.codeblock { padding:.5rem; white-space: pre-wrap; border-radius: .25rem;} .codeblock code {padding:0; font-size:15px;} .transclusion { border-radius: .25rem; } @@ -354,10 +351,10 @@ table { background-color: #eee; } .layout-card { border-radius: .25rem; background-color: white; } .layout-card__title { font-size: 1rem; margin: 0; padding: .25rem .5rem; border-radius: .25rem .25rem 0 0; } -.layout-card__title { background-color: #eee; } +.layout-card__title { border-bottom: 1px solid #eee; } /* Other stuff */ -html { background-color: #ddd; +html { background-color: #eee; } header { background-color: #eee; } .header-links__link { color: black; } diff --git a/assets/default.css b/assets/default.css index c83733b..cc1cd00 100644 --- a/assets/default.css +++ b/assets/default.css @@ -10,9 +10,6 @@ .modal__title { font-size: 2rem; } .modal__title_small { font-size: 1.5rem; } .modal__confirmation-msg { margin: 0 0 .5rem 0; } -.modal__action { display: inline-block; font-size: 1rem; padding: .25rem; border-radius: .25rem; } -.modal__submit { border: 1px #999 solid; } -.modal__cancel { border: 1px #999 dashed; text-decoration: none; } .hypha-list { padding-left: 0; } .hypha-list__entry { list-style-type: none; } @@ -138,7 +135,7 @@ main h1, main h2, main h3, main h4, main h5, main h6 { margin: 1.5rem 0 0 0; } .heading__link:hover::after, .heading__link:active::after { color: #999; } article p { margin: .5rem 0; } article ul, ol { padding-left: 1.5rem; margin: .5rem 0; } -article code { padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; } +article code { padding: .1rem .3rem; border-radius: .25rem; font-size: 90%; font-family: 'Menlo', 'PT Mono', monospace; } article pre.codeblock { padding:.5rem; white-space: pre-wrap; border-radius: .25rem;} .codeblock code {padding:0; font-size:15px;} .transclusion { border-radius: .25rem; } @@ -239,10 +236,10 @@ table { background-color: #eee; } .layout-card { border-radius: .25rem; background-color: white; } .layout-card__title { font-size: 1rem; margin: 0; padding: .25rem .5rem; border-radius: .25rem .25rem 0 0; } -.layout-card__title { background-color: #eee; } +.layout-card__title { border-bottom: 1px solid #eee; } /* Other stuff */ -html { background-color: #ddd; +html { background-color: #eee; } header { background-color: #eee; } .header-links__link { color: black; } diff --git a/views/modal.qtpl b/views/modal.qtpl index bb1a559..45c9dd3 100644 --- a/views/modal.qtpl +++ b/views/modal.qtpl @@ -54,8 +54,8 @@ {% endfunc %} {% func modalEnd(hyphaName string, shouldFocusOnConfirm bool) %} - - Cancel + + Cancel diff --git a/views/modal.qtpl.go b/views/modal.qtpl.go index 3efb837..5dfba56 100644 --- a/views/modal.qtpl.go +++ b/views/modal.qtpl.go @@ -306,7 +306,7 @@ func modalBegin(path, hyphaName, formAttrs, legend string) string { func streammodalEnd(qw422016 *qt422016.Writer, hyphaName string, shouldFocusOnConfirm bool) { //line views/modal.qtpl:56 qw422016.N().S(` - Cancel + qw422016.N().S(`" class="btn btn_weak">Cancel diff --git a/views/readers.qtpl b/views/readers.qtpl index 34f861d..7d22dda 100644 --- a/views/readers.qtpl +++ b/views/readers.qtpl @@ -47,12 +47,14 @@ {% if u.CanProceed("upload-binary") %}