diff --git a/.storybook/components/Utilities/SpacingMarginUtilities.js b/.storybook/components/Utilities/SpacingMarginUtilities.js index 02a19ca79..b989d4021 100755 --- a/.storybook/components/Utilities/SpacingMarginUtilities.js +++ b/.storybook/components/Utilities/SpacingMarginUtilities.js @@ -31,9 +31,18 @@ export class SpacingMarginUtilities extends Component {
- u-margin-lg + u-margin-left-lg
-
Large margin
+
+ Margin left large +
+
+ +
+ + u-margin-xl +
+
Large margin

@@ -124,6 +133,15 @@ export class SpacingMarginUtilities extends Component {
+ u-margin-right-xl +
+
+ Margin right large +
+
+ +
+

margin-bottom

@@ -167,7 +185,7 @@ export class SpacingMarginUtilities extends Component { u-margin-bottom-xl
- Margin bottom xl + Margin bottom large
@@ -179,6 +197,14 @@ export class SpacingMarginUtilities extends Component { Margin bottom xxl +
+ + u-margin-bottom-xxxl +
+
+ Margin bottom xxxl +
+

@@ -219,6 +245,15 @@ export class SpacingMarginUtilities extends Component { Margin left large + +
+ + u-margin-left-xl +
+
+ Margin left large +
+
); } diff --git a/.storybook/components/Utilities/SpacingPaddingUtilities.js b/.storybook/components/Utilities/SpacingPaddingUtilities.js index 5cadd807b..3d8ca70c2 100755 --- a/.storybook/components/Utilities/SpacingPaddingUtilities.js +++ b/.storybook/components/Utilities/SpacingPaddingUtilities.js @@ -38,6 +38,13 @@ export class SpacingPaddingUtilities extends Component {
+ u-padding-xl +
+
XL padding
+
+ +
+

padding-top

@@ -70,6 +77,13 @@ export class SpacingPaddingUtilities extends Component {
+ u-padding-top-xl +
+
Padding top XL
+
+ +
+

padding-right

@@ -102,6 +116,13 @@ export class SpacingPaddingUtilities extends Component {
+ u-padding-right-xl +
+
Padding right XL
+
+ +
+

padding-bottom

@@ -134,6 +155,13 @@ export class SpacingPaddingUtilities extends Component {
+ u-padding-bottom-xl +
+
Padding bottom XL
+
+ +
+

padding-left

@@ -161,7 +189,14 @@ export class SpacingPaddingUtilities extends Component { u-padding-left-lg
-
Padding left large
+
Padding left large
+
+ +
+ + u-padding-left-xl +
+
Padding left XL
); diff --git a/.storybook/pages/Cad/Cad.tsx b/.storybook/pages/Cad/Cad.tsx index 158e75997..c43a8084b 100644 --- a/.storybook/pages/Cad/Cad.tsx +++ b/.storybook/pages/Cad/Cad.tsx @@ -297,10 +297,10 @@ export const Cad = () => ( - + Select projects for your History 6 plan - +

Make a plan so that you can stay connected to learning objectives even as changes occur throughout the year. @@ -318,7 +318,7 @@ export const Cad = () => ( itemIds: ['item-1', 'item-2', 'item-3', 'item-4', 'item-5'], emptyContent: ( <> - +

There are no more available projects to create your course plan @@ -349,7 +349,7 @@ export const Cad = () => ( itemIds: [], emptyContent: ( <> - +

Drag in available projects to build your course plan

diff --git a/.storybook/pages/CadStep1/CadStep1.tsx b/.storybook/pages/CadStep1/CadStep1.tsx index 2598725b7..d79fdf113 100644 --- a/.storybook/pages/CadStep1/CadStep1.tsx +++ b/.storybook/pages/CadStep1/CadStep1.tsx @@ -50,7 +50,7 @@ export const CadStep1 = () => ( - + compass vignette Let's start planning, Amy Frankle. @@ -62,7 +62,7 @@ export const CadStep1 = () => (
- +

Tell us how often your course meets.

We’ll adjust project plans based on your schedule. This way, you @@ -78,7 +78,7 @@ export const CadStep1 = () => ( How many times per week do you have class? ( How many minutes is each class? { /> - + What is this Project About? @@ -48,13 +48,13 @@ export const ProjectOverview = () => { mattis sem turpis id dictum. Volutpat ornare turpis ultrices augue bibendum pellentesque. Habitasse. - Essential Questions - +

  • How are structures in the body organized?
  • @@ -68,7 +68,7 @@ export const ProjectOverview = () => { Key Take Aways - +
    1. Groups of specialized cells make up organs and body systems, diff --git a/docs/CODE_GUIDELINES.md b/docs/CODE_GUIDELINES.md index a1c2655f7..e009a7f28 100644 --- a/docs/CODE_GUIDELINES.md +++ b/docs/CODE_GUIDELINES.md @@ -249,7 +249,7 @@ import { EdsThemeColorUtilitySuccessForeground } from 'src/tokens-dist/ts/colors ## Utility classes -EDS provides a number of utility classes (e.g. `u-margin-bottom-lg` and `u-padding-none`) that can be appended to components (e.g. ``) in order to achieve certain style results. Utility classes provide an additional layer to help "massage" components into place without having to overwhelm component styles with too many style variants. +EDS provides a number of utility classes (e.g. `u-margin-bottom-xl` and `u-padding-none`) that can be appended to components (e.g. ``) in order to achieve certain style results. Utility classes provide an additional layer to help "massage" components into place without having to overwhelm component styles with too many style variants. - Utility classes can be found in `src/components/Utilities` - Utility classes use the `!important` declaration to override any existing component styles diff --git a/src/components/DragDrop/DragDrop.stories.tsx b/src/components/DragDrop/DragDrop.stories.tsx index b1171b549..af0a6e734 100644 --- a/src/components/DragDrop/DragDrop.stories.tsx +++ b/src/components/DragDrop/DragDrop.stories.tsx @@ -95,7 +95,7 @@ Default.args = { itemIds: [], emptyContent: ( <> - +

      Drag in available projects to build your couse plan

      Default story renders snapshot 1`] = ` data-rbd-droppable-id="container-2" >

      Drag in available projects to build your couse plan diff --git a/src/components/Utilities/Spacing.css b/src/components/Utilities/Spacing.css index 4f1bb0e8f..c2fe5549d 100644 --- a/src/components/Utilities/Spacing.css +++ b/src/components/Utilities/Spacing.css @@ -30,9 +30,17 @@ /** * Margin large - * 1) Forces margin to 2rem + * 1) Forces margin to 1.5rem */ .u-margin-lg { + margin: var(--eds-size-3) !important; +} + +/** + * Margin xl + * 1) Forces margin to 2rem + */ +.u-margin-xl { margin: var(--eds-size-4) !important; } @@ -62,25 +70,33 @@ /** * Margin top large - * 1) Forces margin top to 2rem + * 1) Forces margin top to 1.5rem */ .u-margin-top-lg { - margin-top: var(--eds-size-4) !important; + margin-top: var(--eds-size-3) !important; } /** * Margin top xl - * 1) Forces margin top to 4rem + * 1) Forces margin top to 2rem */ .u-margin-top-xl { + margin-top: var(--eds-size-4) !important; +} + +/** + * Margin top xxl + * 1) Forces margin top to 3rem + */ +.u-margin-top-xxl { margin-top: var(--eds-size-6) !important; } /** - * Margin bottom XXL + * Margin bottom xxxL * 1) Forces bottom margin to 6rem */ -.u-margin-top-xxl { +.u-margin-top-xxxl { margin-top: var(--eds-size-12) !important; } @@ -110,9 +126,17 @@ /** * Margin right large - * 1) Forces right margin to 2rem + * 1) Forces margin right to 1.5rem */ .u-margin-right-lg { + margin-right: var(--eds-size-3) !important; +} + +/** + * Margin right xl + * 1) Forces right margin to 2rem + */ +.u-margin-right-xl { margin-right: var(--eds-size-4) !important; } @@ -142,9 +166,17 @@ /** * Margin bottom large - * 1) Forces bottom margin to 2rem + * 1) Forces margin bottom to 1.5rem */ .u-margin-bottom-lg { + margin-bottom: var(--eds-size-3) !important; +} + +/** + * Margin bottom xl + * 1) Forces bottom margin to 2rem + */ +.u-margin-bottom-xl { margin-bottom: var(--eds-size-4) !important; } @@ -152,7 +184,7 @@ * Margin bottom extra large * 1) Forces bottom margin to 3rem */ -.u-margin-bottom-xl { +.u-margin-bottom-xxl { margin-bottom: var(--eds-size-6) !important; } @@ -160,7 +192,7 @@ * Margin bottom XXL * 1) Forces bottom margin to 6rem */ -.u-margin-bottom-xxl { +.u-margin-bottom-xxxl { margin-bottom: var(--eds-size-12) !important; } @@ -190,18 +222,18 @@ /** * Margin left large - * 1) Forces left margin to 2rem + * 1) Forces left margin to 1.5rem */ .u-margin-left-lg { - margin-left: var(--eds-size-4) !important; + margin-left: var(--eds-size-3) !important; } /** * Margin left xl - * 1) Forces margin left to 4rem + * 1) Forces left margin to 2rem */ .u-margin-left-xl { - margin-left: var(--eds-size-8) !important; + margin-left: var(--eds-size-4) !important; } /*------------------------------------*\ @@ -233,10 +265,18 @@ } /** - * Padding large - * 1) Forces padding to 2rem + * Padding + * 1) Forces padding to 1.5rem */ .u-padding-lg { + padding: var(--eds-size-3) !important; +} + +/** + * Padding xl + * 1) Forces padding to 2rem + */ +.u-padding-xl { padding: var(--eds-size-4) !important; } @@ -266,9 +306,17 @@ /** * Padding top large - * 1) Forces padding top to 2rem + * 1) Forces padding top to 1.5rem */ .u-padding-top-lg { + padding: var(--eds-size-3) !important; +} + +/** + * Padding top xl + * 1) Forces padding top to 2rem + */ +.u-padding-top-xl { padding-top: var(--eds-size-4) !important; } @@ -298,9 +346,17 @@ /** * Padding right large - * 1) Forces right padding to 2rem + * 1) Forces padding right to 1.5rem */ .u-padding-right-lg { + padding: var(--eds-size-3) !important; +} + +/** + * Padding right xl + * 1) Forces right padding to 2rem + */ +.u-padding-right-xl { padding-right: var(--eds-size-4) !important; } @@ -330,9 +386,17 @@ /** * Padding bottom large - * 1) Forces bottom padding to 2rem + * 1) Forces bottom padding to 1.5rem */ .u-padding-bottom-lg { + padding-bottom: var(--eds-size-3) !important; +} + +/** + * Padding bottom xl + * 1) Forces bottom padding to 2rem + */ +.u-padding-bottom-xl { padding-bottom: var(--eds-size-4) !important; } @@ -362,8 +426,16 @@ /** * Padding left large - * 1) Forces left padding to 2rem + * 1) Forces left padding to 1.5rem */ .u-padding-left-lg { + padding-left: var(--eds-size-3) !important; +} + +/** + * Padding left xl + * 1) Forces left padding to 2rem + */ +.u-padding-left-xl { padding-left: var(--eds-size-4) !important; } diff --git a/src/upcoming-components/Hero/Hero.stories.tsx b/src/upcoming-components/Hero/Hero.stories.tsx index 2932efff1..da26ef174 100644 --- a/src/upcoming-components/Hero/Hero.stories.tsx +++ b/src/upcoming-components/Hero/Hero.stories.tsx @@ -17,7 +17,7 @@ export default { const Template: Story = (args) => ( Hero title - This is the hero description + This is the hero description );