Merge pull request #290 from LifeSG/minor-colour-changes

Minor aesthetic changes
LifeSG · Aug 30, 2023 · 55914b5 · 55914b5
2 parents e679779 + c8a2589
commit 55914b5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 19 deletions.
diff --git a/src/form/form-label.style.tsx b/src/form/form-label.style.tsx
@@ -2,21 +2,12 @@ import styled from "styled-components";
 import { Color } from "../color";
 import { Text, TextStyleHelper } from "../text";
 
-// =============================================================================
-// STYLE INTERFACE
-// =============================================================================
-interface LabelProps {
-    disabled?: boolean;
-}
-
 // =============================================================================
 // STYLING
 // =============================================================================
-export const Label = styled.label<LabelProps>`
+export const Label = styled.label`
     ${TextStyleHelper.getTextStyle("H5", "semibold")}
-
-    color: ${(props) =>
-        props.disabled ? Color.Neutral[4](props) : Color.Neutral[3](props)};
+    color: ${Color.Neutral[3]};
     margin-bottom: 0.5rem;
     display: inline-block;
 
@@ -36,7 +27,6 @@ export const ErrorMessage = styled(Text.H6)`
     outline: none;
 `;
 
-export const Subtitle = styled(Text.BodySmall)<LabelProps>`
-    color: ${(props) =>
-        props.disabled ? Color.Neutral[4](props) : Color.Neutral[3](props)};
+export const Subtitle = styled(Text.BodySmall)`
+    color: ${Color.Neutral[3]};
 `;
diff --git a/src/modal/modal-box.styles.tsx b/src/modal/modal-box.styles.tsx
@@ -35,5 +35,5 @@ export const CloseButton = styled(ClickableIcon)`
 export const CloseIcon = styled(CrossIcon)`
     height: 1.5rem;
     width: 1.5rem;
-    color: ${Color.Neutral[4]};
+    color: ${Color.Neutral[3]};
 `;
diff --git a/src/spec/design-token-spec/base-design-token-set.ts b/src/spec/design-token-spec/base-design-token-set.ts
@@ -4,10 +4,10 @@ import { DesignTokenSet } from "../../design-token/types";
 
 export const BaseDesignTokenSet: DesignTokenSet = {
     InputBoxShadow: css`
-        inset 0 0 6px 1px ${Color.Shadow.Accent}
+        inset 0 0 3px 0px ${Color.Shadow.Accent}
     `,
     InputErrorBoxShadow: css`
-        inset 0 0 6px 1px ${Color.Shadow.Red}
+        inset 0 0 3px 0px ${Color.Shadow.Red}
     `,
     ElevationBoxShadow: css`
       0px 2px 8px ${Color.Shadow.Elevation}

diff --git a/src/spec/design-token-spec/rbs-design-token-set.ts b/src/spec/design-token-spec/rbs-design-token-set.ts
@@ -4,10 +4,10 @@ import { DesignTokenSet } from "../../design-token/types";
 
 export const RBSDesignTokenSet: DesignTokenSet = {
     InputBoxShadow: css`
-        inset 0 0 6px 1px ${Color.Shadow.Accent}
+        inset 0 0 3px 0px ${Color.Shadow.Accent}
     `,
     InputErrorBoxShadow: css`
-        inset 0 0 6px 1px ${Color.Shadow.Red}
+        inset 0 0 3px 0px ${Color.Shadow.Red}
     `,
     ElevationBoxShadow: css`
       0px 2px 8px ${Color.Shadow.Elevation}