scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 13:13:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1611 from jbargu/jg_sci_3226_3243

Browse source 
Too much empty space between date buttons [SCI-3243] [SCI-3226]
This commit is contained in:
Jure Grabnar 2019-03-29 12:30:53 +01:00 committed by GitHub
commit fe3e92468f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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();

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

@ -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;