@digigov/css 2.0.0-85c27c19 → 2.0.0-8bbad051

package/src/components/header.css

@@ -1,30 +1,25 @@
+@import './header.common.css';
+
 .ds-header {
-  @apply relative border-b-8 print:border-b-2 border-tertiary print:bg-white;
-  background: var(--header-background);
-  border: var(--header-border);
-  border-width: var(--header-border-width);
+  @apply util-header print:border-b-2 print:bg-white;
 }
 .ds-header__content {
-  @apply px-4 py-2 mx-auto max-w-5xl w-full flex justify-between items-center flex-wrap sm:flex-nowrap
-  print:px-0 gap-3;
+  @apply util-header__content print:px-0;
 }
 .ds-header__section {
-  @apply flex justify-start flex-wrap items-center gap-x-4 gap-y-2
-  print:gap-1;
+  @apply util-header__section gap-x-4 gap-y-2 print:gap-1;
   &:last-child:not(:first-child) {
     @apply flex-1 justify-end sm:flex-none sm:justify-start;
   }
 }
 .ds-header__logo {
-  @apply h-12 print:hidden;
-  print-color-adjust: exact !important;
-  -webkit-print-color-adjust: exact !important;
+  @apply util-header__logo print:hidden;
 }
 .ds-header__logo-inverted {
-  @apply h-12 hidden print:block;
+  @apply util-header__logo-inverted print:block;
 }
 .ds-header__secondary-logo {
-  @apply h-10 print:hidden;
+  @apply util-header__secondary-logo print:hidden;
 }
 .ds-header__link:focus {
   box-shadow: 0 0 0 4px var(--color-focus);
@@ -32,10 +27,7 @@
   text-decoration: none;
 }
 .ds-header__title {
-  @apply font-bold text-2xl leading-10 tracking-wide no-underline
-  w-auto align-middle hover:no-underline 
-  print:text-base-content;
-  color: var(--header__title-color);
+  @apply util-header__title util-header__title-text w-auto print:text-base-content;
   &:hover {
     /* @apply text-white; */
     color: var(--header__title-color-hover);
@@ -47,7 +39,7 @@
   }
 }
 .ds-header-nav-menu__content {
-  @apply flex justify-start items-center gap-x-4 gap-y-2 print:gap-1;
+  @apply util-header-nav-menu__content gap-x-4 gap-y-2 print:gap-1;
 }
 
 /* overrides */
@@ -73,6 +65,10 @@
         }
       }
     }
+    > .ds-body {
+      @apply print:text-base-content;
+      color: var(--color-header-text);
+    }
   }
   .ds-dropdown {
     @apply print:hidden;
@@ -92,10 +88,10 @@
       }
     }
     .ds-svg-icon {
-      fill: var(--color-white);
+      fill: var(--color-header-text);
     }
   }
