scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-13 16:45:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixes styling in settings preferences [SCI-553]

Browse source
This commit is contained in:
zmagod 2016-10-06 13:22:44 +02:00
parent 5b3889c172
commit de00a19dd9
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -579,10 +579,10 @@ a[data-toggle="tooltip"] {
margin-top: 50px;
.col-md-4 {
margin-top: 25px;
margin-top: 15px;
}
.btn-group {
.btn-group:last-child {
margin-top: 15px;
}
@ -602,6 +602,10 @@ a[data-toggle="tooltip"] {
}
}
#reset-tutorial-btn {
margin-top: 15px;
}
// Help link
#help-link {
padding: 13px;

18
app/views/users/settings/preferences.html.erb
View file

@ -32,11 +32,13 @@
</div>
<% end %>
<% if Rails.configuration.x.enable_tutorial %>
<hr>
<strong><%= t('tutorial.title') %></strong> <br>
<%= link_to t('users.settings.preferences.tutorial.repeat_tutorial'), tutorial_path(format: :json), remote: true, class: "btn btn-primary", id: "reset-tutorial-btn" %>
<% end %>
<div class="container notification-settings-container">
<h4><%= t('notifications.title') %></h4>
<hr>
<div class="notification-settings-container">
<strong><%= t('notifications.title') %></strong>
<%= form_for(@user,
url: notifications_settings_path(format: :json),
html: { method: :post, id: 'notifications-settings-panel' },
@ -51,11 +53,11 @@
</div>
</div>
<div class="col-md-3 col-sm-3 col-text-center">
<h5 class="hidden-sm hidden-xs"><%= t('notifications.title') %></h5>
<%= f.label t('notifications.form.recent_notification'), class: 'visible-sm visible-xs'%> <br>
<%= check_box_tag :recent_notification, @user.recent_notification %> <br>
<%= f.label t('notifications.form.assignments'), class: 'visible-sm visible-xs' %>
<%= check_box_tag :assignments_notification, @user.assignments_notification %>
<%= f.label t('notifications.form.recent_notification'), class: 'visible-sm visible-xs'%>
<h5 class="hidden-sm hidden-xs"><%= t('notifications.title') %></h5><br>
<%= check_box_tag :recent_notification, @user.recent_notification %> <br>
<%= f.label t('notifications.form.assignments'), class: 'visible-sm visible-xs' %>
<%= check_box_tag :assignments_notification, @user.assignments_notification %>
</div>
</div>
<% end %>

2
config/locales/en.yml
View file

@ -1,5 +1,4 @@
en:
devise:
confirmations:
new:
@ -1471,6 +1470,7 @@ en:
short: "%H"
tutorial:
title: "Tutorial"
next: "Next"
skip_tutorial: "Skip tutorial"
end_tutorial: "End tutorial"