scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 09:42:46 +08:00
Code Issues Projects Releases Packages Wiki Activity

styled notification settings button [fixes SCI-529]

Browse source
This commit is contained in:
zmagod 2016-10-04 16:12:56 +02:00
parent a68e7abc57
commit 6229e6a3a1
2 changed files with 40 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -550,9 +550,42 @@ a[data-toggle="tooltip"] {
}
.notification-settings-labels {
line-height: 2em;
margin-top: 40px;
line-height: 3em;
margin-top: 40px;
}
.notification-settings-container {
margin-top: 50px;
margin-bottom: 50px;
.col-xs-2 {
padding-top: 20px;
}
.col-xs-3 {
padding-top: 30px;
}
.btn-group {
margin-top: 15px;
}
.assignment {
background-color: $color-theme-primary;
border-radius: 50%;
color: $color-wild-sand;
font-size: 15px;
margin-left: 20px;
margin-right: 15px;
padding: 7px;
}
.img-circle {
margin-left: 20px;
margin-right: 15px;
}
}
// Help link
#help-link {
padding: 13px;

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

@ -35,20 +35,22 @@
<%= 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">
<div class="container notification-settings-container">
<h4><%= t('notifications.title') %></h4>
<%= form_for(@user,
url: notifications_settings_path(format: :json),
html: { method: :post, id: 'notifications-settings-panel' },
remote: true) do |f| %>
<div class="row">
<div class="col-xs-4 text-right">
<div class="col-xs-3">
<div class="notification-settings-labels">
<%= image_tag 'icon_small/missing.png', class: 'img-circle' %>
<%= f.label t('notifications.form.recent_notification') %> <br>
<span class="assignment"><%= fa_icon 'newspaper-o' %></span>
<%= f.label t('notifications.form.assignments') %>
</div>
</div>
<div class="col-xs-8">
<div class="col-xs-2 text-center">
<h5><%= t('notifications.title') %></h5>
<%= check_box_tag :recent_notification, @user.recent_notification %> <br>
<%= check_box_tag :assignments_notification, @user.assignments_notification %>