From 917dcdab4888f9405773175778d77ac33eecf497 Mon Sep 17 00:00:00 2001 From: Jan-Lukas Else Date: Thu, 18 Mar 2021 12:13:17 +0100 Subject: [PATCH] CSS fixes, Translations, Translate Button --- go.mod | 11 ++++---- go.sum | 27 +++++++++--------- original-assets/build/buildStyles.sh | 3 ++ .../styles}/styles.scss | 28 +++++++++---------- templates/assets/css/styles.css | 18 ++++++------ templates/assets/js/translate.js | 3 ++ templates/footer.gohtml | 2 +- templates/header.gohtml | 2 +- templates/postactions.gohtml | 8 ++++-- templates/postmeta.gohtml | 2 +- templates/strings/de.yaml | 7 +++-- templates/strings/default.yaml | 7 +++-- 12 files changed, 62 insertions(+), 56 deletions(-) create mode 100755 original-assets/build/buildStyles.sh rename {templates/assets/css => original-assets/styles}/styles.scss (90%) create mode 100644 templates/assets/js/translate.js diff --git a/go.mod b/go.mod index 4bec0ea..f428ee3 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f github.com/dgraph-io/ristretto v0.0.4-0.20210311064603-e4f298c8aa88 github.com/dgrijalva/jwt-go v3.2.0+incompatible - github.com/elnormous/contenttype v0.0.0-20210110050721-79150725153f + github.com/elnormous/contenttype v1.0.0 github.com/go-chi/chi/v5 v5.0.1 github.com/go-fed/httpsig v1.1.0 github.com/go-sql-driver/mysql v1.5.0 // indirect @@ -47,8 +47,7 @@ require ( github.com/spf13/cast v1.3.1 github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/viper v1.7.1 - github.com/tdewolff/minify/v2 v2.9.13 - github.com/tdewolff/parse/v2 v2.5.12 // indirect + github.com/tdewolff/minify/v2 v2.9.15 github.com/thoas/go-funk v0.8.0 github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 github.com/vcraescu/go-paginator v1.0.1-0.20201114172518-2cfc59fe05c2 @@ -56,12 +55,12 @@ require ( github.com/yuin/goldmark-emoji v1.0.1 go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.16.0 // indirect - golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect + golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670 // indirect golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect golang.org/x/mod v0.4.1 // indirect - golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect + golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect + golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e // indirect golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect golang.org/x/text v0.3.5 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/go.sum b/go.sum index 7276fe1..6458c7d 100644 --- a/go.sum +++ b/go.sum @@ -71,8 +71,8 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUn github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/elnormous/contenttype v0.0.0-20210110050721-79150725153f h1:juwLa2Kbp2uwOGMOagrkTYXN/5+7sbINMmIZSluH2Gc= -github.com/elnormous/contenttype v0.0.0-20210110050721-79150725153f/go.mod h1:ngVcyGGU8pnn4QJ5sL4StrNgc/wmXZXy5IQSBuHOFPg= +github.com/elnormous/contenttype v1.0.0 h1:cTLou7K7uQMsPEmRiTJosAznsPcYuoBmXMrFAf86t2A= +github.com/elnormous/contenttype v1.0.0/go.mod h1:ngVcyGGU8pnn4QJ5sL4StrNgc/wmXZXy5IQSBuHOFPg= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/felixge/httpsnoop v1.0.0/go.mod h1:3+D9sFq0ahK/JeJPhCBUV1xlf4/eIYrUQaxulT0VzX8= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= @@ -323,11 +323,10 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tdewolff/minify/v2 v2.9.13 h1:RrwQhgGoYBhKN/ezStGB+crU64wPK1ZE5Jmkl63lif0= -github.com/tdewolff/minify/v2 v2.9.13/go.mod h1:faNOp+awAoo+fhFHD+NAkBOaXBAvJI2X2SDERGKnARo= -github.com/tdewolff/parse/v2 v2.5.10/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho= -github.com/tdewolff/parse/v2 v2.5.12 h1:Dxblj0AftHJ3bwBmKdAd7O1wB1+CVFI/BCaYaGuuoSM= -github.com/tdewolff/parse/v2 v2.5.12/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho= +github.com/tdewolff/minify/v2 v2.9.15 h1:gZzGuFHvmxDjsAM6Eu53xo8A5NiaVu3gzamvHAxDpAI= +github.com/tdewolff/minify/v2 v2.9.15/go.mod h1:tK4qPnHUZgANtEGVMwTBxrF1eNIBkigHFYo7F3Y98GQ= +github.com/tdewolff/parse/v2 v2.5.14 h1:ftdD54vkOeLZ7VkEZxp+wZrYZyyPi43GGon5GwBTRUI= +github.com/tdewolff/parse/v2 v2.5.14/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho= github.com/tdewolff/test v1.0.6 h1:76mzYJQ83Op284kMT+63iCNCI7NEERsIN8dLM+RiKr4= github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/thoas/go-funk v0.8.0 h1:JP9tKSvnpFVclYgDM0Is7FD9M4fhPvqA0s0BsXmzSRQ= @@ -368,8 +367,8 @@ golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670 h1:gzMM0EjIYiRmJI3+jBdFuoynZlpxa2JQZsolKu09BXo= +golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -414,8 +413,9 @@ golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 h1:b0LrWgu8+q7z4J+0Y3Umo5q1dL7NXBkKBWkaVkAq17E= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/oauth2 v0.0.0-20170912212905-13449ad91cb2/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -444,15 +444,14 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY= -golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e h1:XNp2Flc/1eWQGk5BLzqTAN7fQIwIbfyVTuVxXxZh73M= +golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M= golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/original-assets/build/buildStyles.sh b/original-assets/build/buildStyles.sh new file mode 100755 index 0000000..6a878cf --- /dev/null +++ b/original-assets/build/buildStyles.sh @@ -0,0 +1,3 @@ +#!/bin/env sh + +npx sass --no-source-map original-assets/styles/styles.scss templates/assets/css/styles.css \ No newline at end of file diff --git a/templates/assets/css/styles.scss b/original-assets/styles/styles.scss similarity index 90% rename from templates/assets/css/styles.scss rename to original-assets/styles/styles.scss index 6ffd1a5..947d3e5 100644 --- a/templates/assets/css/styles.scss +++ b/original-assets/styles/styles.scss @@ -1,8 +1,8 @@ $colors: ( - background: #fff, - background-dark: #000, - primary: #000, - primary-dark: #fff + background: #fff, + background-dark: #000, + primary: #000, + primary-dark: #fff ); @mixin color($property, $varName) { @@ -77,7 +77,7 @@ img { width: 100%; } -input, textarea, select, button, .button { +input, textarea, select, button, .button, ::file-selector-button, ::-webkit-file-upload-button { @include color-border(border, 1px, solid, primary); @include color(background, background); @include color(color, primary); @@ -87,10 +87,13 @@ input, textarea, select, button, .button { box-sizing: border-box; text-decoration: none; font-size: 1rem; + line-height: 1.5; } -form input, form textarea, form select { - margin-bottom: 5px; +form { + input, textarea, select { + margin-bottom: 5px; + } } .fw-form { @@ -114,8 +117,10 @@ pre { } :not(pre) > code { - @extend .invert; font-size: 1rem; + // Invert + @include color(color, background); + @include color(background, primary); } code { @@ -150,11 +155,6 @@ footer { @include color-border(border-bottom, 1px, solid, primary); } -.invert { - @include color(color, background); - @include color(background, primary); -} - .p { display: block; margin-top: 1em; @@ -186,7 +186,7 @@ footer { } .captchaimg { - background-color: white; + background-color: #fff; } .tal { diff --git a/templates/assets/css/styles.css b/templates/assets/css/styles.css index 337d70c..9039754 100644 --- a/templates/assets/css/styles.css +++ b/templates/assets/css/styles.css @@ -1,4 +1,4 @@ -.sans-serif, input, textarea, select, button, .button, body { +.sans-serif, input, textarea, select, button, .button, ::file-selector-button, ::-webkit-file-upload-button, body { font-family: sans-serif; } @@ -52,7 +52,7 @@ img { width: 100%; } -input, textarea, select, button, .button { +input, textarea, select, button, .button, ::file-selector-button, ::-webkit-file-upload-button { border: 1px solid #000; border: 1px solid var(--primary, #000); background: #fff; @@ -64,6 +64,7 @@ input, textarea, select, button, .button { box-sizing: border-box; text-decoration: none; font-size: 1rem; + line-height: 1.5; } form input, form textarea, form select { @@ -86,6 +87,10 @@ pre { :not(pre) > code { font-size: 1rem; + color: #fff; + color: var(--background, #fff); + background: #000; + background: var(--primary, #000); } code { @@ -121,13 +126,6 @@ footer * { border-bottom: 1px solid var(--primary, #000); } -.invert, :not(pre) > code { - color: #fff; - color: var(--background, #fff); - background: #000; - background: var(--primary, #000); -} - .p { display: block; margin-top: 1em; @@ -159,7 +157,7 @@ footer * { } .captchaimg { - background-color: white; + background-color: #fff; } .tal { diff --git a/templates/assets/js/translate.js b/templates/assets/js/translate.js new file mode 100644 index 0000000..60d1a68 --- /dev/null +++ b/templates/assets/js/translate.js @@ -0,0 +1,3 @@ +(function () { + document.getElementById('translateBtn').href = "https://translate.google.com/translate?sl=auto&tl=" + navigator.language + "&u=" + window.location.href +})() \ No newline at end of file diff --git a/templates/footer.gohtml b/templates/footer.gohtml index 98e5516..1f22bed 100644 --- a/templates/footer.gohtml +++ b/templates/footer.gohtml @@ -5,6 +5,6 @@ {{ if ne $i 0 }} • {{ end }}{{ $item.Title }} {{ end }} {{ end }} -

© {{ dateformat now "2006" }} {{ with user.Name }}{{ . }}{{ else }}{{ .Blog.Title }}{{ end }}

+

© {{ dateformat now "2006" }} {{ with user.Name }}{{ . }}{{ else }}{{ .Blog.Title }}{{ end }}

{{ end }} \ No newline at end of file diff --git a/templates/header.gohtml b/templates/header.gohtml index dcfd436..e6eea14 100644 --- a/templates/header.gohtml +++ b/templates/header.gohtml @@ -1,6 +1,6 @@ {{ define "header" }}
-

{{ .Blog.Title }}

+

{{ .Blog.Title }}

{{ with .Blog.Description }}

{{ . }}

{{ end }}