From 35a61859b29819aaffadca74516757a359b1219c Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 20 Jul 2020 00:50:05 +0200 Subject: [PATCH] Pretty up design --- assets/static/css/style.css | 17 +++- .../jordan-harrison-1208586-unsplash.jpg | 3 - .../louis-reed-wSTCaQpiLtc-unsplash.jpg | 3 + assets/templates/layouts/auth_login.tmpl | 55 +++++++------ assets/templates/layouts/auth_register.tmpl | 77 ++++++++++++++----- go.mod | 1 + go.sum | 2 + internal/web/server.go | 2 +- 8 files changed, 113 insertions(+), 47 deletions(-) delete mode 100644 assets/static/images/jordan-harrison-1208586-unsplash.jpg create mode 100644 assets/static/images/louis-reed-wSTCaQpiLtc-unsplash.jpg diff --git a/assets/static/css/style.css b/assets/static/css/style.css index e731d9d..51fb8b4 100644 --- a/assets/static/css/style.css +++ b/assets/static/css/style.css @@ -39,9 +39,24 @@ } .auth-background { - background: linear-gradient(#23d160e0, #23d160e0), url(/static/images/jordan-harrison-1208586-unsplash.jpg); + background: linear-gradient(#30cfd0e0, #330867e0), url(/static/images/louis-reed-wSTCaQpiLtc-unsplash.jpg); background-position: 50%; background-repeat: no-repeat; background-size: cover; background-attachment: fixed; +} + +.seperate-header { + background: linear-gradient(180deg, rgba(0, 0, 0, 0) calc(50% - 1px), rgba(192, 192, 192, 1) calc(50%), rgba(0, 0, 0, 0) calc(50% + 1px)); + overflow: visible; + white-space: nowrap; + text-align: center; + margin-bottom: 15px; + margin-top: 5px; +} +.seperate-header p { + background-color: #fff; + display: inline-block; + padding: 20px; + line-height: 1.2em; } \ No newline at end of file diff --git a/assets/static/images/jordan-harrison-1208586-unsplash.jpg b/assets/static/images/jordan-harrison-1208586-unsplash.jpg deleted file mode 100644 index 34c19a5..0000000 --- a/assets/static/images/jordan-harrison-1208586-unsplash.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64b68f6ecba68970d1ca4384db7b694f9691929c3da5031dbd4dd4aff494f840 -size 36118 diff --git a/assets/static/images/louis-reed-wSTCaQpiLtc-unsplash.jpg b/assets/static/images/louis-reed-wSTCaQpiLtc-unsplash.jpg new file mode 100644 index 0000000..656a3d1 --- /dev/null +++ b/assets/static/images/louis-reed-wSTCaQpiLtc-unsplash.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03c2fc403dc49e601e599b9ae474d38b21497d0a40c9663ebb31e39d257c248e +size 32777 diff --git a/assets/templates/layouts/auth_login.tmpl b/assets/templates/layouts/auth_login.tmpl index 8061e9f..c8edca8 100644 --- a/assets/templates/layouts/auth_login.tmpl +++ b/assets/templates/layouts/auth_login.tmpl @@ -5,14 +5,15 @@ - + + Log In -
+
@@ -25,29 +26,31 @@
{{- end }}
-

{{ i18n "de_DE" "Log in" }}

+

{{ i18n "de_DE" "Log in" }}

-
- -
-
- +
+ + + mail_outline +
-
-
- -
+
-
+
+ + + lock_outline +
+

Forgot password?

@@ -61,19 +64,27 @@ -
-

- -

+
+ +
+
+

Or

+
+ +
+
Don't have an account? - Sign Up + Sign Up
diff --git a/assets/templates/layouts/auth_register.tmpl b/assets/templates/layouts/auth_register.tmpl index bc8d249..9f5cd5e 100644 --- a/assets/templates/layouts/auth_register.tmpl +++ b/assets/templates/layouts/auth_register.tmpl @@ -5,34 +5,57 @@ - + + Log In -
+
-
+
-

Create Account

-
-
-
- -
-
-
-
-
-

The invitation link will be sent to this address

-
+

Sign up

+ +
+
+ + + person_outline +
+
+
+ + + mail_outline + +
+
+
+
+ + + lock_outline + +
+

Password must be minimum 8 characters, and should contain capital letters, numbers and special characters.

+
+ + + + @@ -41,16 +64,30 @@ -
+

-

+
+

Or

+
+ +
+ +
+
+ Already have an account? + Log In +
diff --git a/go.mod b/go.mod index cea0104..fb58a0f 100644 --- a/go.mod +++ b/go.mod @@ -17,6 +17,7 @@ require ( github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/pkg/errors v0.9.1 github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 + github.com/shurcooL/vfsgen v0.0.0-20200627165143-92b8a710ab6c // indirect github.com/smartystreets/goconvey v1.6.4 // indirect golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/go.sum b/go.sum index 68517c3..6d2065a 100644 --- a/go.sum +++ b/go.sum @@ -268,6 +268,8 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= +github.com/shurcooL/vfsgen v0.0.0-20200627165143-92b8a710ab6c h1:XLPw6rny9Vrrvrzhw8pNLrC2+x/kH0a/3gOx5xWDa6Y= +github.com/shurcooL/vfsgen v0.0.0-20200627165143-92b8a710ab6c/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= diff --git a/internal/web/server.go b/internal/web/server.go index 660810a..c59c570 100644 --- a/internal/web/server.go +++ b/internal/web/server.go @@ -3,8 +3,8 @@ package web import ( "net/http" - "github.com/go-chi/chi" "bitmask.me/skeleton/internal/app" + "github.com/go-chi/chi" ) func runHTTP(listenAddr string, h http.Handler) error {