scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-03 21:49:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2229 from aignatov-bio/ai-sci-4111-fix-css-on-activity-page

Browse source 
Update css for global activities page [SCI-4111]
This commit is contained in:
aignatov-bio 2019-11-25 14:08:33 +01:00 committed by GitHub
commit 8f2eaaacf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 59 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,6 +51,7 @@
}
.ga-search-container {
display: none;
flex-grow: 1;
max-width: 500px;
position: relative;
@ -174,9 +175,15 @@
flex-grow: 5;
height: 100%;
overflow: hidden;
padding-top: 10px;
position: relative;
.activities-container {
height: 100%;
padding-top: 10px;
position: absolute;
width: 100%;
}
.ga-activities-list {
.activities-day {
@ -303,9 +310,15 @@
height: 100%;
margin-right: -15px;
overflow: hidden;
padding: 15px 20px;
position: relative;
.filters-container {
height: 100%;
margin-bottom: 60px;
padding: 15px 20px;
position: absolute;
}
.filter-block {
display: inline-block;
width: 100%;
@ -340,6 +353,10 @@
display: none;
}
}
&.report-block {
margin-bottom: 60px;
}
}
.date-selector {
@ -436,12 +453,27 @@
.datetime-picker-container {
position: relative;
input {
.fa-calendar-alt {
color: $color-silver-chalice;
font-size: 18px;
line-height: 34px;
position: absolute;
right: 0;
text-align: center;
top: 0;
width: 34px;
}
.calendar-input {
background-color: transparent !important;
box-shadow: none;
color: inherit;
cursor: pointer;
font-size: 13px;
padding-left: 5px;
padding-right: 34px;
position: relative;
z-index: 3;
&::placeholder {
color: $color-silver-chalice;

3
app/views/global_activities/_date_picker.html.erb
View file

@ -2,7 +2,8 @@
<% if label %>
<label class="control-label required" for="calendar-<%= id %>"><%= label %></label>
<% end %>
<input type="datetime" class="form-control" name="calendar[<%= id %>]" id="calendar-<%= id %>" readonly="" data-ts="" placeholder="<%= placeholder %>" value="<%= defined?(setDate) ? setDate : '' %>"/>
<span class="fas fa-calendar-alt"></span>
<input type="datetime" class="form-control calendar-input" name="calendar[<%= id %>]" id="calendar-<%= id %>" readonly="" data-ts="" placeholder="<%= placeholder %>" value="<%= defined?(setDate) ? setDate : '' %>"/>
<%
js_format = I18n.backend.date_format.dup
js_format.gsub!(/%-d/, 'D')

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

@ -121,7 +121,7 @@
</div>
<div class="filter-block small-left">
<div class="filter-block small-left report-block">
<h4 class="title"><%= t('global_activities.index.reports') %></h4>
<h6 class="report clear"><%= t('global_activities.index.clear') %></h6>
<div class="select-container">

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

@ -7,26 +7,30 @@
<div class="ga-bottom">
<div class="ga-main perfect-scrollbar">
<div class="no-activities-message text-center <%= 'hidden' if @grouped_activities.keys.any? %>">
<p><%= t('activities.index.no_activities_message') %></p>
<div class="ga-main">
<div class="activities-container perfect-scrollbar">
<div class="no-activities-message text-center <%= 'hidden' if @grouped_activities.keys.any? %>">
<p><%= t('activities.index.no_activities_message') %></p>
</div>
<div class="ga-activities-list"
data-activities-url="<%= global_activities_path %>"
data-starting-timestamp="<%= @starting_timestamp %>">
<%= render partial: "activity_list.html.erb" %>
</div>
<div class="text-center">
<a class="btn btn-default btn-more-activities <%= 'hidden' unless @next_page %>"
data-next-page="<%= @next_page %>">
<%= t'activities.index.more_activities' %>
</a>
</div>
<div id="ga-more-activities-placeholder" class="hidden"></div>
</div>
<div class="ga-activities-list"
data-activities-url="<%= global_activities_path %>"
data-starting-timestamp="<%= @starting_timestamp %>">
<%= render partial: "activity_list.html.erb" %>
</div>
<div class="text-center">
<a class="btn btn-default btn-more-activities <%= 'hidden' unless @next_page %>"
data-next-page="<%= @next_page %>">
<%= t'activities.index.more_activities' %>
</a>
</div>
<div id="ga-more-activities-placeholder" class="hidden"></div>
</div>
<div class="ga-side perfect-scrollbar">
<%= render partial: "side_filters" %>
<div class="ga-side">
<div class="filters-container perfect-scrollbar">
<%= render partial: "side_filters" %>
</div>
</div>
</div>