From e8a4fd5360abb0b09fb5fe15506654e80f695c85 Mon Sep 17 00:00:00 2001
From: Jure Grabnar <jgrabnar@biosistemika.com>
Date: Fri, 29 Mar 2019 08:18:15 +0100
Subject: [PATCH 1/3] Fix date label

Closes SCI-3226
---
 app/assets/javascripts/global_activities/side_pane.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/global_activities/side_pane.js b/app/assets/javascripts/global_activities/side_pane.js
index 1156711fc..f279b0ccd 100644
--- a/app/assets/javascripts/global_activities/side_pane.js
+++ b/app/assets/javascripts/global_activities/side_pane.js
@@ -199,13 +199,14 @@ $(function() {
     updateRunning = false;
     GlobalActivitiesUpdateTopPaneTags();
     reloadActivities();
+    resetHotButtonsBackgroundColor();
   });
 
   $('#calendar-to-date').on('dp.change', function(e) {
     var dateContainer = $('.ga-side .date-selector.filter-block');
     if (!updateRunning) {
       $('#calendar-from-date').data('DateTimePicker').minDate(e.date);
-      dateContainer[0].dataset.periodSelect = $('#calendar-from-date').val() + ' - ' + $('#calendar-to-date').val();
+      dateContainer[0].dataset.periodSelect = $('#calendar-to-date').val() + ' - ' + $('#calendar-from-date').val();
       GlobalActivitiesUpdateTopPaneTags();
       reloadActivities();
       resetHotButtonsBackgroundColor();
@@ -216,7 +217,7 @@ $(function() {
     var dateContainer = $('.ga-side .date-selector.filter-block');
     if (!updateRunning) {
       $('#calendar-to-date').data('DateTimePicker').maxDate(e.date);
-      dateContainer[0].dataset.periodSelect = $('#calendar-from-date').val() + ' - ' + $('#calendar-to-date').val();
+      dateContainer[0].dataset.periodSelect = $('#calendar-to-date').val() + ' - ' + $('#calendar-from-date').val();
       GlobalActivitiesUpdateTopPaneTags();
       reloadActivities();
       resetHotButtonsBackgroundColor();

From e9133bbea98b261a7bf0ff9a3e207e4821dd1529 Mon Sep 17 00:00:00 2001
From: Jure Grabnar <jgrabnar@biosistemika.com>
Date: Fri, 29 Mar 2019 08:29:16 +0100
Subject: [PATCH 2/3] Remove empty space between date buttons

Closes SCI-3243
---
 app/assets/stylesheets/global_activities.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/global_activities.scss b/app/assets/stylesheets/global_activities.scss
index d9f61fa7f..2cc977845 100644
--- a/app/assets/stylesheets/global_activities.scss
+++ b/app/assets/stylesheets/global_activities.scss
@@ -119,14 +119,13 @@
 
     .hot-buttons {
       display: inline-block;
-      margin-bottom: 10px;
       width: 100%;
 
       .hot-button {
         border: 0;
         cursor: pointer;
         float: left;
-        margin: 5px;
+        margin: 0;
         opacity: 0.7;
         text-align: left;
         width: calc(50% - 25px);

From 226cf21787068fdbd1b2dfc4082fc5657b2826a8 Mon Sep 17 00:00:00 2001
From: Jure Grabnar <jgrabnar@biosistemika.com>
Date: Fri, 29 Mar 2019 08:42:15 +0100
Subject: [PATCH 3/3] No top margin for select custom dates button

---
 app/assets/stylesheets/global_activities.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/global_activities.scss b/app/assets/stylesheets/global_activities.scss
index 2cc977845..92a4bf340 100644
--- a/app/assets/stylesheets/global_activities.scss
+++ b/app/assets/stylesheets/global_activities.scss
@@ -146,6 +146,10 @@
       }
     }
 
+    .title {
+      margin-top: 0;
+    }
+
     .from,
     .to {
       float: left;