fix styling

5 years ago · c381f08b4a
4 changed files with 78 additions and 1266 deletions
--- a/packages/builder/src/pages/portal/_layout.svelte
+++ b/packages/builder/src/pages/portal/_layout.svelte
@ -1,5 +1,5 @@
 <script>
-  import { isActive } from "@roxi/routify"
+  import { isActive, url } from "@roxi/routify"
  import { onMount } from "svelte"
  import {
    Icon,
@ -30,7 +30,7 @@
    { title: "Drafts", href: "/portal/drafts" },
    { title: "Users", href: "/portal/users", heading: "Manage" },
    { title: "Groups", href: "/portal/groups" },
-    { title: "Auth", href: "/portal/auth" },
+    { title: "Auth", href: "/portal/oauth" },
    { title: "Email", href: "/portal/email" },
    { title: "General", href: "/portal/general", heading: "Settings" },
    { title: "Theming", href: "/portal/theming" },
@ -53,7 +53,9 @@
      <div class="menu">
        <Navigation>
          {#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}
        </Navigation>
      </div>
--- a/packages/builder/src/pages/builder/oauth/index.svelte
+++ b/packages/builder/src/pages/builder/oauth/index.svelte
@ -59,27 +59,34 @@
 </script>

 <section class="container">
-  <Heading size="M">OAuth</Heading>
-  <Body size="S">
-    Every budibase app comes with basic authentication (email/password)
-    included. You can add additional authentication methods from the options
-    below.
-  </Body>
+  <header>
+    <Heading size="M">OAuth</Heading>
+    <Body size="S">
+      Every budibase app comes with basic authentication (email/password)
+      included. You can add additional authentication methods from the options
+      below.
+    </Body>
+  </header>
  <Divider />
  {#if google}
-    <Layout gap="S">
-      <Heading size="S">
-        <GoogleLogo />
-        Google
-      </Heading>
-      {#each ConfigFields.Google as field}
-        <div class="form-row">
-          <Label>{field}</Label>
-          <Input bind:value={google.config[field]} />
-        </div>
-      {/each}
-    </Layout>
-    <Button primary on:click={() => save(google)}>Save</Button>
+    <div class="config-form">
+      <Layout gap="S">
+        <Heading size="S">
+          <span>
+            <GoogleLogo />
+            Google
+          </span>
+        </Heading>
+        {#each ConfigFields.Google as field}
+          <div class="form-row">
+            <Label>{field}</Label>
+            <Input bind:value={google.config[field]} />
+          </div>
+        {/each}
+      </Layout>
+      <Button primary on:click={() => save(google)}>Save</Button>
+    </div>
+    <Divider />
  {/if}
 </section>

@ -88,9 +95,24 @@
    margin: 60px 320px;
  }

+  .config-form {
+    margin-top: 42px;
+    margin-bottom: 42px;
+  }
+
  .form-row {
    display: grid;
    grid-template-columns: 20% 1fr;
    grid-gap: var(--spacing-l);
  }
+
+  span {
+    display: flex;
+    align-items: center;
+    gap: var(--spacing-s);
+  }
+
+  header {
+    margin-bottom: 42px;
+  }
 </style>
--- a/packages/builder/src/pages/builder/oauth/logos/Google.svelte
+++ b/packages/builder/src/pages/builder/oauth/logos/Google.svelte
@ -1,39 +1,34 @@
 <svg
-  width="14"
-  height="14"
+  width="18"
+  height="18"
  viewBox="0 0 268 268"
  fill="none"
-  xmlns="http://www.w3.org/2000/svg"
->
+  xmlns="http://www.w3.org/2000/svg">
  <g clip-path="url(#clip0)">
    <path
      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
      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"
-      fill="#EA4335"
-    />
+      fill="#EA4335" />
    <path
      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
      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
      221.48 234.5L179.125 201.145H179.113Z"
-      fill="#34A853"
-    />
+      fill="#34A853" />
    <path
      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
      178.823 192.804 192.301 179.125 201.145L221.48 234.5Z"
-      fill="#4A90E2"
-    />
+      fill="#4A90E2" />
    <path
      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
      -0.0915078 113.28 1.86708e-05 134C1.86708e-05 155.44 4.96919 175.652
      13.8132 193.574L58.9265 159.326Z"
-      fill="#FBBC05"
-    />
+      fill="#FBBC05" />
  </g>
  <defs>
    <clipPath id="clip0">
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock