From f94ea51ecb22cbd402a5b437a5e7443064022978 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Sun, 10 May 2020 13:08:19 +0200 Subject: [PATCH] Small snapshot css corrections --- .../javascripts/my_modules/repositories.js | 36 ++++++++++++------- .../shared_styles/elements/buttons.scss | 16 ++++++--- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/my_modules/repositories.js b/app/assets/javascripts/my_modules/repositories.js index 64c1fde4d..e52a0d791 100644 --- a/app/assets/javascripts/my_modules/repositories.js +++ b/app/assets/javascripts/my_modules/repositories.js @@ -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'); @@ -159,6 +160,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); }, @@ -278,18 +282,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(); }); @@ -341,6 +350,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(); }); diff --git a/app/assets/stylesheets/shared_styles/elements/buttons.scss b/app/assets/stylesheets/shared_styles/elements/buttons.scss index 3d2cffc2f..991f5506e 100644 --- a/app/assets/stylesheets/shared_styles/elements/buttons.scss +++ b/app/assets/stylesheets/shared_styles/elements/buttons.scss @@ -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; }