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

fix styling

This commit is contained in:
Martin McKeaveney 2021-05-05 17:21:35 +01:00
parent a658b2917c
commit c381f08b4a
4 changed files with 78 additions and 1266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/builder/src/pages/portal/_layout.svelte
View File

@ -1,5 +1,5 @@
<script> <script>
import { isActive } from "@roxi/routify" import { isActive, url } from "@roxi/routify"
import { onMount } from "svelte" import { onMount } from "svelte"
import { import {
Icon, Icon,
@ -30,7 +30,7 @@
{ title: "Drafts", href: "/portal/drafts" }, { title: "Drafts", href: "/portal/drafts" },
{ title: "Users", href: "/portal/users", heading: "Manage" }, { title: "Users", href: "/portal/users", heading: "Manage" },
{ title: "Groups", href: "/portal/groups" }, { title: "Groups", href: "/portal/groups" },
{ title: "Auth", href: "/portal/auth" }, { title: "Auth", href: "/portal/oauth" },
{ title: "Email", href: "/portal/email" }, { title: "Email", href: "/portal/email" },
{ title: "General", href: "/portal/general", heading: "Settings" }, { title: "General", href: "/portal/general", heading: "Settings" },
{ title: "Theming", href: "/portal/theming" }, { title: "Theming", href: "/portal/theming" },
@ -53,7 +53,9 @@
<div class="menu"> <div class="menu">
<Navigation> <Navigation>
{#each menu as { title, href, heading }} {#each menu as { title, href, heading }}
<Item selected={$isActive(href)} {href} {heading}>{title}</Item> <Item selected={$isActive(href)} href={$url(href)} {heading}>
{title}
</Item>
{/each} {/each}
</Navigation> </Navigation>
</div> </div>

22
packages/builder/src/pages/builder/oauth/index.svelte → packages/builder/src/pages/portal/oauth/index.svelte
View File

@ -59,18 +59,23 @@
</script> </script>
<section class="container"> <section class="container">
<header>
<Heading size="M">OAuth</Heading> <Heading size="M">OAuth</Heading>
<Body size="S"> <Body size="S">
Every budibase app comes with basic authentication (email/password) Every budibase app comes with basic authentication (email/password)
included. You can add additional authentication methods from the options included. You can add additional authentication methods from the options
below. below.
</Body> </Body>
</header>
<Divider /> <Divider />
{#if google} {#if google}
<div class="config-form">
<Layout gap="S"> <Layout gap="S">
<Heading size="S"> <Heading size="S">
<span>
<GoogleLogo /> <GoogleLogo />
Google Google
</span>
</Heading> </Heading>
{#each ConfigFields.Google as field} {#each ConfigFields.Google as field}
<div class="form-row"> <div class="form-row">
@ -80,6 +85,8 @@
{/each} {/each}
</Layout> </Layout>
<Button primary on:click={() => save(google)}>Save</Button> <Button primary on:click={() => save(google)}>Save</Button>
</div>
<Divider />
{/if} {/if}
</section> </section>
@ -88,9 +95,24 @@
margin: 60px 320px; margin: 60px 320px;
} }
.config-form {
margin-top: 42px;
margin-bottom: 42px;
}
.form-row { .form-row {
display: grid; display: grid;
grid-template-columns: 20% 1fr; grid-template-columns: 20% 1fr;
grid-gap: var(--spacing-l); grid-gap: var(--spacing-l);
} }
span {
display: flex;
align-items: center;
gap: var(--spacing-s);
}
header {
margin-bottom: 42px;
}
</style> </style>

19
packages/builder/src/pages/builder/oauth/logos/Google.svelte → packages/builder/src/pages/portal/oauth/logos/Google.svelte
View File

@ -1,39 +1,34 @@
<svg <svg
width="14" width="18"
height="14" height="18"
viewBox="0 0 268 268" viewBox="0 0 268 268"
fill="none" fill="none"
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg">
>
<g clip-path="url(#clip0)"> <g clip-path="url(#clip0)">
<path <path
d="M58.8037 109.043C64.0284 93.2355 74.1116 79.4822 87.615 69.7447C101.118 d="M58.8037 109.043C64.0284 93.2355 74.1116 79.4822 87.615 69.7447C101.118
60.0073 117.352 54.783 134 54.8172C152.872 54.8172 169.934 61.5172 183.334 60.0073 117.352 54.783 134 54.8172C152.872 54.8172 169.934 61.5172 183.334
72.4828L222.328 33.5C198.566 12.7858 168.114 0 134 0C81.1817 0 35.711 72.4828L222.328 33.5C198.566 12.7858 168.114 0 134 0C81.1817 0 35.711
30.1277 13.8467 74.2583L58.8037 109.043Z" 30.1277 13.8467 74.2583L58.8037 109.043Z"
fill="#EA4335" fill="#EA4335" />
/>
<path <path
d="M179.113 201.145C166.942 208.995 151.487 213.183 134 213.183C117.418 d="M179.113 201.145C166.942 208.995 151.487 213.183 134 213.183C117.418
213.217 101.246 208.034 87.7727 198.369C74.2993 188.703 64.2077 175.044 213.217 101.246 208.034 87.7727 198.369C74.2993 188.703 64.2077 175.044
58.9265 159.326L13.8132 193.574C24.8821 215.978 42.012 234.828 63.2572 58.9265 159.326L13.8132 193.574C24.8821 215.978 42.012 234.828 63.2572
247.984C84.5024 261.14 109.011 268.075 134 268C166.752 268 198.041 256.353 247.984C84.5024 261.14 109.011 268.075 134 268C166.752 268 198.041 256.353
221.48 234.5L179.125 201.145H179.113Z" 221.48 234.5L179.125 201.145H179.113Z"
fill="#34A853" fill="#34A853" />
/>
<path <path
d="M221.48 234.5C245.991 211.631 261.903 177.595 261.903 134C261.903 d="M221.48 234.5C245.991 211.631 261.903 177.595 261.903 134C261.903
126.072 260.686 117.552 258.866 109.634H134V161.414H205.869C202.329 126.072 260.686 117.552 258.866 109.634H134V161.414H205.869C202.329
178.823 192.804 192.301 179.125 201.145L221.48 234.5Z" 178.823 192.804 192.301 179.125 201.145L221.48 234.5Z"
fill="#4A90E2" fill="#4A90E2" />
/>
<path <path
d="M58.9265 159.326C56.1947 151.162 54.8068 142.609 54.8172 134C54.8172 d="M58.9265 159.326C56.1947 151.162 54.8068 142.609 54.8172 134C54.8172
125.268 56.213 116.882 58.8037 109.043L13.8467 74.2584C4.64957 92.825 125.268 56.213 116.882 58.8037 109.043L13.8467 74.2584C4.64957 92.825
-0.0915078 113.28 1.86708e-05 134C1.86708e-05 155.44 4.96919 175.652 -0.0915078 113.28 1.86708e-05 134C1.86708e-05 155.44 4.96919 175.652
13.8132 193.574L58.9265 159.326Z" 13.8132 193.574L58.9265 159.326Z"
fill="#FBBC05" fill="#FBBC05" />
/>
</g> </g>
<defs> <defs>
<clipPath id="clip0"> <clipPath id="clip0">
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

1257
packages/server/yarn.lock
View File

File diff suppressed because it is too large Load Diff