MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #431 from Budibase/feature/settings-modal-fixes 

Feature/settings modal fixes
This commit is contained in:
Kevin Åberg Kultalahti 2020-07-10 11:33:14 +02:00 committed by GitHub
parent 9b23d9eb51 2b192006b1
commit 1ff494b015
5 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/package.json
View File

@ -55,7 +55,7 @@
] ]
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.15.4", "@budibase/bbui": "^1.15.8",
"@budibase/client": "^0.1.1", "@budibase/client": "^0.1.1",
"@nx-js/compiler-util": "^2.0.0", "@nx-js/compiler-util": "^2.0.0",
"codemirror": "^5.51.0", "codemirror": "^5.51.0",

12
packages/builder/src/components/settings/UserRow.svelte
View File

@ -39,4 +39,16 @@
grid-gap: 18px; grid-gap: 18px;
grid-template-columns: 1fr 1fr 1fr; grid-template-columns: 1fr 1fr 1fr;
} }
.inputs :global(input) {
padding: 10px 12px;
border-radius: var(--rounded-small);
}
.inputs :global(select) {
padding: 9px 12px;
border-radius: var(--rounded-small);
}
.inputs :global(button) {
border-radius: var(--rounded-small);
height: initial;
}
</style> </style>

4
packages/builder/src/components/settings/tabs/DangerZone.svelte
View File

@ -30,7 +30,7 @@
on:input={e => (value = e.target.value)} on:input={e => (value = e.target.value)}
thin thin
disabled={loading} disabled={loading}
placeholder="Enter your name" placeholder=""
label="Type DELETE into the textbox, then click the following button to label="Type DELETE into the textbox, then click the following button to
delete your web app:" /> delete your web app:" />
@ -46,7 +46,7 @@
<style> <style>
.background { .background {
display: grid; display: grid;
grid-gap: var(--space); grid-gap: 16px;
border-radius: 5px; border-radius: 5px;
background-color: var(--light-grey); background-color: var(--light-grey);
padding: 12px 12px 18px 12px; padding: 12px 12px 18px 12px;

4
packages/builder/src/components/settings/tabs/General.svelte
View File

@ -40,11 +40,11 @@
<style> <style>
.container { .container {
display: grid; display: grid;
grid-gap: var(--space); grid-gap: 16px;
} }
.background { .background {
border-radius: 5px; border-radius: 5px;
background-color: var(--light-grey); background-color: var(--grey-1);
padding: 12px 12px 18px 12px; padding: 12px 12px 18px 12px;
} }
</style> </style>

22
packages/builder/src/components/settings/tabs/Users.svelte
View File

@ -87,7 +87,8 @@
{/each} {/each}
</ul> </ul>
{:catch error} {:catch error}
err0r Something went wrong when trying to fetch users. Please refresh the page
and try again.
{/await} {/await}
</div> </div>
</div> </div>
@ -102,21 +103,22 @@
display: grid; display: grid;
grid-gap: 12px; grid-gap: 12px;
border-radius: 5px; border-radius: 5px;
background-color: var(--grey-2); background-color: var(--grey-1);
padding: 12px 12px 18px 12px; padding: 12px 12px 18px 12px;
} }
.background.create { .background.create {
background-color: var(--blue-light); background-color: var(--blue-light);
} }
.inputs :global(select) {
padding: 12px 9px;
height: initial;
}
.create-button { .create-button {
position: absolute; position: absolute;
top: 12px; top: 12px;
right: 12px; right: 12px;
} }
.create-button :global(button) {
font-size: var(--font-size-sm);
min-width: 100px;
border-radius: var(--rounded-small);
}
.title { .title {
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
@ -126,6 +128,14 @@
grid-gap: 18px; grid-gap: 18px;
grid-template-columns: 1fr 1fr 1fr; grid-template-columns: 1fr 1fr 1fr;
} }
.inputs :global(input) {
padding: 10px 12px;
border-radius: var(--rounded-small);
}
.inputs :global(select) {
padding: 9px 12px;
border-radius: var(--rounded-small);
}
ul { ul {
list-style: none; list-style: none;
padding: 0; padding: 0;