-  .ds-phase-banner__text {
+  .ds-phase-banner__message {
     @apply print:text-base-content;
     color: var(--color-header-text);
   }

package/src/components/header.native.css

@@ -0,0 +1,29 @@
+@import './header.common.css';
+
+.ds-header {
+  @apply util-header;
+}
+.ds-header__content {
+  @apply util-header__content;
+}
+.ds-header__section {
+  @apply util-header__section flex-row;
+}
+.ds-header__logo {
+  @apply util-header__logo;
+}
+.ds-header__logo-inverted {
+  @apply util-header__logo-inverted;
+}
+.ds-header__secondary-logo {
+  @apply util-header__secondary-logo;
+}
+.ds-header__title {
+  @apply util-header__title;
+}
+.ds-header__title__text {
+  @apply util-header__title-text;
+}
+.ds-header-nav-menu__content {
+  @apply util-header-nav-menu__content;
+}

package/src/components/index.css

@@ -43,6 +43,7 @@
 @import './task-list.css';
 @import './timeline.css';
 @import './typography.css';
+@import './blockquote.css';
 @import './notification-banner.css';
 @import './warning-text.css';
 @import './kitchensink.css';

package/src/components/kitchensink.css

@@ -40,10 +40,10 @@
   .ds-dropdown {
     margin-bottom: 20rem;
   }
-  .ds-modal__body {
+  .ds-modal {
     margin: 1rem;
   }
-  .ds-modal {
+  .ds-modal-container {
     position: inherit;
   }
 }

package/src/components/layout.common.css

@@ -0,0 +1,36 @@
+/* stylelint-disable digigov/nest-related-rules */
+/* stylelint-disable digigov/enforce-class-selector-namespace */
+@tailwind utilities;
+
+@layer utilities {
+  .util-layout {
+    @apply flex flex-col flex-wrap;
+  }
+  .util-btn-group {
+    @apply flex flex-row flex-wrap items-center print:items-baseline;
+  }
+  .util-top {
+    @apply mb-4;
+  }
+}
+.util-aside {
+  @apply flex flex-wrap flex-col md:top-8 print:order-1;
+}
+.util-bottom {
+  @apply flex flex-wrap;
+}
+.util-section-break {
+  @apply px-4 py-2 border-0 bg-transparent;
+}
+.util-section-break--visible {
+  @apply border-t border-base-300 border-solid;
+}
+.util-section-break--md {
+  @apply mb-3 md:mb-5;
+}
+.util-section-break--lg {
+  @apply mb-5 md:mb-7;
+}
+.util-section-break--xl {
+  @apply mb-7 md:mb-9;
+}

package/src/components/layout.css

@@ -1,6 +1,7 @@
+@import './layout.common.css';
+
 .ds-layout {
-  display: flex;
-  flex-flow: column wrap;
+  @apply util-layout;
   &.ds-layout--full-height {
     min-height: 100vh;
   }
@@ -13,10 +14,10 @@
   }
 }
 .ds-top {
-  @apply mb-4;
+  @apply util-top;
 }
 .ds-aside {
-  @apply flex flex-wrap flex-col md:top-8 h-fit print:order-1;
+  @apply util-aside h-fit;
   &.ds-aside--sticky {
     @apply md:sticky;
     &.ds-aside--full-height {
@@ -39,10 +40,10 @@
   }
 }
 .ds-bottom {
-  @apply w-full flex flex-wrap  box-border;
+  @apply util-bottom w-full box-border;
 }
 .ds-btn-group {
-  @apply flex flex-wrap items-center gap-4 mb-6 print:items-baseline;
+  @apply util-btn-group gap-x-4 gap-y-4 mb-6;
 }
 @media print {
   /* When ds-btn-group is empty at print, content at :after limits its height.  */
@@ -51,18 +52,18 @@
   }
 }
 .ds-section-break {
-  @apply m-auto px-4 py-2 border-0 w-full bg-transparent;
+  @apply util-section-break m-auto w-full;
   &.ds-section-break--visible {
-    @apply border-t border-base-300 border-solid;
+    @apply util-section-break--visible;
   }
   &.ds-section-break--md {
-    @apply mb-3 md:mb-5;
+    @apply util-section-break--md;
   }
   &.ds-section-break--lg {
-    @apply mb-5 md:mb-7;
+    @apply util-section-break--lg;
   }
   &.ds-section-break--xl {
-    @apply mb-7 md:mb-9;
+    @apply util-section-break--xl;
   }
 }
 

package/src/components/layout.native.css

@@ -0,0 +1,40 @@
+/* stylelint-disable digigov/nest-related-rules */
+@import './layout.common.css';
+
+.ds-btn-group {
+  @apply util-btn-group;
+  gap: 1rem 1rem;
+}
+.ds-layout {
+  @apply util-layout;
+}
+.ds-layout--full-height {
+  min-height: 100%;
+}
+.ds-container {
+  @apply px-3 md:px-6 flex-1;
+}
+.ds-top {
+  @apply util-top;
+}
+.ds-aside {
+  @apply util-aside;
+}
+.ds-bottom {
+  @apply util-bottom flex-1;
+}
+.ds-section-break {
+  @apply util-section-break w-full;
+}
+.ds-section-break--visible {
+  @apply util-section-break--visible;
+}
+.ds-section-break--md {
+  @apply util-section-break--md;
+}
+.ds-section-break--lg {
+  @apply util-section-break--lg;
+}
+.ds-section-break--xl {
+  @apply util-section-break--xl;
+}

package/src/components/loader.common.css

@@ -0,0 +1,7 @@
+@tailwind utilities;
+
+@layer utilities {
+  .util-loader {
+    @apply m-auto overflow-hidden;
+  }
+}

package/src/components/loader.css

@@ -1,5 +1,7 @@
+@import './loader.common.css';
+
 .ds-loader {
-  @apply h-fit w-fit m-auto overflow-hidden print:hidden;
+  @apply util-loader h-fit w-fit print:hidden;
 }
 .ds-circular-progress {
   @apply w-fit h-10;

package/src/components/loader.native.css

@@ -0,0 +1,5 @@
+@import './loader.common.css';
+
+.ds-loader {
+  @apply util-loader;
+}

package/src/components/masthead.css

@@ -43,7 +43,7 @@
     .ds-back-link {
       @apply text-white print:text-base-content;
     }
-    .ds-phase-banner__text {
+    .ds-phase-banner__message {
       @apply text-white print:text-base-content;
     }
   }

package/src/components/misc.css

@@ -34,7 +34,7 @@
   }
 }
 
