diff --git a/app/assets/images/google-logo.png b/app/assets/images/google-logo.png new file mode 100644 index 00000000..aa005733 Binary files /dev/null and b/app/assets/images/google-logo.png differ diff --git a/app/assets/images/google_logo.png b/app/assets/images/google_logo.png deleted file mode 100644 index b8d4958e..00000000 Binary files a/app/assets/images/google_logo.png and /dev/null differ diff --git a/app/assets/images/office365-logo.jpeg b/app/assets/images/office365-logo.jpeg new file mode 100644 index 00000000..e020ddbf Binary files /dev/null and b/app/assets/images/office365-logo.jpeg differ diff --git a/app/assets/images/twitter-logo.png b/app/assets/images/twitter-logo.png new file mode 100644 index 00000000..c5446fac Binary files /dev/null and b/app/assets/images/twitter-logo.png differ diff --git a/app/assets/images/twitter_logo.png b/app/assets/images/twitter_logo.png deleted file mode 100644 index 17d213ba..00000000 Binary files a/app/assets/images/twitter_logo.png and /dev/null differ diff --git a/app/assets/images/windows-logo.png b/app/assets/images/windows-logo.png new file mode 100644 index 00000000..7c68685b Binary files /dev/null and b/app/assets/images/windows-logo.png differ diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 644eeeb6..87fb2c79 100755 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -58,10 +58,10 @@ font-weight: normal; } - -.customBtn-google { - display: inline-block; - background: #4688F1; +.customBtn { + display: block; + text-align: center; + background: #cccccc; color: #ffffff; box-shadow: 0 2px 4px 0 rgba(0,0,0,.25); -webkit-transition: background-color .218s,border-color .218s,box-shadow .218s; @@ -69,6 +69,7 @@ white-space: nowrap; border-radius: 2px; border: 1px solid transparent; + margin-bottom:20px; &:hover { cursor: pointer; color: #ffffff; @@ -93,5 +94,53 @@ font-family: 'Roboto', sans-serif; } - + .customBtn-image { + background: #ffffff; + background-size: 18px 18px; + padding:10px 10px 10px 10px; + } +} + +.customBtn-google { + @extend .customBtn; + background: #4688f1; + + .customBtn-image { + background: #ffffff image-url("google-logo.png") no-repeat left top; + background-size: 18px 18px; + padding:10px 10px 10px 10px; + } +} + +.customBtn-twitter { + @extend .customBtn; + background: #1da1f2; + + .customBtn-image { + background: #ffffff image-url("twitter-logo.png") no-repeat left top; + background-size: 18px 18px; + padding:10px 10px 10px 10px; + } +} + +.customBtn-microsoft_office365 { + @extend .customBtn; + background: #f65314; + + .customBtn-image { + background: #ffffff image-url("office365-logo.jpeg") no-repeat left top; + background-size: 18px 18px; + padding:10px 10px 10px 10px; + } +} + +.customBtn-microsoft_windows { + @extend .customBtn; + background: #00a1f1; + + .customBtn-image { + background: #ffffff image-url("windows-logo.png") no-repeat left top; + background-size: 18px 18px; + padding:10px 10px 10px 10px; + } } diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a4078634..7283d93e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -28,7 +28,7 @@ module ApplicationHelper # Determines which providers can show a login button in the login modal. def iconset_providers - configured_providers & [:google, :twitter] + configured_providers & [:google, :twitter, :microsoft_office365] end # Generates the login URL for a specific provider. diff --git a/app/views/shared/modals/_login_modal.html.erb b/app/views/shared/modals/_login_modal.html.erb index 6595d54a..a0fa176d 100644 --- a/app/views/shared/modals/_login_modal.html.erb +++ b/app/views/shared/modals/_login_modal.html.erb @@ -21,32 +21,15 @@

<%= t("login") %>

- <% unless iconset_providers.length.zero? %> - - <% if configured_providers.include? :google %> - <% provider = :google %> + <% iconset_providers.each do |provider| %> <%= link_to omniauth_login_url(provider), class: "customBtn-#{provider}" do %> - - - - <%= t("modal.login.with", provider: provider.capitalize) %> + + + + <%= t("modal.login.with", provider: t("provider.#{provider}")) %> <% end %> <% end %> - - <% if configured_providers.include? :twitter %> - <% provider = :twitter %> - <%= link_to omniauth_login_url(provider), class: "btn btn-pill btn-#{provider} btn-block" do %> -  <%= t("modal.login.with", provider: provider.capitalize) %> - <% end %> - <% end %> - - <% if configured_providers.include? :microsoft_office365 %> - <%= link_to omniauth_login_url(:microsoft_office365), class: "btn btn-pill btn-primary btn-block" do %> -  <%= t("modal.login.with", provider: "Office365") %> - <% end %> - <% end %> -
@@ -55,7 +38,6 @@
<% end %> - <%= form_for(:session, url: create_session_path) do |f| %>
@@ -65,7 +47,6 @@ <%= f.text_field :email, class: "form-control", placeholder: t("email"), value: "" %>
-
@@ -74,7 +55,6 @@ <%= f.password_field :password, class: "form-control", placeholder: t("password"), value: "" %>
-
<%= f.submit t("login"), class: "btn btn-outline-primary btn-block btn-pill" %>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 2247a4bf..ae03bb29 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -21,31 +21,15 @@

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

- <% unless configured_providers.length.zero? %> - - <% if configured_providers.include? :google %> - <% provider = :google %> + <% unless iconset_providers.length.zero? %> + <% iconset_providers.each do |provider| %> <%= link_to omniauth_login_url(provider), class: "customBtn-#{provider}" do %> - + - <%= t("signup.with", provider: provider.capitalize) %> + <%= t("signup.with", provider: t("provider.#{provider}")) %> <% end %> <% end %> - - <% if configured_providers.include? :twitter %> - <% provider = :twitter %> - <%= link_to omniauth_login_url(provider), class: "btn btn-pill btn-#{provider} btn-block" do %> -  <%= t("signup.with", provider: provider.capitalize) %> - <% end %> - <% end %> - - <% if configured_providers.include? :microsoft_office365 %> - <%= link_to omniauth_login_url(:microsoft_office365), class: "btn btn-pill btn-primary btn-block" do %> -  <%= t("signup.with", provider: "Office365") %> - <% end %> - <% end %> -
diff --git a/config/locales/en.yml b/config/locales/en.yml index b18f3eea..9b1c488f 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -100,6 +100,10 @@ en: with: Sign in with %{provider} omniauth_error: An error occured while authenticating with omniauth. Please try again or contact an administrator! password: Password + provider: + google: Google + microsoft_office365: Office 365 + twitter: Twitter recording: email: Email Recording no_recordings: This room has no %{inject}recordings.