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

Merge pull request #2549 from aignatov-bio/ai-sci-4604-small-snapshot-corrections

Browse source 
Small snapshot css corrections [SCI-4604]
This commit is contained in:
aignatov-bio 2020-05-14 15:18:13 +02:00 committed by GitHub
commit 78b4067c50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/assets/javascripts/my_modules/repositories.js
View file

@ -1,5 +1,6 @@
/* eslint-disable no-param-reassign, no-use-before-define */
/* global DataTableHelpers PerfectScrollbar FilePreviewModal animateSpinner HelperModule initAssignedTasksDropdown */
/* global DataTableHelpers PerfectScrollbar FilePreviewModal animateSpinner HelperModule
initAssignedTasksDropdown */
var MyModuleRepositories = (function() {
const FULL_VIEW_MODAL = $('#myModuleRepositoryFullViewModal');
@ -162,6 +163,9 @@ var MyModuleRepositories = (function() {
renderFullViewAssignButtons();
} else {
$('.table-container .toolbar').html($('#repositoryToolbarButtonsTemplate').html());
if (FULL_VIEW_MODAL.find('.modal-content').hasClass('show-sidebar')) {
FULL_VIEW_MODAL.find('#showVersionsSidebar').addClass('active');
}
}
initAssignedTasksDropdown(tableContainer);
},
@ -290,18 +294,23 @@ var MyModuleRepositories = (function() {
function initVersionsSidebarActions() {
FULL_VIEW_MODAL.on('click', '#showVersionsSidebar', function(e) {
$.getJSON(FULL_VIEW_MODAL.find('.table').data('versions-sidebar-url'), (data) => {
var snapshotsItemsScrollBar;
FULL_VIEW_MODAL.find('.repository-versions-sidebar').html(data.html);
snapshotsItemsScrollBar = new PerfectScrollbar(
FULL_VIEW_MODAL.find('.repository-snapshots-container')[0]
);
setSelectedItem();
FULL_VIEW_MODAL.find('.modal-content').addClass('show-sidebar');
initVersionsStatusCheck();
snapshotsItemsScrollBar.update();
FULL_VIEW_TABLE.columns.adjust();
});
$(this).toggleClass('active');
if ($(this).hasClass('active')) {
$.getJSON(FULL_VIEW_MODAL.find('.table').data('versions-sidebar-url'), (data) => {
var snapshotsItemsScrollBar;
FULL_VIEW_MODAL.find('.repository-versions-sidebar').html(data.html);
snapshotsItemsScrollBar = new PerfectScrollbar(
FULL_VIEW_MODAL.find('.repository-snapshots-container')[0]
);
setSelectedItem();
FULL_VIEW_MODAL.find('.modal-content').addClass('show-sidebar');
initVersionsStatusCheck();
snapshotsItemsScrollBar.update();
FULL_VIEW_TABLE.columns.adjust();
});
} else {
FULL_VIEW_MODAL.find('#collapseVersionsSidebar').click();
}
e.stopPropagation();
});
@ -353,6 +362,7 @@ var MyModuleRepositories = (function() {
FULL_VIEW_MODAL.on('click', '#collapseVersionsSidebar', function(e) {
FULL_VIEW_MODAL.find('.modal-content').removeClass('show-sidebar');
FULL_VIEW_MODAL.find('#showVersionsSidebar').removeClass('active');
FULL_VIEW_TABLE.columns.adjust();
e.stopPropagation();
});

16
app/assets/stylesheets/shared_styles/elements/buttons.scss
View file

@ -25,7 +25,9 @@
text-decoration: none;
}
&:active {
&:active,
&.active {
box-shadow: none;
text-decoration: none;
}
@ -44,7 +46,8 @@
color: $color-white;
}
&:active {
&:active,
&.active {
background: $brand-primary-press;
color: $color-white;
}
@ -66,7 +69,8 @@
color: $color-volcano;
}
&:active {
&:active,
&.active {
background: $color-alto;
border: $border-secondary;
color: $color-volcano;
@ -89,7 +93,8 @@
color: $color-volcano;
}
&:active {
&:active,
&.active {
background: $color-alto;
border: $border-transparent;
color: $color-volcano;
@ -111,7 +116,8 @@
color: $color-white;
}
&:active {
&:active,
&.active {
background: $brand-danger-press;
color: $color-white;
}