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

UI CSS fixes

Browse source
This commit is contained in:
Anton 2023-06-19 15:45:22 +02:00
parent 245a58b5c1
commit 4e972de096
84 changed files with 189 additions and 182 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/reports/reports_datatable.js
View file

@ -25,7 +25,7 @@
if (data.error) {
let oldLink = '';
if (data.preview_url) {
oldLink = `<a href="#" class="file-preview-link docx" data-preview-url="${data.preview_url}">
oldLink = `<a href="#" class="file-preview-link flex items-center gap-1 docx" data-preview-url="${data.preview_url}">
(<i class="fas fa-file-docx"></i>
${I18n.t('projects.reports.index.previous_docx')})
</a>`;
@ -43,7 +43,7 @@
}
if (data.preview_url) {
return `<a href="#" class="file-preview-link docx" data-preview-url="${data.preview_url}">
return `<a href="#" class="file-preview-link flex items-center gap-1 docx" data-preview-url="${data.preview_url}">
<i class="sn-icon sn-icon-file-word"></i>
${I18n.t('projects.reports.index.docx')}
</a>`;
@ -55,7 +55,7 @@
if (data.error) {
let oldLink = '';
if (data.preview_url) {
oldLink = `<a href="#" class="file-preview-link pdf" data-preview-url="${data.preview_url}">
oldLink = `<a href="#" class="file-preview-link flex items-center gap-1 pdf" data-preview-url="${data.preview_url}">
(<i class="fas fa-file-pdf"></i>
${I18n.t('projects.reports.index.previous_pdf')})
</a>`;
@ -73,7 +73,7 @@
}
if (data.preview_url) {
return `<a href="#" class="file-preview-link pdf" data-preview-url="${data.preview_url}">
return `<a href="#" class="file-preview-link flex items-center gap-1 pdf" data-preview-url="${data.preview_url}">
<i class="fas fa-file-pdf"></i>
${I18n.t('projects.reports.index.pdf')}
</a>`;

2
app/assets/javascripts/sitewide/drag_n_drop.js
View file

@ -108,7 +108,7 @@
<span class="input-group-addon" id="image-name"></span></div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">${I18n.t('general.cancel')}</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">${I18n.t('general.cancel')}</button>
<button type="button" class="btn btn-success" data-action="addImageFormClipboard">${I18n.t('assets.from_clipboard.add_image')}</button>
</div>
</div>

6
app/assets/stylesheets/dashboard/current_tasks.scss
View file

@ -115,12 +115,6 @@
}
}
}
&.filters-applied::after {
@include red-dot;
right: .45em;
top: .4em;
}
}
.widget-placeholder {

1
app/assets/stylesheets/experiment/table.scss
View file

@ -309,6 +309,7 @@
img {
border-radius: 50%;
width: 24px;
}
}
}

2
app/assets/stylesheets/experiments.scss
View file

@ -283,7 +283,7 @@
}
&.list {
grid-auto-rows: 1px minmax(4em, auto);
grid-auto-rows: 1px minmax(3em, auto);
grid-template-columns: max-content minmax(100px, auto) minmax(80px, max-content) repeat(calc(var(--list-columns-number) - 4), minmax(100px, auto)) max-content;
grid-template-rows: 3em;

23
app/assets/stylesheets/my_modules/protocols/index.scss
View file

@ -75,7 +75,7 @@
.task-section-caret {
align-items: center;
color: $color-volcano;
color: var(--sn-black);
display: inline-flex;
gap: .5rem;
padding: .5em;
@ -355,7 +355,7 @@
right: 0;
text-align: right;
top: 0;
width: 120px;
width: 130px;
z-index: 20;
&.hidden {
@ -363,24 +363,13 @@
}
a {
align-items: center;
color: inherit;
display: inline-block;
line-height: 36px;
display: inline-flex;
gap: .25rem;
height: 36px;
opacity: .7;
text-decoration: none;
i {
float: left;
font-size: 16px;
line-height: 36px;
margin-right: 5px;
padding-top: 1px;
}
span {
float: left;
line-height: 36px;
}
}
}
}

4
app/assets/stylesheets/projects.scss
View file

