From 89b680c4a88007fce5aae6fc7283ab9bd6ed509c Mon Sep 17 00:00:00 2001 From: Jan-Lukas Else Date: Tue, 20 Apr 2021 20:38:19 +0200 Subject: [PATCH] Fix buttons in some browsers (Firefox ESR) --- go.mod | 4 ++-- go.sum | 8 ++++---- original-assets/styles/styles.scss | 13 +++++++++++-- templates/assets/css/styles.css | 6 +++--- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index e866efd..0b7d57b 100644 --- a/go.mod +++ b/go.mod @@ -59,9 +59,9 @@ require ( golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc // 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-20210415231046-e915ea6b2b7d + golang.org/x/net v0.0.0-20210420072503-d25e30425868 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/sys v0.0.0-20210415045647-66c3f260301c // indirect + golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe // indirect golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/ini.v1 v1.62.0 // indirect diff --git a/go.sum b/go.sum index aeae919..6b85825 100644 --- a/go.sum +++ b/go.sum @@ -417,8 +417,8 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d h1:BgJvlyh+UqCUaPlscHJ+PN8GcpfrFdr7NHjd1JL0+Gs= -golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.0.0-20210420072503-d25e30425868 h1:mHVdVrNGft0Bv5N0WIf3/ujpDOQOe6KxvwlIikPbMr0= +golang.org/x/net v0.0.0-20210420072503-d25e30425868/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= 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= @@ -454,8 +454,8 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210415045647-66c3f260301c h1:6L+uOeS3OQt/f4eFHXZcTxeZrGCuz+CLElgEBjbcTA4= -golang.org/x/sys v0.0.0-20210415045647-66c3f260301c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe h1:WdX7u8s3yOigWAhHEaDl8r9G+4XwFQEQFtBMYyN+kXQ= +golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/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/styles/styles.scss b/original-assets/styles/styles.scss index 947d3e5..ef4714c 100644 --- a/original-assets/styles/styles.scss +++ b/original-assets/styles/styles.scss @@ -77,19 +77,28 @@ img { width: 100%; } -input, textarea, select, button, .button, ::file-selector-button, ::-webkit-file-upload-button { +button, input, textarea, select { @include color-border(border, 1px, solid, primary); + border-radius: 0; @include color(background, background); @include color(color, primary); @extend .sans-serif; padding: 5px 10px; - border-radius: 0; box-sizing: border-box; text-decoration: none; font-size: 1rem; line-height: 1.5; } +.button { + @extend button; +} + +// Disable this because it causes CSS to break in Firefox ESR (check again in the future) +// input[type=file]::file-selector-button, input[type=file]::-webkit-file-upload-button { +// @extend .button; +// } + form { input, textarea, select { margin-bottom: 5px; diff --git a/templates/assets/css/styles.css b/templates/assets/css/styles.css index 9039754..f012812 100644 --- a/templates/assets/css/styles.css +++ b/templates/assets/css/styles.css @@ -1,4 +1,4 @@ -.sans-serif, input, textarea, select, button, .button, ::file-selector-button, ::-webkit-file-upload-button, body { +.sans-serif, button, .button, input, textarea, select, body { font-family: sans-serif; } @@ -52,15 +52,15 @@ img { width: 100%; } -input, textarea, select, button, .button, ::file-selector-button, ::-webkit-file-upload-button { +button, .button, input, textarea, select { border: 1px solid #000; border: 1px solid var(--primary, #000); + border-radius: 0; background: #fff; background: var(--background, #fff); color: #000; color: var(--primary, #000); padding: 5px 10px; - border-radius: 0; box-sizing: border-box; text-decoration: none; font-size: 1rem;