From 8525b6d8488d64bd6d1fb07af2ffcf1ec9f52b9d Mon Sep 17 00:00:00 2001
From: Paul Kaplan <pkaplan@media.mit.edu>
Date: Tue, 29 May 2018 16:07:59 -0400
Subject: [PATCH] Fix css to keep backpack bar in view
---
src/components/asset-panel/asset-panel.css | 1 +
src/components/gui/gui.css | 2 --
test/integration/backpack.test.js | 4 ++++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/components/asset-panel/asset-panel.css b/src/components/asset-panel/asset-panel.css
index 0cfb9a1c3..9a999057b 100644
--- a/src/components/asset-panel/asset-panel.css
+++ b/src/components/asset-panel/asset-panel.css
@@ -16,4 +16,5 @@
flex-grow: 1;
flex-shrink: 1;
border-left: 1px solid $ui-black-transparent;
+ overflow-y: auto;
}
diff --git a/src/components/gui/gui.css b/src/components/gui/gui.css
index 72670e031..2e4e7b846 100644
--- a/src/components/gui/gui.css
+++ b/src/components/gui/gui.css
@@ -132,7 +132,6 @@
.tabs {
position: relative;
flex-grow: 1;
- flex-shrink: 0;
display: flex;
flex-direction: column;
}
@@ -140,7 +139,6 @@
.tab-panel {
position: relative;
flex-grow: 1;
- flex-shrink: 0;
display: none;
}
diff --git a/test/integration/backpack.test.js b/test/integration/backpack.test.js
index 9eb5e5f9e..9694e67ba 100644
--- a/test/integration/backpack.test.js
+++ b/test/integration/backpack.test.js
@@ -34,6 +34,10 @@ describe('Working with the how-to library', () => {
test('Backpack can be expanded with backpack host param', async () => {
await loadUri(`${uri}?backpack_host=some-value`);
await clickXpath('//button[@title="tryit"]');
+
+ // Try activating the backpack from the costumes tab to make sure it isn't pushed off
+ await clickText('Costumes');
+
// Check that the backpack header is visible and wrapped in a coming soon tooltip
await clickText('Backpack'); // Not wrapped in tooltip
await clickText('Backpack is empty'); // Make sure it can expand, is empty
--
GitLab