@ -929,7 +929,7 @@ li.module-hover {
}
&.list {
grid-auto-rows: minmax(4em, auto) 1px;
grid-auto-rows: minmax(3em, auto) 1px;
grid-template-columns: max-content repeat(calc(var(--list-columns-number) - 2), minmax(100px, auto)) max-content max-content;
.projects-group {
@ -1186,7 +1186,7 @@ li.module-hover {
&.list {
--list-columns-number: 8;
grid-auto-rows: minmax(4em, auto) 1px;
grid-auto-rows: minmax(3em, auto) 1px;
grid-template-columns: max-content repeat(calc(var(--list-columns-number) - 3), minmax(100px, auto)) max-content max-content;
.card {

7
app/assets/stylesheets/repositories.scss
View file

@ -387,18 +387,19 @@
.permission-selector {
display: flex;
flex-basis: 55px;
flex-basis: 60px;
flex-shrink: 0;
justify-content: center;
}
.team-selector {
align-items: center;
align-items: baseline;
display: flex;
flex-grow: 1;
.sci-checkbox-container {
margin-right: 5px;
margin-right: 8px;
top: 3px;
}
}

2
app/assets/stylesheets/repository/repository_toolbar.scss
View file

@ -104,7 +104,7 @@
.toolbar-right-block {
display: flex;
flex-shrink: 0;
gap: .25rem;
gap: .5rem;
.active-reminders-filter {
align-items: center;

2
app/assets/stylesheets/repository_columns/index.scss
View file

@ -125,7 +125,7 @@
.repo-columns-list {
@include font-button;
height: 390px;
height: 385px;
margin-bottom: 0;
overflow-y: auto;
padding: 0;

2
app/assets/stylesheets/shared/jstree_override.scss
View file

@ -52,10 +52,12 @@
.jstree-icon {
&.root-folder {
background-image: none !important;
color: $color-volcano;
}
&.icon-folder {
background-image: none !important;
color: $brand-primary-light;
}
}

1
app/assets/stylesheets/shared/smart_annotation.scss
View file

@ -221,6 +221,7 @@
.atwho-user-container {
.atwho-user-popover {
cursor: pointer;
line-height: 1.25rem;
}
.atwho-user-popover:focus {

11
app/assets/stylesheets/shared_styles/constants/fonts.scss
View file

@ -30,6 +30,17 @@ $font-fas-plus: "\f02b";
$sn-icon-left: "\e932";
$sn-icon-right: "\e931";
/// Hack for old icons
.fas {
align-items: center;
display: inline-flex !important;
justify-content: center;
height: 24px;
width: 24px;
}
.sn-icon {
font-size: 24px !important;
vertical-align: middle;

21
app/assets/stylesheets/tailwind/buttons.css
View file

@ -43,7 +43,10 @@
@apply no-underline outline-none;
box-shadow: 0px 0px 0px 4px var(--sn-science-blue-hover);
color: var(--sn-white);
}
.btn:active {
box-shadow: none;
}
.btn:disabled,
@ -68,18 +71,22 @@
color: var(--sn-sleepy-grey);
}
.btn.btn-secondary {
.btn.btn-secondary,
.btn.btn-default {
background-color: var(--sn-white);
border: 1px solid var(--sn-light-grey);
color: var(--sn-blue);
}
.btn.btn-secondary:hover {
.btn.btn-secondary:hover,
.btn.btn-default:hover {
border: 1px solid var(--sn-blue-hover);
}
.btn.btn-secondary:disabled,
.btn.btn-secondary.disabled {
.btn.btn-secondary.disabled,
.btn.btn-default:disabled,
.btn.btn-default.disabled {
background-color: var(--sn-white);
color: var(--sn-sleepy-grey);
}
@ -93,6 +100,14 @@
color: var(--sb-black);
}
.btn.btn-light.btn-white {
color: var(--sb-white);
}
.btn.btn-light.btn-white:hover {
background-color: transparent;
}
.btn.btn-light:hover {
background-color: var(--sn-super-light-grey);
}

1
app/assets/stylesheets/themes/main_navigation.scss
View file

@ -231,7 +231,6 @@
}
.col-sm-4 {
padding-left: 5rem;
padding-top: .5rem;
word-break: break-word;
}

4
app/datatables/teams_datatable.rb
View file

@ -93,14 +93,14 @@ class TeamsDatatable < CustomDatatable
</span>"
owner_role = UserRole.find_by(name: UserRole.public_send('owner_role').name)
if current_user_team_role(record)&.owner? && record.user_assignments.where(user_role: owner_role).none?
button.prepend('<div class="btn btn-default btn-xs"
button.prepend('<div class="btn btn-secondary btn-xs"
type="button" disabled="disabled">')
button << '</div>'
else
button = link_to(
button.html_safe,
leave_user_team_html_path(current_user_team_assignment(record), format: :json, leave: true),
remote: true, class: 'btn btn-default btn-xs', type: 'button',
remote: true, class: 'btn btn-secondary btn-xs', type: 'button',
data: { action: 'leave-user-team' }
)
end

2
app/helpers/results_helper.rb
View file

@ -47,7 +47,7 @@ module ResultsHelper
if result.is_asset
'sn-icon sn-icon-files'
elsif result.is_text
'fas fa-font'
'sn-icon sn-icon-result-text'
elsif result.is_table
'sn-icon sn-icon-tables'
else

5
app/javascript/packs/application.js
View file

@ -18,3 +18,8 @@ $(document).on('click', '.sci--layout--menu-item[data-submenu=true]', (e) => {
$(document).on('click', '.sci--layout--navigator-open', (e) => {
navigatorContainer.$data.navigatorCollapsed = false
});
$(document).on('click', '.btn', function() {
$(this).blur();
});

2
app/javascript/vue/protocol/attachments.vue
View file

@ -8,7 +8,7 @@
<div ref="actionsDropdownButton" class="dropdown sci-dropdown">
<button class="btn btn-light dropdown-toggle" type="button" id="dropdownAttachmentsOptions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span>{{ i18n.t("protocols.steps.attachments.manage") }}</span>
<span class="caret pull-right"></span>
<span class="sn-icon sn-icon-down"></span>
</button>
<ul ref="actionsDropdown" class="dropdown-menu dropdown-menu-right dropdown-attachment-options"
aria-labelledby="dropdownAttachmentsOptions"

2
app/javascript/vue/protocol/step.vue
View file

@ -86,7 +86,7 @@
{{ i18n.t('protocols.steps.insert.checklist') }}
</li>
<li class="action" @click="createElement('text')">
<i class="fas fa-font"></i>
<i class="sn-icon sn-icon-result-text"></i>
{{ i18n.t('protocols.steps.insert.text') }}
</li>
<li v-if="attachmentsReady" class="action" @click="showFileModal = true">

2
app/javascript/vue/protocol/step_attachments/clipboard_paste_modal.vue
View file

@ -22,7 +22,7 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" @click="cancel">{{i18n.t('general.cancel')}}</button>
<button type="button" class="btn btn-secondary" @click="cancel">{{i18n.t('general.cancel')}}</button>
<button type="button" class="btn btn-success" @click="uploadImage">{{i18n.t('assets.from_clipboard.add_image')}}</button>
</div>
</div>

2
app/javascript/vue/protocol/step_attachments/context_menu.vue
View file

@ -1,6 +1,6 @@
<template>
<div class="dropdown asset-context-menu" ref="menu">
<button class="btn btn-light dropdown-toggle icon-btn" type="button" id="dropdownAssetContextMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<button class="btn btn-light btn-xs dropdown-toggle icon-btn" type="button" id="dropdownAssetContextMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<i class="sn-icon sn-icon-more-hori"></i>
</button>

2
app/javascript/vue/protocol/step_attachments/delete_modal.vue
View file

@ -13,7 +13,7 @@
<p>{{ i18n.t('assets.delete_file_modal.description_2') }}</p>
</div>
<div class="modal-footer">
<button type='button' class='btn btn-default' @click="cancel">
<button type='button' class='btn btn-secondary' @click="cancel">
{{ i18n.t('general.cancel') }}
</button>
<button type='button' class='btn btn-danger' @click="confirm">

2
app/javascript/vue/protocol/step_attachments/file_modal.vue
View file

@ -63,7 +63,7 @@
</div>
</div>
<div class="modal-footer">
<button type='button' class='btn btn-default' @click="cancel">
<button type='button' class='btn btn-secondary' @click="cancel">
{{ i18n.t('general.cancel') }}
</button>
</div>

2
app/javascript/vue/repository_print_modal/container.vue
View file

@ -62,7 +62,7 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"> {{ i18n.t('general.cancel') }}</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"> {{ i18n.t('general.cancel') }}</button>
<button class="btn btn-primary" @click="submitPrint">
{{ i18n.t(`repository_row.modal_print_label.${labelTemplateError ? 'print_anyway' : 'print_label'}`) }}
</button>

2
app/views/access_permissions/modals/_edit_modal.html.erb
View file

@ -21,7 +21,7 @@
<% if assignable.top_level_assignable? %>
<div class="modal-footer">
<%= link_to new_assignment_path, class: 'btn btn-default pull-right', data: { action: 'swap-remote-container', target: '#user_assignments_modal' } do %>
<%= link_to new_assignment_path, class: 'btn btn-secondary pull-right', data: { action: 'swap-remote-container', target: '#user_assignments_modal' } do %>
<i class="sn-icon sn-icon-new-task"></i>
<%= t('access_permissions.grant_access') %>
<% end %>

2
app/views/activities/index.html.erb
View file

@ -14,7 +14,7 @@
</ul>
<% if @vars[:more_activities_url].present? && @vars[:page] == 1 %>
<div class="text-center">
<a class="btn btn-default btn-more-activities"
<a class="btn btn-secondary btn-more-activities"
href="<%= @vars[:more_activities_url] %>"
data-remote="true">
<%= t'activities.index.more_activities' %></a>

2
app/views/assets/_asset_context_menu.html.erb
View file

@ -1,6 +1,6 @@
<% if can_manage_asset?(asset) %>
<div class="dropdown asset-context-menu">
<button class="btn btn-light dropdown-toggle icon-btn" type="button" id="dropdownAssetContextMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<button class="btn btn-light btn-xs dropdown-toggle icon-btn" type="button" id="dropdownAssetContextMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<i class="sn-icon sn-icon-more-hori"></i>
</button>
<ul class="dropdown-menu dropdown-menu-right"

2
app/views/assets/_asset_delete_modal.html.erb
View file

@ -12,7 +12,7 @@
<p><%= t('assets.delete_file_modal.description_2') %></p>
</div>
<div class="modal-footer">
<button type='button' class='btn btn-default' data-dismiss='modal'>
<button type='button' class='btn btn-secondary' data-dismiss='modal'>
<%= t('general.cancel')%>
</button>
<button type='button' class='btn btn-danger confirm-button' data-dismiss='modal'>

6
app/views/assets/wopi/_create_wopi_file_modal.html.erb
View file

@ -30,19 +30,19 @@
<label><%= t('assets.create_wopi_file.type_select_label') %></label>
<div class="btn-group btn-group-toggle btn-group-justified"
data-toggle="buttons">
<label class="btn btn-default active" id="word-btn">
<label class="btn btn-secondary active" id="word-btn">
<%= image_tag 'office/ms-word-active.svg', class: 'act' %>
<%= image_tag 'office/ms-word-inactive.svg', class: 'inactive' %>
<input type="radio" name="file_type" value='docx' checked>
<span><%= t('assets.create_wopi_file.ms_word').html_safe %></span>
</label>
<label class="btn btn-default" id="excel-btn">
<label class="btn btn-secondary" id="excel-btn">
<%= image_tag 'office/ms-excel-active.svg', class: 'act' %>
<%= image_tag 'office/ms-excel-inactive.svg', class: 'inactive' %>
<input type="radio" name="file_type" value='xlsx'>
<span><%= t('assets.create_wopi_file.ms_excel').html_safe %></span>
</label>
<label class="btn btn-default" id='powerpoint-btn'>
<label class="btn btn-secondary" id='powerpoint-btn'>
<%= image_tag 'office/ms-pwrpt-active.svg', class: 'act' %>
<%= image_tag 'office/ms-pwrpt-inactive.svg', class: 'inactive' %>
<input type="radio" name="file_type" value='pptx'>

16
app/views/canvas/_edit.html.erb
View file

@ -11,13 +11,15 @@
<%= bootstrap_form_tag url: canvas_experiment_url, method: "post", html: {class: "canvas-header"} do |f| %>
<% if @experiment_managable %>
<%=link_to "", type: "button", class: "btn btn-primary", id: "canvas-new-module" do %>
<span class="hbtn-default">
<span class="sn-icon sn-icon-new-task"></span>
<%= t("experiments.canvas.edit.new_module") %>
</span>
<span class="hbtn-hover">
<em class="hidden-xs"><%= t("experiments.canvas.edit.new_module_hover") %></em>
<span class="visible-xs-inline"><%= t("experiments.canvas.edit.new_module") %></span>
<span class="sn-icon sn-icon-new-task"></span>
<span>
<span class="hbtn-secondary">
<%= t("experiments.canvas.edit.new_module") %>
</span>
<span class="hbtn-hover">
<em class="hidden-xs"><%= t("experiments.canvas.edit.new_module_hover") %></em>
<span class="visible-xs-inline"><%= t("experiments.canvas.edit.new_module") %></span>
</span>
</span>
<% end %>
<% end %>

2
app/views/canvas/edit/modal/_new_module.html.erb
View file

@ -11,7 +11,7 @@
<% end %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-success" data-dismiss="modal" data-action="confirm"><%=t "experiments.canvas.edit.modal_new_module.confirm" %></button>
</div>
</div>

8
app/views/canvas/full_zoom/_my_module.html.erb
View file

@ -35,7 +35,7 @@
<div class="panel-heading">
<h3 class="panel-title">
<%= link_to my_module.name, protocols_my_module_path(my_module,
<%= link_to my_module.name, protocols_my_module_path(my_module,
view_mode: my_module.archived_branch? ? 'archived' : 'active'),
title: my_module.name, class: 'my-module-title' %>
</h3>
@ -79,7 +79,7 @@
<div class="panel-footer panel-footer-scinote buttons-container">
<ul class="nav nav-tabs nav-tabs-less" role="tablist">
<li role="presentation">
<a class="btn btn-link task-card-view-users" href="<%= designated_users_my_module_user_my_modules_url(my_module_id: my_module.id, format: :json) %>" aria-controls="<%= my_module.id %>_users" role="tab" data-remote="true">
<a class="btn btn-light task-card-view-users" href="<%= designated_users_my_module_user_my_modules_url(my_module_id: my_module.id, format: :json) %>" aria-controls="<%= my_module.id %>_users" role="tab" data-remote="true">
<span class="sn-icon sn-icon-users" aria-hidden="true"></span>
<span class="badge badge-indicator users-badge-indicator <%= 'hidden' unless my_module.designated_users_count.positive? %>"
data-linked-id="<%= my_module.id %>">
@ -88,12 +88,12 @@
</a>
</li>
<li role="presentation">
<a class="btn btn-link task-card-view-activities" href="<%= activities_my_module_url(id: my_module.id) %>" aria-controls="<%= my_module.id %>_activities" role="tab">
<a class="btn btn-light task-card-view-activities" href="<%= activities_my_module_url(id: my_module.id) %>" aria-controls="<%= my_module.id %>_activities" role="tab">
<span class="sn-icon sn-icon-activities" aria-hidden="true"></span>
</a>
</li>
<li role="presentation">
<a href="#" class="btn btn-link open-comments-sidebar" tabindex=0
<a href="#" class="btn btn-light open-comments-sidebar" tabindex=0
data-object-type="MyModule" data-object-id="<%= my_module.id %>">
<span class="sn-icon sn-icon-comments" aria-hidden="true"></span>
<span id="comment-count-<%= my_module.id %>" class="badge badge-indicator comments-badge-indicator <%= 'hidden' unless my_module.task_comments_count.positive? %>">

2
app/views/doorkeeper/authorizations/new.html.erb
View file

@ -34,7 +34,7 @@
<%= hidden_field_tag :scope, @pre_auth.scope %>
<%= hidden_field_tag :code_challenge, @pre_auth.code_challenge %>
<%= hidden_field_tag :code_challenge_method, @pre_auth.code_challenge_method %>
<%= submit_tag t('general.cancel'), class: "btn btn-default" %>
<%= submit_tag t('general.cancel'), class: "btn btn-secondary" %>
<% end %>
</div>
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 text-left doorkeeper-actions-right">

2
app/views/experiments/module_archive/_my_module.html.erb
View file

@ -3,7 +3,7 @@
<div class="panel-heading">
<div class="dropdown pull-right">
<button class="btn btn-link dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<button class="btn btn-light dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="caret"></span>
</button>
<% my_module_form = nil %>

12
app/views/global_activities/_side_filters.html.erb
View file

@ -18,12 +18,12 @@
<h6 class="date clear"><%= t('global_activities.index.clear') %></h6>
<div class="date-selector">
<div class="hot-buttons">
<div class="hot-button btn btn-default" data-period="today"><%= t('global_activities.index.today') %></div>
<div class="hot-button btn btn-default" data-period="yesterday"><%= t('global_activities.index.yesterday') %></div>
<div class="hot-button btn btn-default" data-period="this_week"><%= t('global_activities.index.this_week') %></div>
<div class="hot-button btn btn-default" data-period="last_week"><%= t('global_activities.index.last_week') %></div>
<div class="hot-button btn btn-default" data-period="this_month"><%= t('global_activities.index.this_month') %></div>
<div class="hot-button btn btn-default" data-period="last_month"><%= t('global_activities.index.last_month') %></div>
<div class="hot-button btn btn-secondary" data-period="today"><%= t('global_activities.index.today') %></div>
<div class="hot-button btn btn-secondary" data-period="yesterday"><%= t('global_activities.index.yesterday') %></div>
<div class="hot-button btn btn-secondary" data-period="this_week"><%= t('global_activities.index.this_week') %></div>
<div class="hot-button btn btn-secondary" data-period="last_week"><%= t('global_activities.index.last_week') %></div>
<div class="hot-button btn btn-secondary" data-period="this_month"><%= t('global_activities.index.this_month') %></div>
<div class="hot-button btn btn-secondary" data-period="last_month"><%= t('global_activities.index.last_month') %></div>
</div>
<div class="to">
<%= render partial: "date_picker", locals: { id: 'to-date', use_current: 'false', placeholder: t('global_activities.index.to_label'), label: nil } %>

2
app/views/global_activities/index.html.erb
View file

@ -17,7 +17,7 @@
<%= render partial: "activity_list.html.erb" %>
</div>
<div class="text-center">
<a class="btn btn-default btn-more-activities <%= 'hidden' unless @next_page %>"
<a class="btn btn-secondary btn-more-activities <%= 'hidden' unless @next_page %>"
data-next-page="<%= @next_page %>">
<%= t'activities.index.more_activities' %>
</a>

2
app/views/layouts/sign_in_halt.html.erb
View file

@ -31,7 +31,7 @@
</div>
<% if user_signed_in? %>
<div class="pull-right sign-in-halt-logout-button">
<%= link_to main_app.destroy_user_session_path, class: 'btn btn-default', method: :delete do %>
<%= link_to main_app.destroy_user_session_path, class: 'btn btn-secondary', method: :delete do %>
<%= t('nav.user.logout') %>
<% end %>
</div>

16
app/views/my_module_tags/_index_edit.html.erb
View file

@ -7,22 +7,22 @@
<% @my_module_tags.each_with_index do |mmt, i| tag = mmt.tag %>
<li class="list-group-item" style="background-color: <%= tag.color %>" data-color="<%= tag.color %>" data-tag-id="<%= tag.id %>" data-name="<%= tag.name %>">
<div class="row tag-show">
<div class="row tag-show flex items-center">
<div class="col-xs-6 col-lg-8">
<h4><%= tag.name %></h4>
</div>
<div class="pull-right" data-view-mode="active">
<div class="ml-auto flex items-center pr-1.5" data-view-mode="active">
<% if can_manage_my_module?(@my_module) %>
<%= link_to "", remote: true, class: 'btn btn-link edit-tag-link', title: t("experiments.canvas.modal_manage_tags.edit_tag") do %>
<%= link_to "", remote: true, class: 'btn btn-light btn-sm edit-tag-link btn-white', title: t("experiments.canvas.modal_manage_tags.edit_tag") do %>
<span class="sn-icon sn-icon-edit"></span>
<% end %>
<%= link_to my_module_my_module_tag_path(@my_module, mmt, format: :json), method: :delete, remote: true, class: 'btn btn-link remove-tag-link', title: t("experiments.canvas.modal_manage_tags.remove_tag", module: @my_module.name), data: {tag_id: tag.id} do %>
<%= link_to my_module_my_module_tag_path(@my_module, mmt, format: :json), method: :delete, remote: true, class: 'btn btn-light remove-tag-link btn-sm btn-white', title: t("experiments.canvas.modal_manage_tags.remove_tag", module: @my_module.name), data: {tag_id: tag.id} do %>
<span class="sn-icon sn-icon-close"></span>
<% end %>
<%= bootstrap_form_for tag, remote: true, url: project_tag_path(@my_module.experiment.project, tag, format: :json), data: {tag_id: tag.id}, method: :delete, html: { class: "delete-tag-form"} do |f| %>
<%= hidden_field_tag :my_module_id, @my_module.id %>
<%= f.button class: 'btn btn-link delete-tag-link', title: t("experiments.canvas.modal_manage_tags.delete_tag"), data: { confirm: t("experiments.canvas.modal_manage_tags.delete_tag_confirmation") } do %>
<span class="sn-icon sn-icon-delete-alt"></span>
<%= f.button class: 'btn btn-light delete-tag-link btn-sm btn-white', title: t("experiments.canvas.modal_manage_tags.delete_tag"), data: { confirm: t("experiments.canvas.modal_manage_tags.delete_tag_confirmation") } do %>
<span class="sn-icon sn-icon-delete"></span>
<% end %>
<% end %>
<% end %>
@ -40,10 +40,10 @@
locals: { name: :color, colors: Constants::TAG_COLORS,
classes: "edit-tag-color", styles: "",
object_name: :tag} %>
<%= f.button class: "btn btn-link save-tag-link", title: t("experiments.canvas.modal_manage_tags.save_tag") do %>
<%= f.button class: "btn btn-light save-tag-link", title: t("experiments.canvas.modal_manage_tags.save_tag") do %>
<span class="sn-icon sn-icon-check"></span>
<% end %>
<%= link_to "", remote: true, class: 'btn btn-link cancel-tag-link', title: t("experiments.canvas.modal_manage_tags.cancel_tag") do %>
<%= link_to "", remote: true, class: 'btn btn-light cancel-tag-link', title: t("experiments.canvas.modal_manage_tags.cancel_tag") do %>
<span class="sn-icon sn-icon-close"></span>
<% end %>
</div>

4
app/views/my_modules/_result.html.erb
View file

@ -1,7 +1,7 @@
<div class="result">
<div class="result-icon">
<% if result.is_text %>
<span class="fas fa-font"></span>
<span class="sn-icon sn-icon-result-text"></span>
<% elsif result.is_table %>
<span class="sn-icon sn-icon-tables"></span>
<% elsif result.is_asset %>
@ -22,7 +22,7 @@
data-form-id="result-archive-form-<%= result.id %>"
data-confirm-text="<%= t('my_modules.results.archive_confirm') %>"
title="<%= t'my_modules.results.options.archive_title' %>">
<span class="fas fa-briefcase"></span>
<span class="sn-icon sn-icon-archive"></span>
</a>
<%= form_for :result, url: result_path_of_type(result), method: :patch, html: {id: 'result-archive-form-' + result.id.to_s } do |f| %>
<%= f.hidden_field :archived, value: true %>

2
app/views/my_modules/activities.html.erb
View file

@ -31,7 +31,7 @@
<%= render partial: "global_activities/activity_list.html.erb" %>
</div>
<div class="text-center">
<a class="btn btn-default btn-more-activities <%= 'hidden' unless @next_page %>"
<a class="btn btn-secondary btn-more-activities <%= 'hidden' unless @next_page %>"
data-next-page="<%= @next_page %>">
<%= t'activities.index.more_activities' %>
</a>

12
app/views/my_modules/activities/_side_filters.html.erb
View file

@ -6,12 +6,12 @@
<h6 class="date clear"><%= t('global_activities.index.clear') %></h6>
<div class="date-selector">
<div class="hot-buttons">
<div class="hot-button btn btn-default" data-period="today"><%= t('global_activities.index.today') %></div>
<div class="hot-button btn btn-default" data-period="yesterday"><%= t('global_activities.index.yesterday') %></div>
<div class="hot-button btn btn-default" data-period="this_week"><%= t('global_activities.index.this_week') %></div>
<div class="hot-button btn btn-default" data-period="last_week"><%= t('global_activities.index.last_week') %></div>
<div class="hot-button btn btn-default" data-period="this_month"><%= t('global_activities.index.this_month') %></div>
<div class="hot-button btn btn-default" data-period="last_month"><%= t('global_activities.index.last_month') %></div>
<div class="hot-button btn btn-secondary" data-period="today"><%= t('global_activities.index.today') %></div>
<div class="hot-button btn btn-secondary" data-period="yesterday"><%= t('global_activities.index.yesterday') %></div>
<div class="hot-button btn btn-secondary" data-period="this_week"><%= t('global_activities.index.this_week') %></div>
<div class="hot-button btn btn-secondary" data-period="last_week"><%= t('global_activities.index.last_week') %></div>
<div class="hot-button btn btn-secondary" data-period="this_month"><%= t('global_activities.index.this_month') %></div>
<div class="hot-button btn btn-secondary" data-period="last_month"><%= t('global_activities.index.last_month') %></div>
</div>
<div class="to">
<%= render partial: "global_activities/date_picker", locals: { id: 'to-date', use_current: 'false', placeholder: t('global_activities.index.to_label'), label: nil } %>

2
app/views/my_modules/archive/_result.html.erb
View file

@ -1,7 +1,7 @@
<div class="panel panel-default panel-archive">
<div class="dropdown pull-right">
<button class="btn btn-link dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<button class="btn btn-light dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="caret"></span>
</button>
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu1">

28
app/views/my_modules/modals/_manage_due_date_modal.html.erb
View file

@ -1,15 +1,15 @@
<div class="modal" id="manage-module-due-date-modal" tabindex="-1" role="dialog" aria-labelledby="manage-module-due-date-modal-label">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="manage-module-due-date-modal-label"></h4>
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-success" data-action="submit"><%=t "general.save" %></button>
</div>
</div>
</div>
<div class="modal" id="manage-module-due-date-modal" tabindex="-1" role="dialog" aria-labelledby="manage-module-due-date-modal-label">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="manage-module-due-date-modal-label"></h4>
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-success" data-action="submit"><%=t "general.save" %></button>
</div>
</div>
</div>
</div>

2
app/views/my_modules/protocols/_confirm_link_update_modal.html.erb
View file

@ -10,7 +10,7 @@
<p class="warning"><%= t('my_modules.protocols.confirm_link_update_modal.warning') %></p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel") %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t("general.cancel") %></button>
<button type="button" class="btn btn-success" data-action="submit"></button>
</div>
</div>

2
app/views/my_modules/repositories/_consume_stock_modal.html.erb
View file

@ -28,7 +28,7 @@
<div class="modal-footer">
<button type="button"
id="cancel"
class="btn btn-default cancel-consumption"><%=t('general.cancel') %></button>
class="btn btn-secondary cancel-consumption"><%=t('general.cancel') %></button>
<%= submit_tag t('my_modules.repository.stock_warning_modal.consume_anyway'), class: "btn btn-primary confirm-consumption-button"%>
</div>
</div>

2
app/views/my_modules/repositories/_consume_stock_modal_content.html.erb
View file

@ -54,7 +54,7 @@
<div class="modal-footer">
<button type="button"
id="cancel"
class="btn btn-default"
class="btn btn-secondary"
tabindex="4"
data-dismiss="modal"><%=t('general.cancel') %></button>
<%= submit_tag t('general.save'), class: "btn btn-primary update-consumption-button", disabled: @module_repository_row.stock_consumption.nil?, tabindex: 1 %>

2
app/views/my_modules/results.html.erb
View file

@ -26,7 +26,7 @@
</a>
<ul class="dropdown-menu add-result-dropdown" aria-labelledby="add-result-button">
<li id="new-result-text" data-href="<%= new_my_module_result_text_path(my_module_id: @my_module.id, page: params[:page], order: params[:order]) %>">
<i class="fas fa-font"></i><%= t("my_modules.results.new_text_result") %>
<i class="sn-icon sn-icon-result-text"></i><%= t("my_modules.results.new_text_result") %>
</li>
<li id="new-result-table" data-href="<%= new_my_module_result_table_path(my_module_id: @my_module.id, page: params[:page], order: params[:order]) %>">
<i class="sn-icon sn-icon-tables"></i><%= t("my_modules.results.new_table_result") %>

2
app/views/projects/experiment_archive/_experiment.html.erb
View file

@ -3,7 +3,7 @@
<div class="panel-heading">
<div class="dropdown pull-right">
<button class="btn btn-link dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<button class="btn btn-light dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="caret"></span>
</button>
</div>

4
app/views/projects/index/_toolbar.html.erb
View file

@ -31,7 +31,7 @@
<%= button_to(view_type_projects_path(format: :json),
method: :put,
remote: true,
class: "btn btn-light button-to #{ @current_view_type == 'table' ? 'selected' : ''} prevent-shrink",
class: "btn btn-light justify-start button-to #{ @current_view_type == 'table' ? 'selected' : ''} prevent-shrink",
form_class: 'change-projects-view-type-form',
params: { projects: { view_type: 'table' } }) do %>
<span class="view-switch-list-span table-switch"><%= t('toolbar.table_view') %></span>
@ -41,7 +41,7 @@
<%= button_to(view_type_projects_path(format: :json),
method: :put,
remote: true,
class: "btn btn-light button-to #{ @current_view_type == 'cards' ? 'selected' : ''} prevent-shrink",
class: "btn btn-light justify-start button-to #{ @current_view_type == 'cards' ? 'selected' : ''} prevent-shrink",
form_class: 'change-projects-view-type-form',
params: { projects: { view_type: 'cards' } }) do %>
<span class="view-switch-list-span cards-switch"><%= t('toolbar.cards_view') %></span>

2
app/views/projects/index/modals/_project_folder_delete.html.erb
View file

@ -12,7 +12,7 @@
<p><%= t('projects.index.modal_delete_folders.description_2') %></p>
</div>
<div class="modal-footer">
<button type='button' class='btn btn-default' data-dismiss='modal'><%= t('general.cancel')%></button>
<button type='button' class='btn btn-secondary' data-dismiss='modal'><%= t('general.cancel')%></button>
<%= button_to t('projects.index.modal_delete_folders.confirm_button'),
destroy_project_folders_path,
class: 'btn btn-danger',

2
app/views/protocol_importers/_list_of_protocol_cards.html.erb
View file

@ -5,7 +5,7 @@
<% if protocols[:pagination][:current_page] + 1 <= protocols[:pagination][:total_pages] %>
<div class='show-more-protocols-btn text-center'>
<button class='btn btn-default'
<button class='btn btn-secondary'
data-next-page-id='<%= protocols[:pagination][:current_page] + 1 %>'>
<%= t('protocol_importers.show_more_button.title') %>
</button>

12
app/views/protocols/import_export/_import_modal.html.erb
View file

@ -55,12 +55,12 @@
</div>
<div class="modal-footer">
<div data-role="multiple-protocols-buttons">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel") %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t("general.cancel") %></button>
<div class="btn-group" role="group">
<a href="#" class="btn btn-default" data-action="jump-to-first-protocol"><i class="fas fa-fast-backward"></i></a>
<a href="#" class="btn btn-default" data-action="jump-to-previous-protocol"><i class="fas fa-backward"></i></a>
<a href="#" class="btn btn-default" data-action="jump-to-next-protocol"><i class="fas fa-forward"></i></a>
<a href="#" class="btn btn-default" data-action="jump-to-last-protocol"><i class="fas fa-fast-forward"></i></a>
<a href="#" class="btn btn-secondary" data-action="jump-to-first-protocol"><i class="fas fa-fast-backward"></i></a>
<a href="#" class="btn btn-secondary" data-action="jump-to-previous-protocol"><i class="fas fa-backward"></i></a>
<a href="#" class="btn btn-secondary" data-action="jump-to-next-protocol"><i class="fas fa-forward"></i></a>
<a href="#" class="btn btn-secondary" data-action="jump-to-last-protocol"><i class="fas fa-fast-forward"></i></a>
</div>
<div class="btn-group" role="group">
<div data-role="import-all">
@ -73,7 +73,7 @@
</div>
</div>
<div data-role="single-protocol-buttons">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel") %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t("general.cancel") %></button>
<div class="btn-group" role="group">
<button type="submit" class="btn btn-success" data-action="import-current"><%= t("protocols.import_export.import_modal.import") %></button>
</div>

2
app/views/protocols/index/_general_toolbar.html.erb
View file

@ -20,7 +20,7 @@
<ul class="dropdown-menu">
<li>
<a class="btn-link-alt btn-default-link btn-open-file" <%= can_create_protocols_in_repository?(@current_team) ? 'data-action="import"' : 'disabled="disabled"' %>>
<a class="btn-link-alt btn-secondary-link btn-open-file" <%= can_create_protocols_in_repository?(@current_team) ? 'data-action="import"' : 'disabled="disabled"' %>>
<span><%= t("protocols.index.import_alt") %></span>
<input type="file" value="" accept=".eln" data-role="import-file-input"
data-team-id="<%= @current_team.id %>" data-import-url="<%= import_protocols_path %>">

2
app/views/protocols/index/_linked_children_modal.html.erb
View file

@ -8,7 +8,7 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.close" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.close" %></button>
</div>
</div>
</div>

2
app/views/reports/index.html.erb
View file

@ -54,7 +54,7 @@
<%=t "projects.reports.index.modal_delete.message" %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.button t("projects.reports.index.modal_delete.delete"), class: "btn btn-danger", id: "confirm-delete-reports-btn", name: nil %>
</div>
</div>

2
app/views/repositories/_delete_record_modal.html.erb
View file

@ -9,7 +9,7 @@
<%= t("repositories.modal_delete_record.notice") %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel")%></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t("general.cancel")%></button>
<button type="button" class="btn btn-danger delete-record-modal-button" data-dismiss="modal">
<%= t("repositories.modal_delete_record.delete") %>
</button>

2
app/views/repositories/_delete_repository_modal.html.erb
View file

@ -20,7 +20,7 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel")%></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t("general.cancel")%></button>
<%= link_to t('repositories.index.modal_delete.delete'),
team_repository_path(id: @repository),
id: "confirm-repo-delete",

2
app/views/repositories/_export_repository_modal.html.erb
View file

@ -18,7 +18,7 @@
<div><%=t 'zip_export.repository_footer_html' %></div>
</div>
<div class="modal-footer">
<button type='button' class='btn btn-default' data-dismiss='modal' id='close-modal-export-repositories'><%= t('general.cancel')%></button>
<button type='button' class='btn btn-secondary' data-dismiss='modal' id='close-modal-export-repositories'><%= t('general.cancel')%></button>
<%= f.submit t('my_modules.repository.export'), id: "export-repositories", class: "btn btn-success" %>
</div>
</div>

2
app/views/repositories/_import_repository_records_modal.html.erb
View file

@ -19,7 +19,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default close-button" data-dismiss="modal"><%= t('general.cancel')%></button>
<button type="button" class="btn btn-secondary close-button" data-dismiss="modal"><%= t('general.cancel')%></button>
<input type="submit" class="btn btn-success" value="<%= t("repositories.modal_import.upload") %>">
</div>
<% end %>

2
app/views/repositories/_parse_records_modal.html.erb
View file

@ -70,7 +70,7 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t('general.cancel')%></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('general.cancel')%></button>
<input type="submit" class="btn btn-success" value="<%= t('repositories.modal_parse.import') %>">
</div>
<% end %>

2
app/views/repositories/_save_bmt_filter_modal.html.erb
View file

@ -17,7 +17,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t('general.cancel')%></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('general.cancel')%></button>
<%= f.submit t('general.save'), class: "btn btn-success" %>
</div>
<% end %>

2
app/views/repositories/_save_repository_filter_modal.html.erb
View file

@ -16,7 +16,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t('general.cancel')%></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('general.cancel')%></button>
<button class="btn btn-success" id="saveRepositoryTableFilterButton"><%= t('general.save') %></button>
</div>
</div>

2
app/views/repositories/_toolbar_buttons.html.erb
View file

@ -26,7 +26,7 @@
</button>
<% end %>
<span id="saveCancel" data-toggle="buttons" style="display:none">
<span id="saveCancel" class="flex items-center gap-3" data-toggle="buttons" style="display:none">
<button type="button" class="btn btn-primary prevent-shrink" id="saveRecord" data-view-mode="active">
<span class="fas fa-save"></span>
<%= t("repositories.save_record") %>

2
app/views/repository_stock_values/_manage_modal_content.html.erb
View file

@ -135,7 +135,7 @@
<div class="modal-footer">
<button type="button"
id="cancel"
class="btn btn-default"
class="btn btn-secondary"
tabindex="7"
data-dismiss="modal"><%=t 'general.cancel' %></button>
<%= submit_tag t('repository_stock_values.manage_modal.save_stock'), class: "btn btn-primary update-repository-stock", tabindex: "6" %>

2
app/views/result_assets/_new.html.erb
View file

@ -4,7 +4,7 @@
<span>
<label>
<h2 class="inline-block font-normal"><%= t('assets.drag_n_drop.label_html') %></h2>
<span class="btn btn-default new-asset-upload-button">
<span class="btn btn-secondary new-asset-upload-button">
<span class="fas fa-file-upload new-asset-upload-icon"></span>
<%= t('assets.drag_n_drop.browse_label') %>
</span>

2
app/views/search/index.html.erb
View file

@ -18,7 +18,7 @@
placeholder="<%= t('nav.search') %>"
value="<%= @display_query %>">
<span class="input-group-btn">
<button class="btn btn-default" type="submit">
<button class="btn btn-secondary" type="submit">
<span class="sn-icon sn-icon-search"></span>
</button>
</span>

2
app/views/search/new.html.erb
View file

@ -8,7 +8,7 @@
<div class="input-group">
<input class="form-control" type="text" name="q" placeholder="<%= t('nav.search') %>">
<span class="input-group-btn">
<button id="search-button" class="btn btn-default" type="submit">
<button id="search-button" class="btn btn-secondary" type="submit">
<span class="sn-icon sn-icon-search"></span>
</button>
</span>

2
app/views/shared/_invite_users_modal.html.erb
View file

@ -187,7 +187,7 @@ invite_with_team_selector = type.in?(%w(invite_new_members invite_with_team_sele
</div>
</div>
<div data-role="step-results">
<button type="button" class="btn btn-default" data-dismiss="modal">
<button type="button" class="btn btn-secondary" data-dismiss="modal">
<%= t('general.close') %>
</button>
</div>

16
app/views/shared/_pdf_viewer.html.erb
View file

@ -19,16 +19,16 @@
</div>
</div>
<div class="pdf-toolbar">
<button class="btn btn-light icon-btn prev-page">
<i class="fas fa-arrow-left"></i>
<button class="btn btn-light icon-btn btn-xs prev-page">
<i class="sn-icon sn-icon-arrow-left"></i>
</button>
<div class="page-counter sci-input-container">
<input type="text" class="sci-input-field current-page" value=1>
<%= t('pdf_preview.pages.of') %>
<span class="total-page">...</span>
</div>
<button class="btn btn-light icon-btn next-page">
<i class="sn-icon sn-icon-move"></i>
<button class="btn btn-light icon-btn btn-xs next-page">
<i class="sn-icon sn-icon-arrow-right"></i>
</button>
<div class="divider"></div>
<div class="zoom-page">
@ -40,11 +40,11 @@
</select>
</div>
<div class="sci-btn-group">
<button class="btn btn-light icon-btn zoom-out">
<i class="sn-icon sn-icon-search-minus"></i>
<button class="btn btn-light icon-btn btn-xs zoom-out">
<i class="sn-icon sn-icon-minus"></i>
</button>
<button class="btn btn-light icon-btn zoom-in">
<i class="sn-icon sn-icon-search-plus"></i>
<button class="btn btn-light btn-xs icon-btn zoom-in">
<i class="sn-icon sn-icon-new-task"></i>
</button>
</div>
</div>

2
app/views/shared/comments/_comments.html.erb
View file

@ -3,7 +3,7 @@
<div class="content-comments inline_scroll_block">
<% if comments.size == per_page %>
<div class="comment-more text-center">
<a class="btn btn-default btn-more-comments-new"
<a class="btn btn-secondary btn-more-comments-new"
href="<%= more_url %>"
data-remote="true">
<%=t "general.more_comments" %>

2
app/views/user_my_modules/_index_edit.html.erb
View file

@ -23,7 +23,7 @@
<% if can_manage_my_module?(@my_module) %>
<div class="col-xs-2">
<%= link_to my_module_user_my_module_path(@my_module, umm, format: :json), method: :delete, remote: true, class: 'btn btn-link remove-user-link' do %>
<%= link_to my_module_user_my_module_path(@my_module, umm, format: :json), method: :delete, remote: true, class: 'btn btn-light remove-user-link' do %>
<span class="sn-icon sn-icon-close"></span>
<% end %>
</div>

2
app/views/users/registrations/_2fa_modal_recovery_codes_tab.html.erb
View file

@ -9,7 +9,7 @@
<div class="recovery-codes"></div>
</div>
<div class="modal-footer">
<button type="button" id="cancel" class="btn btn-default two-factor-modal-close" data-dismiss="modal"><%=t 'general.close' %></button>
<button type="button" id="cancel" class="btn btn-secondary two-factor-modal-close" data-dismiss="modal"><%=t 'general.close' %></button>
<a href download="scinote_recovery_codes.txt" class="btn btn-primary download-recovery-codes">
<%= t("users.registrations.edit.2fa_modal.step_4.download_codes") %>
</a>

2
app/views/users/registrations/edit_partials/_email.html.erb
View file

@ -8,7 +8,7 @@
<h3><%= t("users.registrations.edit.email_label") %></h3>
<div class="user-attribute">
<%= @user.email %>
<a href="#" class="btn btn-default" data-action="edit"><%= t("general.change") %></a>
<a href="#" class="btn btn-secondary" data-action="edit"><%= t("general.change") %></a>
</div>
<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
<div class="alert alert-info" style="margin-top: 15px;" role="alert">

2
app/views/users/registrations/edit_partials/_password.html.erb
View file

@ -9,7 +9,7 @@
<h3><%= t("users.registrations.edit.password_label") %></h3>
<div class="user-attribute">
••••••••••••
<a href="#" class="btn btn-default" data-action="edit"><%=t("general.change") %></a>
<a href="#" class="btn btn-secondary" data-action="edit"><%=t("general.change") %></a>
</div>
</div>
</div>

2
app/views/users/sessions/_session_end_modal.html.erb
View file

@ -27,7 +27,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">
<button type="button" class="btn btn-secondary" data-dismiss="modal">
<%= t('general.close' ) %>
</button>
<button type="button" class="btn btn-primary session-login">

17
app/views/users/settings/account/preferences/index.html.erb
View file

@ -51,12 +51,7 @@
<div class="preferences-settings-container">
<h4><%= t('notifications.title') %></h4>
<div class="row">
<div class="col-sm-2">
<span class="assignment hidden-sm">
<i class="fas fa-newspaper"></i>
</span>
</div>
<div class="col-sm-10">
<div class="col-sm-12">
<strong><%=t 'notifications.form.assignments' %></strong>
<p><%=t 'notifications.form.assignments_description' %></p>
<div class="row">
@ -78,10 +73,7 @@
</div>
</div>
<div class="row">
<div class="col-sm-2">
<%= image_tag 'icon_small/missing.svg', class: 'img-circle ' %>
</div>
<div class="col-sm-10">
<div class="col-sm-12">
<strong><%=t 'notifications.form.recent_notification' %></strong>
<p><%=t 'notifications.form.recent_notification_description' %></p>
<div class="row">
@ -103,10 +95,7 @@
</div>
</div>
<div class="row">
<div class="col-sm-2">
<span class="system-message hidden-sm"><i class="sn-icon sn-icon-updates-and-goodies" aria-hidden="true"></i></span>
</div>
<div class="col-sm-10">
<div class="col-sm-12">
<strong><%=t 'notifications.form.system_message' %></strong>
<p><%=t 'notifications.form.system_message_description' %></p>
<div class="row">

2
app/views/users/settings/teams/_description_modal.html.erb
View file

@ -13,7 +13,7 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<button type="button" class="btn btn-success" data-action="submit"><%=t "general.save" %></button>
</div>
</div>

2
app/views/users/settings/teams/_destroy_modal.html.erb
View file

@ -14,7 +14,7 @@
</div>
<div class="modal-footer">
<%= bootstrap_form_tag url: destroy_team_path(team), method: :delete do |f| %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t('general.cancel') %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('general.cancel') %></button>
<%= f.submit t("users.settings.teams.edit.modal_destroy_team.confirm"), class: "btn btn-danger" %>
<% end %>
</div>

10
app/views/users/settings/teams/_user_dropdown.html.erb
View file

@ -1,19 +1,17 @@
<% if user_assignment.user == user %>
<div class="btn btn-default btn-xs" type="button" disabled="disabled">
<span class="sn-icon sn-icon-user-menu-cog"></span>
<span class="caret"></span>
<div class="btn btn-light btn-xs icon-btn" type="button" disabled="disabled">
<span class="sn-icon sn-icon-down"></span>
</div>
<% else %>
<% id = "user-#{user_assignment.user.id}-dropdown" %>
<div class="dropdown dropdown-teams-user">
<div class="btn btn-default btn-xs"
<div class="btn btn-light icon-btn btn-xs"
type="button"
id="<%= id %>"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="true">
<span class="sn-icon sn-icon-user-menu-cog"></span>
<span class="caret"></span>
<span class="sn-icon sn-icon-down"></span>
</div>
<ul class="dropdown-menu custom-dropdown-menu dropdown-menu-right" aria-labelledby="<%= id %>">
<li class="dropdown-header">

2
app/views/users/settings/teams/new.html.erb
View file

@ -23,7 +23,7 @@
</small>
</div>
<%= link_to t('general.cancel'), teams_path, class: 'btn btn-default' %>
<%= link_to t('general.cancel'), teams_path, class: 'btn btn-secondary' %>
<%= f.submit t('users.settings.teams.new.create'), class: 'btn btn-success' %>
<% end %>

2
app/views/users/settings/user_teams/_destroy_user_team_modal.html.erb
View file

@ -12,7 +12,7 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t 'general.cancel' %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t 'general.cancel' %></button>
<button type="button"
class="btn btn-danger"
data-action="submit"><%=t 'users.settings.user_teams.destroy_uo_confirm' %></button>

2
app/views/users/settings/user_teams/_leave_user_team_modal.html.erb
View file

@ -15,7 +15,7 @@
<div class="modal-body">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t('general.cancel') %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('general.cancel') %></button>
<button type="button"
class="btn btn-danger"
data-action="submit"><%= t('users.settings.user_teams.leave_uo_confirm') %></button>

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

@ -17,7 +17,7 @@
<%= hidden_field_tag :new_avatar, "" %>
</div>
<div class="avatar-preview-container" style="display:none"></div>
<div class="btn btn-default upload-photo"><%= t('users.registrations.edit.avatar_modal.upload_button') %></div>
<div class="btn btn-secondary upload-photo"><%= t('users.registrations.edit.avatar_modal.upload_button') %></div>
</div>
<div class="option-text">
<%= t('users.registrations.edit.avatar_modal.option_text_html') %>