diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png new file mode 100644 index 0000000..4cf3785 Binary files /dev/null and b/app/assets/images/logo.png differ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 20f75f6..18ef1e4 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -20,12 +20,13 @@ body { font-family: "Source Sans Pro", sans-serif; } -.navbar.bg-light { +.navbar { position: fixed; top: 0; width: 100%; background: white; color: white; + box-shadow: 5px 0 5px -3px black; } .site-main-wrap { @@ -77,3 +78,44 @@ body { font-weight: 500; } } + +#flash { + .flash.alert { + position: fixed; + bottom: 5%; + background: rgba(67,118,212, 0.8); + margin: 0 auto; + width: 40vw; + left: 30vw; + color: white; + text-align: center; + display: block; + padding: 20px; + animation-name: disappear; + opacity: 0; + animation-duration: 5s; + animation-iteration-count: 1; + } +} + +.navbar-flex { + @media (min-width: 768px) { + display: flex; + width: 100%; + flex-direction: row; + align-items: center; + justify-content: space-between; + .inline-items { + .nav-link { + display: inline-block; + } + } + } +} + + +@keyframes disappear { + 0% {opacity: 1;} + 50% {opacity: 1;} + 100% {opacity: 0;} +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 63b24c1..2c62eea 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -12,21 +12,22 @@
+
+ <% flash.each do |key, value| %> +
<%= value %>
+ <% end %> +
-
- <% flash.each do |key, value| %> -
<%= value %>
- <% end %> -
+ <%= yield %>
diff --git a/app/views/sessions/login.html.erb b/app/views/sessions/login.html.erb index 16b4ad4..02da3e8 100644 --- a/app/views/sessions/login.html.erb +++ b/app/views/sessions/login.html.erb @@ -16,7 +16,7 @@ <% end %> -

Not yet a member? create an account

+

Not yet a member? Create an account

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 720fb4a..09c8328 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -46,7 +46,7 @@ <% end %> - +

Already a member? Login here

\ No newline at end of file diff --git a/storage/30/8e/308eev0uz96m0fc73xyll4p8yag4 b/storage/30/8e/308eev0uz96m0fc73xyll4p8yag4 new file mode 100644 index 0000000..5e38f33 Binary files /dev/null and b/storage/30/8e/308eev0uz96m0fc73xyll4p8yag4 differ diff --git a/storage/6p/gw/6pgw9e4g0dmkjwt2kcf8rygj322y b/storage/6p/gw/6pgw9e4g0dmkjwt2kcf8rygj322y new file mode 100644 index 0000000..ad27c8c Binary files /dev/null and b/storage/6p/gw/6pgw9e4g0dmkjwt2kcf8rygj322y differ diff --git a/storage/b0/mk/b0mktgcempy5o46ryn68q7w9tjqg b/storage/b0/mk/b0mktgcempy5o46ryn68q7w9tjqg new file mode 100644 index 0000000..8104bb4 Binary files /dev/null and b/storage/b0/mk/b0mktgcempy5o46ryn68q7w9tjqg differ diff --git a/storage/va/ri/variants/308eev0uz96m0fc73xyll4p8yag4/b97a5f71f3832ee51bbdd51e810569d8eda44df9c5cb97bdbdbcf6107147872c b/storage/va/ri/variants/308eev0uz96m0fc73xyll4p8yag4/b97a5f71f3832ee51bbdd51e810569d8eda44df9c5cb97bdbdbcf6107147872c new file mode 100644 index 0000000..ac0aa22 Binary files /dev/null and b/storage/va/ri/variants/308eev0uz96m0fc73xyll4p8yag4/b97a5f71f3832ee51bbdd51e810569d8eda44df9c5cb97bdbdbcf6107147872c differ diff --git a/storage/va/ri/variants/6pgw9e4g0dmkjwt2kcf8rygj322y/56d9d0c7d9e49774f5a2454a68509528362f200c97164b674550e4f2830e3151 b/storage/va/ri/variants/6pgw9e4g0dmkjwt2kcf8rygj322y/56d9d0c7d9e49774f5a2454a68509528362f200c97164b674550e4f2830e3151 new file mode 100644 index 0000000..78e62ce Binary files /dev/null and b/storage/va/ri/variants/6pgw9e4g0dmkjwt2kcf8rygj322y/56d9d0c7d9e49774f5a2454a68509528362f200c97164b674550e4f2830e3151 differ diff --git a/storage/va/ri/variants/6pgw9e4g0dmkjwt2kcf8rygj322y/d22d29d38393e844509e519a81db9789797c225b8eb8c334d9120bab21401b01 b/storage/va/ri/variants/6pgw9e4g0dmkjwt2kcf8rygj322y/d22d29d38393e844509e519a81db9789797c225b8eb8c334d9120bab21401b01 new file mode 100644 index 0000000..2170d91 Binary files /dev/null and b/storage/va/ri/variants/6pgw9e4g0dmkjwt2kcf8rygj322y/d22d29d38393e844509e519a81db9789797c225b8eb8c334d9120bab21401b01 differ diff --git a/storage/va/ri/variants/b0mktgcempy5o46ryn68q7w9tjqg/d0218ec05836c411b098b2b94b1366191002c13f4803ffefe20f67b76631137a b/storage/va/ri/variants/b0mktgcempy5o46ryn68q7w9tjqg/d0218ec05836c411b098b2b94b1366191002c13f4803ffefe20f67b76631137a new file mode 100644 index 0000000..b165ffa Binary files /dev/null and b/storage/va/ri/variants/b0mktgcempy5o46ryn68q7w9tjqg/d0218ec05836c411b098b2b94b1366191002c13f4803ffefe20f67b76631137a differ