(HDS-2107) small fixes to style imports which broke new builds, remov…

…e normalize.

packages/core/package.json

@@ -31,7 +31,6 @@
     "copyfiles": "2.2.0",
     "cssnano": "4.1.10",
     "hds-design-tokens": "3.4.0",
-    "normalize.css": "8.0.1",
     "postcss": "8.2.15",
     "postcss-cli": "8.3.1",
     "postcss-import": "12.0.1",

packages/core/src/base.css

@@ -1,4 +1,12 @@
-@import url("normalize.css");
 @import url("hds-design-tokens");
 @import url("utils/animations.css");
 @import url("utils/helpers.css");
+
+/*
+ * Normalize.css rule
+ * 1. Prevent adjustments of font size after orientation changes in iOS.
+ */
+
+html {
+  -webkit-text-size-adjust: 100%; /* 1 */
+}

packages/react/.templates/new-component/NewComponent.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
 
-// import base styles
 import '../../styles/base.css';
 
 import styles from './[-replace-name-capital-].module.scss';

packages/react/src/components/accordion/Accordion.tsx

@@ -2,9 +2,7 @@ import React, { useEffect, useRef, useState } from 'react';
 import uniqueId from 'lodash.uniqueid';
 import pickBy from 'lodash.pickby';
 
-// import base styles
 import '../../styles/base.css';
-
 import styles from './Accordion.module.scss';
 import classNames from '../../utils/classNames';
 import { IconAngleDown, IconAngleUp } from '../../icons';

packages/react/src/components/breadcrumb/Breadcrumb.tsx

@@ -1,8 +1,6 @@
 import React from 'react';
 
-// import base styles
 import '../../styles/base.css';
-
 import styles from './Breadcrumb.module.scss';
 import { Link } from '../link';
 import { IconAngleLeft, IconAngleRight } from '../../icons';

packages/react/src/components/button/Button.tsx

@@ -1,8 +1,6 @@
 import React from 'react';
 
-// import base styles
 import '../../styles/base.css';
-
 import { LoadingSpinner } from '../loadingSpinner';
 import styles from './Button.module.scss';
 import classNames from '../../utils/classNames';

packages/react/src/components/card/Card.module.scss

