scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-30 20:23:14 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix markup

Browse source
This commit is contained in:
Anton Ignatov 2019-08-26 15:52:03 +02:00 committed by aignatov-bio
parent 7117b767f4
commit 5b8e1fedf1
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/global_activities/side_pane.js
View file

@ -311,7 +311,7 @@ var globalActivities = (function() {
var yesterday = new Date(new Date().setDate(today.getDate() - 1));
var weekDay = today.getDay();
var monday = new Date(new Date()
.setDate(today.getDate() - weekDay + (weekDay === 0 ? -6 : 1)));
.setDate(today.getDate() - weekDay - (weekDay === 0 ? 6 : -1)));
var lastWeekEnd = new Date(new Date().setDate(monday.getDate() - 1));
var lastWeekStart = new Date(new Date().setDate(monday.getDate() - 7));
var firstDay = new Date(today.getFullYear(), today.getMonth(), 1);

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

@ -219,7 +219,7 @@
.activity-card {
cursor: default;
margin-right: 15px;
padding: 5px 0px 5px 40px;
padding: 5px 0 5px 40px;
&:hover {
background-color: $brand-primary-light;

2
app/assets/stylesheets/shared/dropdown_selector.scss
View file

@ -105,7 +105,7 @@
.empty-dropdown {
opacity: .6;
padding: 7px;
text-align: center
text-align: center;
}
.dropdown-select-all {