diff --git a/app/assets/javascripts/global_activities/side_pane.js b/app/assets/javascripts/global_activities/side_pane.js index 756c59b17..567c65ac1 100644 --- a/app/assets/javascripts/global_activities/side_pane.js +++ b/app/assets/javascripts/global_activities/side_pane.js @@ -202,13 +202,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(); @@ -219,7 +220,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(); diff --git a/app/assets/stylesheets/global_activities.scss b/app/assets/stylesheets/global_activities.scss index d9f61fa7f..92a4bf340 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); @@ -147,6 +146,10 @@ } } + .title { + margin-top: 0; + } + .from, .to { float: left;