-.ds-cookie-banner {
+.ds-banner-container {
   @apply bg-base-200;
 }
 

package/src/components/modal.common.css

@@ -0,0 +1,16 @@
+@tailwind utilities;
+
+@layer utilities {
+  .util-modal {
+    @apply bg-base-100 p-6 border border-solid border-base-500;
+  }
+  .util-modal__body {
+    @apply gap-6 -my-4;
+  }
+  .util-modal__content-text {
+    @apply text-base lg:text-xl text-lg;
+  }
+  .util-modal__action {
+    @apply flex flex-wrap items-center gap-4;
+  }
+}

package/src/components/modal.css

@@ -1,43 +1,47 @@
-.ds-modal {
+@import './modal.common.css';
+
+.ds-modal-container {
   @apply hidden justify-center items-center content-center text-left
   mb-7 text-base-content bg-opacity-50 bg-base-700
   fixed z-50 left-0 top-0 w-full h-full overflow-auto;
 
-  &.ds-modal--open {
+  &.ds-modal-container--open {
     @apply flex;
   }
 
-  &.ds-modal--dense,
+  &.ds-modal-container--dense,
   &.ds-dense & {
-    .ds-modal__body {
+    .ds-modal {
       @apply px-4 py-0;
     }
-    .ds-modal__container {
+    .ds-modal__body {
       @apply gap-4 my-0;
     }
   }
 }
-.ds-modal__body {
-  @apply w-full max-w-md md:max-w-lg lg:max-w-4xl 
-  h-fit md:h-auto overflow-y-auto
-  bg-base-100
-  border border-solid border-base-500 p-6;
+.ds-modal {
+  @apply util-modal w-full max-w-md md:max-w-lg lg:max-w-4xl 
+  h-fit md:h-auto overflow-y-auto;
   max-height: 95vh;
 }
-.ds-modal__container {
-  @apply grid gap-6 -my-4;
+.ds-modal__body {
+  @apply grid util-modal__body;
   .ds-modal__action {
     @apply mb-0;
   }
-  >.ds-heading-xs, >.ds-heading-sm, >.ds-heading-md, >.ds-heading-lg, >.ds-heading-xl {
+  > .ds-heading-xs,
+  > .ds-heading-sm,
+  > .ds-heading-md,
+  > .ds-heading-lg,
+  > .ds-heading-xl {
     @apply mb-0;
   }
 }
 .ds-modal__content {
-  @apply text-base lg:text-xl text-lg;
+  @apply util-modal__content-text;
 }
 .ds-modal__action {
-  @apply flex flex-wrap items-center gap-4;
+  @apply util-modal__action;
   .ds-link,
   .ds-btn {
     @apply mb-0;

package/src/components/modal.native.css

@@ -0,0 +1,18 @@
+@import './modal.common.css';
+
+.ds-modal-container {
+  @apply absolute justify-center items-center top-0 left-0 right-0 bottom-0;
+  background-color: rgba(var(--color-black-rgb), 0.5);
+}
+.ds-modal {
+  @apply util-modal;
+}
+.ds-modal__body {
+  @apply util-modal__body;
+}
+.ds-modal__content__text {
+  @apply util-modal__content-text;
+}
+.ds-modal__action {
+  @apply util-modal__action flex-row;
+}

package/src/components/nav.common.css

@@ -0,0 +1,22 @@
+@tailwind utilities;
+
+@layer utilities {
+  .util-nav {
+    @apply relative w-full bg-base-100 text-base-content;
+  }
+
+  .util-nav__list {
+    @apply w-full m-0 max-w-5xl flex flex-wrap flex-col;
+  }
+  .util-nav__list--full-width {
+    @apply max-w-none;
+  }
+  .util-nav__list-item-badge {
+    @apply items-center justify-center p-1 bg-error relative bottom-1 rounded-3xl;
+    min-width: 24px;
+    min-height: 24px;
+  }
+  .util-nav__list-item-badge-text {
+    @apply text-white text-xs md:text-xs font-semibold no-underline;
+  }
+}

package/src/components/nav.css

@@ -1,5 +1,7 @@
+@import './nav.common.css';
+
 .ds-nav {
-  @apply relative block w-full h-auto bg-base-100 text-base-content;
+  @apply util-nav h-auto;
   &.ds-nav--hidden {
     @apply hidden;
   }
@@ -44,7 +46,7 @@
   }
 }
 .ds-nav__list {
-  @apply w-full m-0 max-w-5xl static flex flex-wrap flex-col;
+  @apply util-nav__list static;
   &.ds-nav__list--horizontal {
     @apply sm:mx-auto sm:gap-x-6 sm:py-1 px-4 sm:flex-row;
     .ds-nav__list-item {
@@ -52,7 +54,7 @@
     }
   }
   &.ds-nav__list--full-width {
-    @apply max-w-none;
+    @apply util-nav__list--full-width;
   }
 }
 .ds-nav__list-item {
@@ -78,11 +80,7 @@
 }
 
 .ds-nav__list-item-badge {
-  @apply inline-flex w-fit items-center justify-center p-1 ml-2
-  bg-error text-white text-xs md:text-xs font-semibold no-underline rounded-3xl
-  relative bottom-1;
-  min-width: 24px;
-  min-height: 24px;
+  @apply util-nav__list-item-badge util-nav__list-item-badge-text inline-flex w-fit ml-2;
 }
 .ds-nav-menu {
   @apply flex w-full;

package/src/components/nav.native.css

@@ -0,0 +1,39 @@
+@import './nav.common.css';
+
+.ds-nav {
+  @apply util-nav;
+}
+.ds-nav--border {
+  @apply border-b border-base-400;
+}
+
+.ds-nav__list {
+  @apply util-nav__list;
+}
+.ds-nav__list--vertical {
+  @apply gap-y-3;
+}
+.ds-nav__list--horizontal {
+  @apply mx-auto py-1 px-4 flex-row items-center;
+  column-gap: 1.5rem;
+}
+.ds-nav__list--full-width {
+  @apply util-nav__list--full-width;
+}
+
+.ds-nav__list-item-badge {
+  @apply util-nav__list-item-badge -ml-5;
+}
+.ds-nav__list-item-badge__text {
+  @apply util-nav__list-item-badge-text;
+}
+
+/* EXTRA CLASS */
+
+.ds-nav__list-item-link__text {
+  line-height: 1.2rem;
+  color: var(--link-color);
+}
+.ds-nav__list-item--border-bottom {
+  @apply border-b border-base-300 pb-3 px-4;
+}

package/src/components/notification-banner.common.css

@@ -0,0 +1,46 @@
+/* stylelint-disable declaration-block-no-redundant-longhand-properties */
+/* stylelint-disable digigov/nest-related-rules */
+/* stylelint-disable digigov/enforce-class-selector-namespace */
+@tailwind utilities;
+
+@layer utilities {
+  .util-notification-banner {
+    @apply border-5 mb-6 md:mb-8 print:bg-white;
+
+    /* border-radius: var(--notification-banner-border-radius); */
+  }
+  .util-notification-banner-text {
+    @apply font-normal;
+  }
+  .util-notification-banner--info {
+    @apply bg-info border-info;
+  }
+  .util-notification-banner--success {
+    @apply bg-success border-success;
+  }
+  .util-notification-banner--error {
+    @apply bg-error border-error;
+  }
+  .util-notification-banner__header {
+    @apply print:border-b print:border-base-400 print:text-base-content print:pt-2;
+  }
+  .util-notification-banner__title-text {
+    @apply pb-2 m-0 text-white text-base md:text-lg
+    print:text-base-content print:pt-2;
+  }
+  .util-notification-banner__content {
+    @apply bg-base-100 px-4 py-4 md:px-5 md:py-5;
+  }
+  .util-notification-banner__content-text {
+    @apply text-base-content;
+  }
+  .util-notification-banner_link-text {
+    @apply underline text-base md:text-lg text-link;
+  }
+  .util-notification-banner_link--success-text {
+    @apply text-success;
+  }
+  .util-notification-banner_link--error-text {
+    @apply text-error;
+  }
+}

package/src/components/notification-banner.css

@@ -1,5 +1,7 @@
+@import './notification-banner.common.css';
+
 .ds-notification-banner {
-  @apply border-5 mb-6 md:mb-8 font-normal print:bg-white;
+  @apply util-notification-banner util-notification-banner-text;
   border-radius: var(--notification-banner-border-radius);
   &.ds-notification-banner--dense,
   .ds-dense & {
@@ -12,34 +14,52 @@
     }
   }
   &.ds-notification-banner--info {
-    @apply bg-info border-info;
+    @apply util-notification-banner--info;
   }
   &.ds-notification-banner--success {
-    @apply bg-success border-success;
+    @apply util-notification-banner--success;
     .ds-notification-banner__link {
       &:link:not(:focus) {
         @apply text-success;
       }
     }
   }
-  &.ds-notification-banner--error {
-    @apply bg-error border-error;
+  &.ds-notification-banner--error,
+  &.ds-notification-banner--error-group {
+    @apply util-notification-banner--error;
     .ds-notification-banner__link {
       &:link:not(:focus) {
         @apply text-error;
       }
     }
   }
+  &.ds-notification-banner--error-group {
+    @apply border-0 border-l-5;
+    .ds-notification-error-group-banner__content {
+      @apply flex gap-3 w-full p-3 md:p-4 bg-base-200 print:bg-white;
+      .ds-notification-banner__icon--error-group {
+        @apply text-base-content-invert font-bold bg-error text-3xl leading-10 text-center 
+          rounded-3xl md:min-h-10 min-w-10 h-fit
+          print:bg-white print:border-2 print:border-base-content print:text-base-content;
+      }
+    }
+    .ds-notification-banner__text-error-group {
+      @apply mt-1;
+      .ds-list {
+        @apply mb-2;
+      }
+    }
+  }
 }
 .ds-notification-banner__header {
   @apply text-white p-0 m-0 text-base md:text-lg
-  print:border-b print:border-base-400 print:text-base-content print:pt-2;
+  util-notification-banner__header;
 }
 .ds-notification-banner__title {
   @apply border-b border-transparent pt-1 px-4 sm:px-5 pb-2 font-bold;
 }
 .ds-notification-banner__content {
-  @apply bg-base-100 text-base-content p-4 md:p-5;
+  @apply util-notification-banner__content util-notification-banner__content-text;
   & > * {
     @apply box-border max-w-xl;
   }

package/src/components/notification-banner.native.css

@@ -0,0 +1,42 @@
+/* stylelint-disable declaration-block-no-redundant-longhand-properties */
+/* stylelint-disable digigov/nest-related-rules */
+@import './notification-banner.common.css';
+
+.ds-notification-banner {
+  @apply util-notification-banner;
+}
+.ds-notification-banner__text {
+  @apply util-notification-banner-text;
+}
+.ds-notification-banner--info {
+  @apply util-notification-banner--info;
+}
+.ds-notification-banner--error {
+  @apply util-notification-banner--error;
+}
+.ds-notification-banner--success {
+  @apply util-notification-banner--success;
+}
+
+.ds-notification-banner__header {
+  @apply util-notification-banner__header;
+}
+.ds-notification-banner__title__text {
+  @apply util-notification-banner__title-text px-2 font-bold;
+  @apply mb-0 !important;
+}
+.ds-notification-banner__content {
+  @apply util-notification-banner__content;
+}
+.ds-notification-banner__content__text {
+  @apply util-notification-banner__content-text;
+}
+.ds-notification-banner__link__text {
+  @apply util-notification-banner_link-text;
+}
+.ds-notification-banner__link--success__text {
+  @apply util-notification-banner_link--success-text;
+}
+.ds-notification-banner__link--error__text {
+  @apply util-notification-banner_link--error-text;
+}