@@ -1,14 +1,5 @@
 .card {
-  --background-color: var(--color-white);
-  --border-color: var(--color-black-90);
-  --color: var(--color-black-90);
-  --border-width: 2px;
-  --padding-horizontal: var(--spacing-l);
-  --padding-vertical: var(--spacing-m);
-
-  background-color: var(--background-color);
-  color: var(--color);
-  padding: var(--padding-vertical) var(--padding-horizontal);
+  composes: hds-card from 'hds-core/lib/components/card/card.css';
 }
 
 .boxShadow {

packages/react/src/components/card/Card.tsx

@@ -1,8 +1,6 @@
 import React from 'react';
 
-// import base styles
 import '../../styles/base.css';
-
 import styles from './Card.module.scss';
 import classNames from '../../utils/classNames';
 import { useTheme } from '../../hooks/useTheme';

packages/react/src/components/checkbox/Checkbox.tsx

@@ -1,8 +1,6 @@
 import React, { useEffect, useRef } from 'react';
 
-// import base styles
 import '../../styles/base.css';
-
 import styles from './Checkbox.module.css';
 import classNames from '../../utils/classNames';
 import mergeRefWithInternalRef from '../../utils/mergeRefWithInternalRef';

packages/react/src/components/columns/Columns.tsx

@@ -1,8 +1,6 @@
 import React from 'react';
 
-// import base styles
 import '../../styles/base.css';
-
 import styles from './Columns.module.css';
 
 export type ColumnsProps = React.PropsWithChildren<Record<string, unknown>>;

packages/react/src/components/container/Container.tsx

@@ -1,8 +1,6 @@
 import React from 'react';
 
-// import base styles
 import '../../styles/base.css';
-
 import styles from './Container.module.scss';
 import classNames from '../../utils/classNames';
 

packages/react/src/components/dialog/Dialog.tsx

@@ -1,9 +1,7 @@
 import React, { useEffect, RefObject, useCallback, useState, useRef, createRef } from 'react';
 import ReactDOM from 'react-dom';
 
-// import base styles
 import '../../styles/base.css';
-
 import styles from './Dialog.module.scss';
 import classNames from '../../utils/classNames';
 import { useTheme } from '../../hooks/useTheme';

packages/react/src/components/dropdown/combobox/Combobox.tsx

@@ -6,9 +6,7 @@ import isEqual from 'lodash.isequal';
 import uniqueId from 'lodash.uniqueid';
 import { useVirtual } from 'react-virtual';
 
-// import base styles
 import '../../../styles/base.css';
-
 import styles from './Combobox.module.scss';
 import { FieldLabel } from '../../../internal/field-label/FieldLabel';
 import classNames from '../../../utils/classNames';

packages/react/src/components/dropdown/select/Select.tsx

@@ -13,9 +13,7 @@ import isEqual from 'lodash.isequal';
 import uniqueId from 'lodash.uniqueid';
 import { useVirtual } from 'react-virtual';
 
-// import base styles
 import '../../../styles/base.css';
-
 import styles from './Select.module.scss';
 import { FieldLabel } from '../../../internal/field-label/FieldLabel';
 import classNames from '../../../utils/classNames';

packages/react/src/components/errorSummary/ErrorSummary.tsx

@@ -1,8 +1,6 @@
 import React, { useRef, useEffect } from 'react';
 
-// import base styles
 import '../../styles/base.css';
-
 import notificationStyles from '../notification/Notification.module.css';
 import errorSummaryStyles from './ErrorSummary.module.scss';
 import { IconAlertCircleFill } from '../../icons';

packages/react/src/components/fieldset/Fieldset.tsx

@@ -1,8 +1,6 @@
 import React from 'react';
 
-// import base styles
 import '../../styles/base.css';
-
 import styles from './Fieldset.module.scss';
 import classNames from '../../utils/classNames';
 import { Tooltip } from '../tooltip';

packages/react/src/components/fileInput/FileInput.tsx

@@ -1,9 +1,7 @@
 import React, { ChangeEvent, useEffect, useRef, useState } from 'react';
 import uniqueId from 'lodash.uniqueid';
 
-// import base styles
 import '../../styles/base.css';
-
 import composeAriaDescribedBy from '../../utils/composeAriaDescribedBy';
 import classNames from '../../utils/classNames';
 import { Button } from '../button';

packages/react/src/components/footer/Footer.tsx

@@ -1,8 +1,6 @@
 import React from 'react';
 
-// import base styles
 import '../../styles/base.css';
-
 import styles from './Footer.module.scss';
 import { Koros, KorosType } from '../koros';
 import classNames from '../../utils/classNames';

packages/react/src/components/footer/components/footerBase/FooterBase.tsx

@@ -1,8 +1,6 @@
 import React, { cloneElement, Fragment, isValidElement, MouseEventHandler } from 'react';
 
-// import base styles
 import '../../../../styles/base.css';
-
 import styles from './FooterBase.module.scss';
 import { Logo } from '../../../logo';
 import { IconArrowUp } from '../../../../icons';

packages/react/src/components/footer/components/footerCustom/FooterCustom.tsx

@@ -1,8 +1,6 @@
 import React from 'react';
 
-// import base styles
 import '../../../../styles/base.css';
-
 import styles from './FooterCustom.module.scss';
 import classNames from '../../../../utils/classNames';
 

packages/react/src/components/footer/components/footerGroupHeading/FooterGroupHeading.tsx

@@ -1,8 +1,6 @@
 import React from 'react';
 
-// import base styles
 import '../../../../styles/base.css';
-
 import styles from './FooterGroupHeading.module.scss';
 import { MergeElementProps } from '../../../../common/types';
 import classNames from '../../../../utils/classNames';

packages/react/src/components/footer/components/footerLink/FooterLink.tsx

@@ -1,8 +1,6 @@
 import React from 'react';
 
-// import base styles
 import '../../../../styles/base.css';
-
 import styles from './FooterLink.module.scss';
 import { Link } from '../../../link';
 import { MergeElementProps } from '../../../../common/types';

packages/react/src/components/footer/components/footerNavigation/FooterNavigation.tsx

@@ -1,8 +1,6 @@
 import React, { cloneElement, Fragment, isValidElement } from 'react';
 
-// import base styles
 import '../../../../styles/base.css';
-
 import styles from './FooterNavigation.module.scss';
 import { getChildElementsEvenIfContainersInbetween } from '../../../../utils/getChildren';
 import { FooterVariant } from '../../Footer.interface';

packages/react/src/components/footer/components/footerNavigationGroup/FooterNavigationGroup.tsx

@@ -1,8 +1,6 @@
 import React, { cloneElement, Fragment, isValidElement } from 'react';
 
-// import base styles
 import '../../../../styles/base.css';
-
 import { FooterVariant } from '../../Footer.interface';
 import { useMediaQueryLessThan } from '../../../../hooks/useMediaQuery';
 import styles from './FooterNavigationGroup.module.scss';

packages/react/src/components/footer/components/footerUtilities/FooterUtilities.tsx

@@ -1,8 +1,6 @@
 import React, { cloneElement, Fragment, isValidElement } from 'react';
 
-// import base styles
 import '../../../../styles/base.css';
-
 import styles from './FooterUtilities.module.scss';
 import classNames from '../../../../utils/classNames';
 import { getChildElementsEvenIfContainersInbetween } from '../../../../utils/getChildren';

packages/react/src/components/footer/components/footerUtilityGroup/FooterUtilityGroup.tsx

@@ -1,8 +1,6 @@
 import React, { Fragment, cloneElement, isValidElement } from 'react';
 
-// import base styles
 import '../../../../styles/base.css';
-
 import styles from './FooterUtilityGroup.module.scss';
 import classNames from '../../../../utils/classNames';
 import { getChildElementsEvenIfContainersInbetween } from '../../../../utils/getChildren';

packages/react/src/components/header/Header.module.scss

@@ -62,6 +62,78 @@
     --header-margin: var(--spacing-xs);
   }
 
