From 5b8e1fedf1e65c495356dabaaa9ece1d3af3e4f3 Mon Sep 17 00:00:00 2001
From: Anton Ignatov <aignatov@biosistemika.com>
Date: Mon, 26 Aug 2019 15:52:03 +0200
Subject: [PATCH] Fix markup

---
 app/assets/javascripts/global_activities/side_pane.js | 2 +-
 app/assets/stylesheets/global_activities.scss         | 2 +-
 app/assets/stylesheets/shared/dropdown_selector.scss  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/global_activities/side_pane.js b/app/assets/javascripts/global_activities/side_pane.js
index 074a85eb5..9cc1fe4a9 100644
--- a/app/assets/javascripts/global_activities/side_pane.js
+++ b/app/assets/javascripts/global_activities/side_pane.js
@@ -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);
diff --git a/app/assets/stylesheets/global_activities.scss b/app/assets/stylesheets/global_activities.scss
index ea2309350..0c50eb872 100644
--- a/app/assets/stylesheets/global_activities.scss
+++ b/app/assets/stylesheets/global_activities.scss
@@ -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;
diff --git a/app/assets/stylesheets/shared/dropdown_selector.scss b/app/assets/stylesheets/shared/dropdown_selector.scss
index d8a80d787..af21fab29 100644
--- a/app/assets/stylesheets/shared/dropdown_selector.scss
+++ b/app/assets/stylesheets/shared/dropdown_selector.scss
@@ -105,7 +105,7 @@
     .empty-dropdown {
       opacity: .6;
       padding: 7px;
-      text-align: center
+      text-align: center;
     }
 
     .dropdown-select-all {