Skip to content

Commit a81fb9d

Browse files
author
Phil Hess
committed
Move scss files beside components
1 parent a5fb714 commit a81fb9d

9 files changed

Lines changed: 34 additions & 14 deletions

File tree

‎src/assets/scss/6-components/atoms/__atoms.scss‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
/*------------------------------------*\
22
ATOMS
33
\*------------------------------------*/
4-
@import "buttons";
5-
@import "checkbox-button";
64
@import "labels";
7-
@import "progress-bar";
85
@import "radios";
96
@import "selects";
107
@import "text-input-icon";
11-
@import "toast";

src/assets/scss/6-components/atoms/_buttons.scss renamed to src/atoms/buttons/button.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
@import "../../assets/scss/0-vendor/__vendor";
2+
@import "../../assets/scss/1-settings/__settings";
3+
@import "../../assets/scss/2-tools/__tools";
4+
@import "../../assets/scss/3-generic/__generic";
5+
16
.c-button {
27
@include font-style($font-primary, "small", #ffffff, 800, 16px);
38
@include padding(11px, 24px);

‎src/atoms/buttons/button.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { ButtonStyles } from "../constants/button-styles";
33
import { ButtonTypes } from "../constants/button-types";
44
import React, { forwardRef } from "react";
55
import { StringUtils } from "andculturecode-javascript-core";
6+
import './button.scss';
67

78
// -----------------------------------------------------------------------------------------
89
// #region Interfaces

src/assets/scss/6-components/atoms/_checkbox-button.scss renamed to src/atoms/forms/checkbox-button.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
@import "../../assets/scss/0-vendor/__vendor";
2+
@import "../../assets/scss/1-settings/__settings";
3+
@import "../../assets/scss/2-tools/__tools";
4+
@import "../../assets/scss/3-generic/__generic";
5+
16
.c-checkbox-button {
27
@include margin-bottom(24px);
38
@include padding(8px, 16px);

‎src/atoms/forms/checkbox-button.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { InputTypes } from "../constants/input-types";
22
import React from "react";
33
import { Icon } from "../icons/icon";
44
import { Icons } from "../constants/icons";
5+
import './checkbox-button.scss';
56

67
// -----------------------------------------------------------------------------------------
78
// #region Interfaces

src/assets/scss/6-components/atoms/_progress-bar.scss renamed to src/atoms/progress-bar/progress-bar.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
@import "../../assets/scss/0-vendor/__vendor";
2+
@import "../../assets/scss/1-settings/__settings";
3+
@import "../../assets/scss/2-tools/__tools";
4+
@import "../../assets/scss/3-generic/__generic";
5+
16
.c-progress-bar {
27
width: 100%;
38
height: rem(6px);

‎src/atoms/progress-bar/progress-bar.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from "react";
22
import { StringUtils } from "andculturecode-javascript-core";
3+
import './progress-bar.scss';
34

45
// -------------------------------------------------------------------------------------------------
56
// #region Enums

‎src/atoms/toasts/toast-templates.tsx‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { Icon } from "../icons/icon";
33
import { Icons } from "../constants/icons";
44
import React from "react";
55
import { ToastContent } from "react-toastify";
6+
import './toast.scss';
67

78
const COMPONENT_CLASS = "c-toast-content";
89
const ICON_CLASS = `${COMPONENT_CLASS}__icon`;
@@ -12,17 +13,17 @@ const getTemplate = (
1213
icon: Icons,
1314
content: string | ToastContent
1415
): ToastContent => (
15-
<div className={COMPONENT_CLASS}>
16-
<div className={ICON_CONTAINER_CLASS}>
17-
<Icon
18-
cssClassName={`${ICON_CONTAINER_CLASS}__icon`}
19-
size={IconSizes.Large}
20-
type={icon}
21-
/>
16+
<div className={COMPONENT_CLASS}>
17+
<div className={ICON_CONTAINER_CLASS}>
18+
<Icon
19+
cssClassName={`${ICON_CONTAINER_CLASS}__icon`}
20+
size={IconSizes.Large}
21+
type={icon}
22+
/>
23+
</div>
24+
<div className={`${COMPONENT_CLASS}__body`}>{content}</div>
2225
</div>
23-
<div className={`${COMPONENT_CLASS}__body`}>{content}</div>
24-
</div>
25-
);
26+
);
2627

2728
class ToastTemplates {
2829
static error(content: string | ToastContent): ToastContent {

src/assets/scss/6-components/atoms/_toast.scss renamed to src/atoms/toasts/toast.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
@import "../../assets/scss/0-vendor/__vendor";
2+
@import "../../assets/scss/1-settings/__settings";
3+
@import "../../assets/scss/2-tools/__tools";
4+
@import "../../assets/scss/3-generic/__generic";
5+
16
.c-toast {
27
padding-top: 0;
38
padding-bottom: 0;

0 commit comments

Comments
 (0)