Merge branch 'master' into navigation-tidy-up

This commit is contained in:
Joe 2020-06-01 22:25:25 +01:00 committed by GitHub
commit ea2786c69c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 2 deletions

View File

@ -51,7 +51,7 @@
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"shortid": "^2.2.8", "shortid": "^2.2.8",
"string_decoder": "^1.2.0", "string_decoder": "^1.2.0",
"svelte-simple-modal": "^0.3.0", "svelte-simple-modal": "^0.4.2",
"uikit": "^3.1.7" "uikit": "^3.1.7"
}, },
"devDependencies": { "devDependencies": {

View File

@ -44,11 +44,13 @@
flex-direction: column; flex-direction: column;
padding: 20px 20px; padding: 20px 20px;
border-left: solid 1px var(--grey); border-left: solid 1px var(--grey);
box-sizing: border-box;
} }
.switcher { .switcher {
display: flex; display: flex;
margin: 0px 20px 20px 0px; margin: 0px 20px 20px 0px;
box-sizing: border-box;
} }
.switcher > button { .switcher > button {
@ -67,4 +69,9 @@
.switcher > .selected { .switcher > .selected {
color: var(--ink); color: var(--ink);
} }
.panel {
min-height: 0;
overflow-y: auto;
}
</style> </style>

View File

@ -105,7 +105,9 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden;
padding: 20px; padding: 20px;
box-sizing: border-box;
} }
.title > div:nth-child(1) { .title > div:nth-child(1) {
@ -120,5 +122,7 @@
.component-props-container { .component-props-container {
margin-top: 20px; margin-top: 20px;
flex: 1 1 auto; flex: 1 1 auto;
min-height: 0;
overflow-y: auto;
} }
</style> </style>

View File

@ -88,6 +88,8 @@ html, body {
#app { #app {
height: 100%; height: 100%;
box-sizing: border-box;
overflow-y: hidden;
} }
h1 { h1 {

View File

@ -81,7 +81,7 @@
<style> <style>
.root { .root {
height: 100%; min-height: 100%;
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;

View File

@ -76,6 +76,9 @@
grid-template-columns: 300px 1fr 300px; grid-template-columns: 300px 1fr 300px;
width: 100%; width: 100%;
background: var(--grey-light); background: var(--grey-light);
flex: 1;
min-height: 0;
align-items: stretch;
} }
.ui-nav { .ui-nav {
@ -98,6 +101,7 @@
.components-pane { .components-pane {
grid-column: 3; grid-column: 3;
background-color: var(--white); background-color: var(--white);
min-height: 0;
} }
.nav-group-header > div:nth-child(1) { .nav-group-header > div:nth-child(1) {