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

Restyle activities page

Browse source
This commit is contained in:
Luka Murn 2018-06-07 09:29:47 +02:00
parent 0417af716b
commit b324a2dab3
4 changed files with 8 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -765,50 +765,25 @@ ul.double-line > li {
ul.content-activities {
li.activity-item {
border-radius: .25em;
background-color: $color-white;
border: 1px solid $color-concrete;
border-bottom: 1px solid $color-concrete;
padding: 8px 0;
.activity-item-date {
min-width: 150px;
display: table-cell;
vertical-align: middle;
border-top-left-radius: .25em;
border-bottom-left-radius: .25em;
border: 3px solid $color-alto;
background-color: $color-alto;
padding-left: 10px;
padding-right: 10px;
padding: 0 10px;
vertical-align: top;
text-align: center;
}
.activity-item-text {
display: table-cell;
padding: 3px 10px;
padding: 0 10px;
text-align: justify;
}
}
}
ul.content-module-activities {
li.activity-item {
margin-bottom: 15px;
.activity-item-date {
font-size: 1.2em;
background-color: $color-alto;
border-color: $color-alto;
padding-top: 5px;
padding-bottom: 5px;
}
.activity-item-text {
padding-top: 5px;
padding-bottom: 5px;
}
}
}
.step {
.panel-heading a[data-toggle] {
color: inherit;

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

@ -3,7 +3,7 @@
<div class="content-pane">
<div class="container" id="global-activity-page">
<div>
<ul id="list-activities" class="no-style content-activities content-module-activities">
<ul id="list-activities" class="no-style content-activities">
<% if @vars[:activities].empty? %>
<li><em><%= t'activities.index.no_activities' %></em></li>
<% else %>

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

@ -1,5 +1,5 @@
<!-- Show recent activities -->
<ul id="list-activities" class="no-style content-activities content-module-activities">
<ul id="list-activities" class="no-style content-activities">
<% @activities.each do |act| %>
<%= render partial: "my_modules/activities/activity.html.erb", locals: { activity: act } %>
<% end %>

2
config/initializers/constants.rb
View file

@ -47,7 +47,7 @@ class Constants
# Comments limited query/display elements for pages
COMMENTS_SEARCH_LIMIT = 10
# Activity limited query/display elements for pages
ACTIVITY_AND_NOTIF_SEARCH_LIMIT = 10
ACTIVITY_AND_NOTIF_SEARCH_LIMIT = 20
# Maximum number of users that can be invited in a single action
INVITE_USERS_LIMIT = 20