From 6f091b96aabbef64441a39be14bd3b4392120db6 Mon Sep 17 00:00:00 2001 From: Ethan Fraenkel Date: Tue, 28 Aug 2018 15:34:52 +0200 Subject: [PATCH 1/4] done with login signup --- app/assets/stylesheets/application.scss | 3 ++ app/assets/stylesheets/devise/_index.scss | 1 + app/assets/stylesheets/devise/_login.scss | 40 +++++++++++++++++ app/views/devise/registrations/new.html.erb | 48 +++++++++++---------- app/views/devise/sessions/new.html.erb | 40 +++++++++-------- app/views/devise/shared/_links.html.erb | 2 +- 6 files changed, 93 insertions(+), 41 deletions(-) create mode 100644 app/assets/stylesheets/devise/_index.scss create mode 100644 app/assets/stylesheets/devise/_login.scss diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 2b5cfc4..428d039 100755 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -14,3 +14,6 @@ @import "layouts/index"; @import "components/index"; @import "pages/index"; + +@import "devise/index"; + diff --git a/app/assets/stylesheets/devise/_index.scss b/app/assets/stylesheets/devise/_index.scss new file mode 100644 index 0000000..57338a7 --- /dev/null +++ b/app/assets/stylesheets/devise/_index.scss @@ -0,0 +1 @@ +@import 'login'; diff --git a/app/assets/stylesheets/devise/_login.scss b/app/assets/stylesheets/devise/_login.scss new file mode 100644 index 0000000..702f4ce --- /dev/null +++ b/app/assets/stylesheets/devise/_login.scss @@ -0,0 +1,40 @@ +.login-container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + width: 100%; + height: 100vh; + position: absolute; + background-image: + linear-gradient( + -225deg, + rgba(5,25,55,0.3) 0%, + rgba(68,73,101,0.3), + rgba(128,129,149,0.3), + rgba(191,190,200,0.3), + rgba(255,255,255,0.3) + 50%), + url('https://unsplash.com/photos/jay5BqVyf5A'); + + + + .login-content { + position: relative; + top: -10vh; + padding: 50px; + background-color: white; + width: 25vw; + border-radius: 3px; + box-shadow: 1px 1px 10px rgba(0,0,0, 0.21); + + h2 { + color: $primary; + } + } +} + +.login { + // color: $primary; + width:100%; +} diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 8eeba8c..07ec4dd 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,25 +1,29 @@ -

Sign up

+
+ diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index e542e61..799901f 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,20 +1,24 @@ -

Log in

+