From 9a738c44328806fb6d002650604c8e64eeb627b4 Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Mon, 23 Jul 2018 11:46:53 -0400 Subject: [PATCH 1/4] add signup with provider buttons --- app/views/users/new.html.erb | 25 ++++++++++++++++++++----- config/locales/en.yml | 1 + 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 55f5d378..3e477cca 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -1,11 +1,26 @@
-
-
+
+
-
+

<%= t("signup.subtitle") %>

-
+
+ <% unless configured_providers.length.zero? %> + <% configured_providers.each do |provider| %> + <%= link_to omniauth_login_url(provider), class: "btn btn-pill btn-#{provider} btn-block" do %> +  <%= t("signup.with", provider: provider.capitalize) %> + <% end %> + <% end %> + +
+
+ + <%= t("modal.login.or") %> + +
+
+ <% end %> <%= form_for @user, url: create_user_path, method: :post do |f| %>
<%= f.label t("settings.account.fullname"), class: "form-label" %> @@ -29,7 +44,7 @@
<%= f.submit t("signup.title"), class: "btn btn-primary float-right ml-2" %> - <%= link_to t("cancel"), root_path, class: "btn btn-danger float-right ml-2" %> + <%= link_to t("cancel"), root_path, class: "btn btn-secondary float-right ml-2" %>
<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 0ac42048..66db4a18 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -118,6 +118,7 @@ en: password_confirm: Password Confirmation subtitle: Create an Account title: Signup + with: Signup with %{provider} terms: accept: I accept the terms and conditions. title: Terms and Conditions From 0202d09a9d0c50f726c8076c5604b4297feb9153 Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Mon, 23 Jul 2018 12:23:59 -0400 Subject: [PATCH 2/4] fix video link spanning entire page --- app/views/main/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb index cd25f5c3..7fdb4e3c 100644 --- a/app/views/main/index.html.erb +++ b/app/views/main/index.html.erb @@ -12,7 +12,7 @@

<%= t("landing.welcome") %>

<%= t("landing.about") %>

- <%= link_to "https://youtu.be/Hso8yLzkqj8", class: "p-3", target: "_blank" do %> + <%= link_to "https://youtu.be/Hso8yLzkqj8", class: "d-inline-block p-3", target: "_blank" do %>

<%= t("landing.video") %>

<% end %>
From f91c6d193a2a475940b0cd29d4a33b6bd9e1c0c9 Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Mon, 23 Jul 2018 14:40:41 -0400 Subject: [PATCH 3/4] make features appear non-clickable --- app/assets/stylesheets/main.scss | 9 +------ app/views/shared/_features.html.erb | 38 ++++++++++++++--------------- config/locales/en.yml | 1 + 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 27a3d0c4..b04f35d7 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -12,14 +12,7 @@ } .feature-stamp { - width: 7vw !important; - height: 7vw !important; - font-size: 1vw; -} - -.feature-icon { - transform: translateY(-50%); - margin-top: 50%; + border-radius: 6px; } .or-line { diff --git a/app/views/shared/_features.html.erb b/app/views/shared/_features.html.erb index 02ef73b2..c9bc627a 100644 --- a/app/views/shared/_features.html.erb +++ b/app/views/shared/_features.html.erb @@ -1,24 +1,24 @@ -

<%= t("features.title") %>

+

<%= t("features.title") %>

-
-
- - - -

<%= t("features.rooms") %>

-
-
- - - -

<%= t("features.recordings") %>

-
-
- - - -

<%= t("features.designs") %>

+
+
+
+ +

<%= t("features.rooms") %>

+
+
+ +

<%= t("features.recordings") %>

+
+
+ +

<%= t("features.designs") %>

+
+
+ +

<%= t("features.authentication") %>

+
diff --git a/config/locales/en.yml b/config/locales/en.yml index 66db4a18..5503a39a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -30,6 +30,7 @@ en: rooms: Personalized Rooms recordings: Recording Management designs: Custom Designs + authentication: User Authentication footer: powered_by: Powered by %{href}. go_back: Go back From 3696fa95d7d98d8da0af547d7aed4c1425f8a6a0 Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Mon, 23 Jul 2018 15:06:21 -0400 Subject: [PATCH 4/4] add version in footer --- app/views/shared/_footer.html.erb | 1 + config/initializers/version.rb | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 config/initializers/version.rb diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb index f3f55c2a..1220f485 100644 --- a/app/views/shared/_footer.html.erb +++ b/app/views/shared/_footer.html.erb @@ -1,3 +1,4 @@ diff --git a/config/initializers/version.rb b/config/initializers/version.rb new file mode 100644 index 00000000..9cb791e3 --- /dev/null +++ b/config/initializers/version.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +module Greenlight + class Application + VERSION = "2.1.0" + end +end