Styling updates for new components from merge

mathesar-foundation · Dec 29, 2021 · 42c00e0 · 42c00e0
1 parent 0bffb94
commit 42c00e0
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 30 deletions.
diff --git a/mathesar_ui/src/component-library/checkbox/Checkbox.svelte b/mathesar_ui/src/component-library/checkbox/Checkbox.svelte
@@ -51,7 +51,3 @@
   {value}
   on:change={onChange}
 />
-
-<style global lang="scss">
-  @import "Checkbox.scss";
-</style>
diff --git a/mathesar_ui/src/component-library/fieldset-group/FieldsetGroup.svelte b/mathesar_ui/src/component-library/fieldset-group/FieldsetGroup.svelte
@@ -34,7 +34,3 @@
     {/each}
   </ul>
 </fieldset>
-
-<style global lang="scss">
-  @import "FieldsetGroup.scss"
-</style>
diff --git a/mathesar_ui/src/component-library/index.ts b/mathesar_ui/src/component-library/index.ts
@@ -19,6 +19,7 @@ export { default as CancelOrProceedButtonPair } from './cancel-or-proceed-button
 export { default as Checkbox } from './checkbox/Checkbox.svelte';
 export { default as CheckboxGroup } from './checkbox-group/CheckboxGroup.svelte';
 export { default as Icon } from './icon/Icon.svelte';
+export { InputGroup, InputGroupText } from './input-group';
 export { default as Label } from './label/Label.svelte';
 export { default as LabeledInput } from './labeled-input/LabeledInput.svelte';
 export { default as NumberInput } from './number-input/NumberInput.svelte';
@@ -44,7 +45,6 @@ export { default as Tree } from './tree/Tree.svelte';
 
 // Systems
 export * from './confirmation';
-export * from './input-group';
 export * from './modal';
 export * from './toast';
 export * from './form-builder';
diff --git a/mathesar_ui/src/component-library/label/Label.svelte b/mathesar_ui/src/component-library/label/Label.svelte
@@ -14,7 +14,3 @@
 <label for={$inputId} class="label-component" class:disabled={$disabled}>
   <slot inputId={$inputId} />
 </label>
-
-<style global lang="scss">
-  @import './Label.scss';
-</style>
diff --git a/mathesar_ui/src/component-library/labeled-input/LabeledInput.svelte b/mathesar_ui/src/component-library/labeled-input/LabeledInput.svelte
@@ -21,7 +21,3 @@
     </span>
   </Label>
 </div>
-
-<style global lang="scss">
-  @import './LabeledInput.scss';
-</style>
diff --git a/mathesar_ui/src/component-library/radio/Radio.svelte b/mathesar_ui/src/component-library/radio/Radio.svelte
@@ -20,7 +20,3 @@
   {id}
   {disabled}
 />
-
-<style global lang="scss">
-  @import "./Radio.scss";
-</style>
diff --git a/mathesar_ui/src/component-library/styles.scss b/mathesar_ui/src/component-library/styles.scss
@@ -6,23 +6,27 @@
 
 @import "common/styles/main.scss";
 
-@import "text-avatar/TextAvatar.scss";
-@import "input-group/InputGroup.scss";
-@import "checkbox/Checkbox.scss";
 @import "button/Button.scss";
+@import "cancel-or-proceed-button-pair/CancelOrProceedButtonPair.scss";
+@import "checkbox/Checkbox.scss";
+@import "fieldset-group/FieldsetGroup.scss";
 @import "icon/Icon.scss";
+@import "input-group/InputGroup.scss";
+@import "label/Label.scss";
+@import "labeled-input/LabeledInput.scss";
 @import "progress/Progress.scss";
-@import "cancel-or-proceed-button-pair/CancelOrProceedButtonPair.scss";
-@import "skeleton/Skeleton.scss";
+@import "radio/Radio.scss";
 @import "seesaw/Seesaw.scss";
+@import "skeleton/Skeleton.scss";
+@import "text-avatar/TextAvatar.scss";
 
+@import "dropdown/Dropdown.scss";
+@import "file-upload/FileUpload.scss";
 @import "notification/Notification.scss";
-@import "tabs/TabContainer.scss";
-@import "tree/Tree.scss";
 @import "pagination/Pagination.scss";
-@import "dropdown/Dropdown.scss";
 @import "select/Select.scss";
-@import "file-upload/FileUpload.scss";
+@import "tabs/TabContainer.scss";
+@import "tree/Tree.scss";
 
 @import "modal/Modal.scss";
 // Limit to one scss export from a component/system