scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix SSO button CSS [SCI-9621]"

Browse source
This commit is contained in:
wandji 2024-04-16 08:52:31 +01:00 committed by GitHub
parent 06729fde46
commit 63b7a864f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/assets/stylesheets/themes/scinote.scss
View file

@ -382,6 +382,26 @@ mark,.mark {
width: 100%;
}
.azure-sign-in-actions {
margin-bottom: 10px;
margin-top: 10px;
.btn-azure-ad {
background-color: $office-ms-word;
color: $color-white;
}
}
.okta-sign-in-actions {
margin-bottom: 10px;
margin-top: 10px;
.btn-okta {
background-color: #00297a;
color: $color-white;
}
}
.navbar-secondary {
min-height: 77px;
transition: .4s $timing-function-sharp;

2
app/views/users/shared/_azure_sign_in_links.html.erb
View file

@ -1,7 +1,7 @@
<% ApplicationSettings.instance.values['azure_ad_apps'].select { |v| v['enable_sign_in'] }.each do |config| %>
<div class="form-group">
<%= form_tag user_customazureactivedirectory_omniauth_authorize_path(provider: config['provider_name']), method: :post, class: "azureAdForm" do %>
<%= submit_tag config['sign_in_label'] || t('devise.sessions.new.azure_ad_submit'), class: 'btn btn-primary w-full text-base' %>
<%= submit_tag config['sign_in_label'] || t('devise.sessions.new.azure_ad_submit'), class: 'btn btn-azure-ad' %>
<% end %>
</div>
<% end %>

14
app/views/users/shared/_links.html.erb
View file

@ -29,9 +29,9 @@
<% if controller_name != 'passwords'%>
<%- if sso_enabled? && okta_enabled? %>
<div class="my-2.5">
<div class="okta-sign-in-actions">
<%= form_tag user_okta_omniauth_authorize_path, method: :post, id: 'oktaForm' do %>
<%= submit_tag t('devise.okta.sign_in_label'), class: 'btn btn-primary w-full text-base' %>
<%= submit_tag t('devise.okta.sign_in_label'), class: 'btn btn-okta' %>
<% end %>
</div>
<% end %>
@ -43,23 +43,23 @@
<% end -%>
<% if sso_enabled? && azure_ad_enabled? %>
<div class="my-2.5">
<div class="azure-sign-in-actions">
<%= render partial: "users/shared/azure_sign_in_links", locals: { resource_name: resource_name } %>
</div>
<% end %>
<%- if sso_enabled? && openid_connect_enabled? %>
<div class="my-2.5">
<div class="azure-sign-in-actions">
<%= form_tag user_openid_connect_omniauth_authorize_path, method: :post do %>
<%= submit_tag t('devise.sessions.new.openid_connect_submit'), class: 'btn btn-primary w-full text-base' %>
<%= submit_tag t('devise.sessions.new.openid_connect_submit'), class: 'btn btn-primary' %>
<% end %>
</div>
<% end %>
<% if sso_enabled? && saml_enabled? %>
<div class="my-2.5">
<div class="azure-sign-in-actions">
<%= form_tag user_saml_omniauth_authorize_path, method: :post do %>
<%= submit_tag t('devise.sessions.new.saml_submit'), class: 'btn btn-primary w-full text-base' %>
<%= submit_tag t('devise.sessions.new.saml_submit'), class: 'btn btn-primary' %>
<% end %>
</div>
<% end %>