diff --git a/app/assets/images/bolt.png b/app/assets/images/bolt.png new file mode 100644 index 0000000..1ac5b75 Binary files /dev/null and b/app/assets/images/bolt.png differ diff --git a/app/assets/images/logo.svg b/app/assets/images/logo.svg deleted file mode 100644 index 4086b97..0000000 --- a/app/assets/images/logo.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - logo - Created with Sketch. - - - - - \ No newline at end of file diff --git a/app/assets/images/welcome/message-four.png b/app/assets/images/welcome/message-four.png new file mode 100644 index 0000000..1ef59ee Binary files /dev/null and b/app/assets/images/welcome/message-four.png differ diff --git a/app/assets/images/welcome/message-one.png b/app/assets/images/welcome/message-one.png new file mode 100644 index 0000000..c2dac97 Binary files /dev/null and b/app/assets/images/welcome/message-one.png differ diff --git a/app/assets/images/welcome/message-three.png b/app/assets/images/welcome/message-three.png new file mode 100644 index 0000000..646c2f9 Binary files /dev/null and b/app/assets/images/welcome/message-three.png differ diff --git a/app/assets/images/welcome/message-two.png b/app/assets/images/welcome/message-two.png new file mode 100644 index 0000000..8b27edd Binary files /dev/null and b/app/assets/images/welcome/message-two.png differ diff --git a/app/assets/images/wordmark.svg b/app/assets/images/wordmark.svg new file mode 100644 index 0000000..4ea8c7e --- /dev/null +++ b/app/assets/images/wordmark.svg @@ -0,0 +1 @@ +Group \ No newline at end of file diff --git a/app/assets/stylesheets/utils/_base.scss b/app/assets/stylesheets/utils/_base.scss index 9204fae..234805f 100644 --- a/app/assets/stylesheets/utils/_base.scss +++ b/app/assets/stylesheets/utils/_base.scss @@ -1,3 +1,4 @@ //= require utils/_background //= require utils/_border +//= require utils/_sizing //= require utils/_typography diff --git a/app/assets/stylesheets/utils/_sizing.scss b/app/assets/stylesheets/utils/_sizing.scss new file mode 100644 index 0000000..119e1e8 --- /dev/null +++ b/app/assets/stylesheets/utils/_sizing.scss @@ -0,0 +1,15 @@ +@import "base/base"; + +.mh-50 { + min-height: 50vh; +} + +.mh-100 { + min-height: 100vh; +} + +@media (min-width: 768px) { + .mh-md-100 { + min-height: 100vh; + } +} diff --git a/app/assets/stylesheets/views/_base.scss b/app/assets/stylesheets/views/_base.scss index e69de29..4479d64 100644 --- a/app/assets/stylesheets/views/_base.scss +++ b/app/assets/stylesheets/views/_base.scss @@ -0,0 +1 @@ +//= require views/_welcome diff --git a/app/assets/stylesheets/views/_welcome.scss b/app/assets/stylesheets/views/_welcome.scss new file mode 100644 index 0000000..048ef76 --- /dev/null +++ b/app/assets/stylesheets/views/_welcome.scss @@ -0,0 +1,25 @@ +@import "base/base"; + +.welcome { + .welcome-logo { + width: 125px; + } + + .welcome-title { + color: $white; + font-size: 3rem; + font-weight: 300; + } + + .welcome-subtitle { + color: darken($white, 20%); + font-size: 1.25rem; + line-height: 1.5; + } + + .welcome-slack-message { + display: block; + margin-bottom: 15px; + width: 400px; + } +} diff --git a/app/views/devise/invitations/edit.html.erb b/app/views/devise/invitations/edit.html.erb index c2d7248..d4515ca 100644 --- a/app/views/devise/invitations/edit.html.erb +++ b/app/views/devise/invitations/edit.html.erb @@ -1,7 +1,7 @@
<%= link_to(root_path) do %> - <%= image_tag("logo.svg", class: "auth-logo mx-auto d-block mb-3") %> + <%= image_tag("bolt.png", class: "auth-logo mx-auto d-block mb-3") %> <% end %>

diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 1987383..5d0b2ce 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,7 +1,7 @@
<%= link_to(root_path) do %> - <%= image_tag("logo.svg", class: "auth-logo mx-auto d-block mb-3") %> + <%= image_tag("bolt.png", class: "auth-logo mx-auto d-block mb-3") %> <% end %>

diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index af8fa62..9016f45 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,7 +1,7 @@
<%= link_to(root_path) do %> - <%= image_tag("logo.svg", class: "auth-logo mx-auto d-block mb-3") %> + <%= image_tag("bolt.png", class: "auth-logo mx-auto d-block mb-3") %> <% end %>

diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 5477428..6f9cee0 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,7 +1,7 @@
<%= link_to(root_path) do %> - <%= image_tag("logo.svg", class: "auth-logo mx-auto d-block mb-3") %> + <%= image_tag("bolt.png", class: "auth-logo mx-auto d-block mb-3") %> <% end %>

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index a285e07..2269ba3 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1 +1,42 @@ <%= render("shared/flash") %> + +
+
+
+
+
+ <%= image_tag("bolt.png", class: "welcome-logo mb-3") %> + +

Storm

+

+ Self-hosted, open-source
website monitoring +

+ +
+ <%= link_to("Source code", "https://github.com/ProctorU/storm", + class: "btn btn-secondary") %> + + + Deploy to Heroku + +
+ +
+ <%= link_to("Sign in", new_user_session_path, + class: "btn btn-outline-secondary btn-block") %> +
+
+
+
+ +
+
+ <%= image_tag("welcome/message-one.png", class: "welcome-slack-message") %> + <%= image_tag("welcome/message-two.png", class: "welcome-slack-message") %> + <%= image_tag("welcome/message-three.png", class: "welcome-slack-message") %> + <%= image_tag("welcome/message-four.png", class: "welcome-slack-message") %> +
+
+
+