+  /**
+  * Normalize.css rules
+  * 1. Change the font styles in all browsers.
+  * 2. Remove the margin in Firefox and Safari.
+  */
+
+  button,
+  input,
+  optgroup,
+  select,
+  textarea {
+    font-family: inherit; /* 1 */
+    font-size: 100%; /* 1 */
+    line-height: 1.15; /* 1 */
+    margin: 0; /* 2 */
+  }
+
+  /**
+  * Show the overflow in IE.
+  * 1. Show the overflow in Edge.
+  */
+
+  button,
+  input { /* 1 */
+    overflow: visible;
+  }
+
+  /**
+  * Remove the inheritance of text transform in Edge, Firefox, and IE.
+  * 1. Remove the inheritance of text transform in Firefox.
+  */
+
+  button,
+  select { /* 1 */
+    text-transform: none;
+  }
+
+  /**
+  * Correct the inability to style clickable types in iOS and Safari.
+  */
+
+  button,
+  [type="button"],
+  [type="reset"],
+  [type="submit"] {
+    -webkit-appearance: button;
+  }
+
+  /**
+  * Remove the inner border and padding in Firefox.
+  */
+
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0;
+  }
+
+  /**
+  * Restore the focus styles unset by the previous rule.
+  */
+
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText;
+  }
+
+
   &.theme-dark {
     --color-focus-outline: var(--color-white);
     --header-color: var(--color-white);

packages/react/src/components/header/Header.tsx

@@ -12,7 +12,6 @@ import { HeaderSearch } from './components/headerSearch';
 import { SkipLink } from '../../internal/skipLink';
 import { LanguageProvider, LanguageProviderProps } from './LanguageContext';
 import { HeaderTheme } from './Header.type';
-// import base styles
 import '../../styles/base.css';
 import styles from './Header.module.scss';
 import { useTheme } from '../../hooks/useTheme';

packages/react/src/components/header/components/headerLink/HeaderLink.tsx

@@ -1,7 +1,6 @@
 import React, { cloneElement, useCallback, useEffect, useRef, useState } from 'react';
 import { v4 as uuidv4 } from 'uuid';
 
-// import base styles
 import '../../../../styles/base.css';
 import styles from './HeaderLink.module.scss';
 import { styleBoundClassNames } from '../../../../utils/classNames';

packages/react/src/components/header/components/headerLink/headerLinkDropdown/HeaderLinkDropdown.tsx

@@ -1,6 +1,5 @@
 import React, { cloneElement, isValidElement, useRef, useState } from 'react';
 
-// import base styles
 import '../../../../../styles/base.css';
 import styles from './HeaderLinkDropdown.module.scss';
 import { IconAngleDown, IconAngleLeft, IconAngleRight } from '../../../../../icons';

packages/react/src/components/header/components/headerNavigationMenu/HeaderNavigationMenu.tsx

@@ -1,8 +1,6 @@
 import React, { cloneElement, isValidElement, useEffect } from 'react';
 
-// import base styles
 import '../../../../styles/base.css';
-
 import { useHeaderContext, useSetHeaderContext } from '../../HeaderContext';
 import classNames from '../../../../utils/classNames';
 import { getChildElementsEvenIfContainersInbetween, getChildrenAsArray } from '../../../../utils/getChildren';

packages/react/src/components/header/components/headerUniversalBar/HeaderUniversalBar.tsx

@@ -1,6 +1,5 @@
 import React, { cloneElement, useEffect } from 'react';
 
-// import base styles
 import '../../../../styles/base.css';
 import styles from './HeaderUniversalBar.module.scss';
 import { HeaderLink } from '../headerLink/HeaderLink';

packages/react/src/components/hero/Hero.tsx

@@ -1,7 +1,6 @@
 /* eslint-disable prettier/prettier */
 import React from 'react';
 
-// import base styles
 import '../../styles/base.css';
 import styles from './Hero.module.scss';
 import classNames from '../../utils/classNames';

packages/react/src/components/highlight/Highlight.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 
-// import core base styles
-import 'hds-core';
+import '../../styles/base.css';
 import classNames from '../../utils/classNames';
 import { useTheme } from '../../hooks/useTheme';
 import styles from './Highlight.module.scss';

packages/react/src/components/imageWithCard/ImageWithCard.tsx

@@ -1,8 +1,6 @@
 import React from 'react';
 
-// import base styles
 import '../../styles/base.css';
-
 import classNames from '../../utils/classNames';
 import styles from './ImageWithCard.module.css';