scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-10 17:36:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5260 from artoscinote/ma_SCI_8270

Browse source 
Fix experiment canvas sizing and padding [SCI-8270]
This commit is contained in:
artoscinote 2023-04-06 15:03:10 +02:00 committed by GitHub
commit fe2d82b944
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/projects/canvas.js.erb
View file

@ -178,6 +178,7 @@ function initializeEdit() {
$("#wrapper").css("paddingLeft", "0");
$(".navbar-secondary").addClass("navbar-without-sidebar");
$(".show-sidebar").addClass("invisible");
$('.sci--layout').attr('data-navigator-collapsed', true);
// Also, hide zoom levels button group
$("#diagram-buttons").hide();
@ -2960,7 +2961,7 @@ function drawRoundRectangle(ctx, xPos, yPos, width, height, radius) {
height = Math.max(height, 0)
if (width < 2 * radius) radius = width / 2;
if (height < 2 * radius) radius = height / 2;
ctx.beginPath();
ctx.lineWidth = 4;
ctx.strokeStyle = '#104DA9';

2
app/assets/javascripts/sidebar_toggle.js.erb
View file

@ -23,6 +23,7 @@ var SideBarToggle = (function() {
$(WRAPPER).one("transitionend", function() {
$(WRAPPER).trigger('sideBar::shown');
})
$('.sci--layout').attr('data-navigator-collapsed', false);
}
function hide() {
@ -40,6 +41,7 @@ var SideBarToggle = (function() {
$(WRAPPER).one("transitionend", function() {
$(WRAPPER).trigger('sideBar::hidden');
})
$('.sci--layout').attr('data-navigator-collapsed', true);
}
function isToggledStorage() {

2
app/assets/stylesheets/experiment/show.scss
View file

@ -21,6 +21,8 @@
display: none;
}
padding: 0;
.toolbar-row {
align-items: center;
display: flex;