From fa930971928bab7d8d48bb4fcd30b3846cea3c59 Mon Sep 17 00:00:00 2001 From: Victoria Sloan Date: Sun, 23 Aug 2020 09:31:39 +0100 Subject: [PATCH 1/2] uk-table removed, uk margin styles add to global --- .../database/DataTable/ModelDataTable.svelte | 2 +- .../database/DataTable/Table.svelte | 2 +- packages/builder/src/global.css | 30 ++++++++++++++++++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/components/database/DataTable/ModelDataTable.svelte b/packages/builder/src/components/database/DataTable/ModelDataTable.svelte index 25f9c1e78e..af99b2bada 100644 --- a/packages/builder/src/components/database/DataTable/ModelDataTable.svelte +++ b/packages/builder/src/components/database/DataTable/ModelDataTable.svelte @@ -63,7 +63,7 @@ {/if} - +
diff --git a/packages/builder/src/components/database/DataTable/Table.svelte b/packages/builder/src/components/database/DataTable/Table.svelte index bbed4a6be3..4d3d16b4e0 100644 --- a/packages/builder/src/components/database/DataTable/Table.svelte +++ b/packages/builder/src/components/database/DataTable/Table.svelte @@ -42,7 +42,7 @@ - +
{#each columns as header} diff --git a/packages/builder/src/global.css b/packages/builder/src/global.css index deac83ce49..6e2411ae5c 100644 --- a/packages/builder/src/global.css +++ b/packages/builder/src/global.css @@ -96,6 +96,8 @@ textarea { cursor: pointer; } +/* Top bottom spacing */ + .bb-margin-m { margin-bottom: var(--spacing-m); } @@ -109,4 +111,30 @@ textarea { * + .bb-margin-xl { margin-top: var(--spacing-xl); -} \ No newline at end of file +} + +/* Table styles */ +.bb-table { + border-collapse: collapse; + border-spacing: 0; + width: 100%; + margin-bottom: var(--spacing-xl); +} + +* + .bb-table { + margin-top: var(--spacing-xl) +} + +.bb-table th { + padding: var(--spacing-l) var(--spacing-m); + text-align: left; + vertical-align: bottom; +} + +.bb-table td { + padding: var(--spacing-l) var(--spacing-m); + vertical-align: top; +} + +.bb-table td > :last-child { margin-bottom: 0; } + From 5bcc8e9caa4a2a6fa38de657d75ef4f8b26805d5 Mon Sep 17 00:00:00 2001 From: Victoria Sloan Date: Sun, 23 Aug 2020 09:44:30 +0100 Subject: [PATCH 2/2] move table styles from global.css to budibase.css --- packages/builder/src/budibase.css | 28 +++++++++++++++++++++++++++- packages/builder/src/global.css | 28 +--------------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/builder/src/budibase.css b/packages/builder/src/budibase.css index 8de82530b1..0db3e2fec7 100644 --- a/packages/builder/src/budibase.css +++ b/packages/builder/src/budibase.css @@ -127,4 +127,30 @@ align-items: center; justify-content: center; font-size: 20px; -} \ No newline at end of file +} + +/* Table styles */ +.bb-table { + border-collapse: collapse; + border-spacing: 0; + width: 100%; + margin-bottom: var(--spacing-xl); +} + +* + .bb-table { + margin-top: var(--spacing-xl) +} + +.bb-table th { + padding: var(--spacing-l) var(--spacing-m); + text-align: left; + vertical-align: bottom; +} + +.bb-table td { + padding: var(--spacing-l) var(--spacing-m); + vertical-align: top; +} + +.bb-table td > :last-child { margin-bottom: 0; } + diff --git a/packages/builder/src/global.css b/packages/builder/src/global.css index 6e2411ae5c..579ecdd8ba 100644 --- a/packages/builder/src/global.css +++ b/packages/builder/src/global.css @@ -111,30 +111,4 @@ textarea { * + .bb-margin-xl { margin-top: var(--spacing-xl); -} - -/* Table styles */ -.bb-table { - border-collapse: collapse; - border-spacing: 0; - width: 100%; - margin-bottom: var(--spacing-xl); -} - -* + .bb-table { - margin-top: var(--spacing-xl) -} - -.bb-table th { - padding: var(--spacing-l) var(--spacing-m); - text-align: left; - vertical-align: bottom; -} - -.bb-table td { - padding: var(--spacing-l) var(--spacing-m); - vertical-align: top; -} - -.bb-table td > :last-child { margin-bottom: 0; } - +} \ No newline at end of file