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

Merge pull request #1579 from aignatov-bio/ai-sci-3205-remove-whitespace-for-dates

Browse source 
Remove white spaces for date in global activities [SCI-3205]
This commit is contained in:
aignatov-bio 2019-03-25 12:58:35 +01:00 • committed by GitHub
commit fd6e622b95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/stylesheets/global_activities.scss
View file

@ -16,6 +16,14 @@
.activities-day { .activities-day {
margin-bottom: 10px; margin-bottom: 10px;
.date-container {
max-width: 105px;
padding-right: 0;
}
.date-activities{
min-width: calc(100% - 105px);
}
} }
} }

4
app/views/global_activities/_activity_list.html.erb
View file

@ -1,6 +1,6 @@
<% @grouped_activities.each do |date, activities| %> <% @grouped_activities.each do |date, activities| %>
<div class="row activities-day"> <div class="row activities-day">
<div class="col-sm-4 col-md-2"> <div class="col-sm-4 col-md-2 date-container">
<a class="activities-group-expand-button" <a class="activities-group-expand-button"
href="javascript:void(0);" href="javascript:void(0);"
id="activities-group-<%= date %>-button" id="activities-group-<%= date %>-button"
@ -11,7 +11,7 @@
<%= l(Time.parse(date), format: :full_date) %> <%= l(Time.parse(date), format: :full_date) %>
</a> </a>
</div> </div>
<div class="col-sm-8 col-md-10"> <div class="col-sm-8 col-md-10 date-activities">
<div class="activities-counter-label"> <div class="activities-counter-label">
<strong><%= activities.length %></strong> <strong><%= activities.length %></strong>
<%= t("activities.index.#{'activity'.pluralize(activities.length)}_counter_label") %> <%= t("activities.index.#{'activity'.pluralize(activities.length)}_counter_label") %>