@digigov/css 2.0.0-834daea4 → 2.0.0-87b6232d

package/src/components/form.native.css

@@ -2,132 +2,181 @@
 
 /* Field */
 .ds-field {
-    @apply util-field;
+  @apply util-field;
 }
 .ds-field--error {
-    @apply util-field--error;
+  @apply util-field--error;
 }
 .ds-fieldset__legend {
-    @apply util-fieldset__legend;
+  @apply util-fieldset__legend;
 }
 .ds-fieldset__legend__text {
-    @apply util-fieldset__legend-text;
+  @apply util-fieldset__legend-text;
 }
 
 .ds-fieldset__legend--xl__text {
-    @apply util-fieldset__legend--xl-text;
-    /* margin-bottom: calc(0.5*var(--heading-xl-margin-bottom)); */
+  @apply util-fieldset__legend--xl-text;
+  line-height: calc(
+    var(--fieldset__legend--xl-line-height) *
+      var(--fieldset__legend--xl-font-size)
+  );
 }
 .ds-fieldset__legend--lg__text {
-    @apply util-fieldset__legend--lg-text;
+  @apply util-fieldset__legend--lg-text;
+  line-height: calc(
+    var(--fieldset__legend--lg-line-height) *
+      var(--fieldset__legend--lg-font-size)
+  );
 }
 .ds-fieldset__legend--md__text {
-    @apply util-fieldset__legend--md-text;
+  @apply util-fieldset__legend--md-text;
+  line-height: calc(
+    var(--fieldset__legend--md-line-height) *
+      var(--fieldset__legend--md-font-size)
+  );
 }
 .ds-fieldset__legend--sm__text {
-    @apply util-fieldset__legend--sm-text;
+  @apply util-fieldset__legend--sm-text;
+  line-height: calc(
+    var(--fieldset__legend--sm-line-height) *
+      var(--fieldset__legend--sm-font-size)
+  );
 }
 
 /* Label */
 .ds-label {
-    @apply util-label;
+  @apply util-label;
 }
 .ds-label__text {
-    @apply util-label-text;
+  @apply util-label-text;
+  line-height: calc(var(--label-line-height) * var(--label-font-size));
 }
 .ds-label__title--xl__text {
-    @apply util-label__title--xl-text;
+  @apply util-label__title--xl-text;
+  line-height: calc(
+    var(--label__title--xl-line-height) * var(--label__title--xl-font-size)
+  );
 }
 .ds-label__title--lg__text {
-    @apply util-label__title--lg-text;
+  @apply util-label__title--lg-text;
+  line-height: calc(
+    var(--label__title--lg-line-height) * var(--label__title--lg-font-size)
+  );
 }
 .ds-label__title--md__text {
-    @apply util-label__title--md-text;
+  @apply util-label__title--md-text;
+  line-height: calc(
+    var(--label__title--md-line-height) * var(--label__title--md-font-size)
+  );
 }
 .ds-label__title--sm__text {
-    @apply util-label__title--sm-text;
+  @apply util-label__title--sm-text;
+  line-height: calc(
+    var(--label__title--sm-line-height) * var(--label__title--sm-font-size)
+  );
 }
 
 /* Input */
 .ds-input {
-    @apply util-input text-lg;
+  @apply util-input text-lg;
 }
 .ds-input__wrapper--focus {
-    border-width: var(--input-focus-border-width);
-    border-color: var(--color-focus);
+  border-width: var(--input--focus-border-width);
+  border-color: var(--color-focus);
+  margin-top: calc(-1 * var(--input--focus-border-width));
+  margin-bottom: calc(-1 * var(--input--focus-border-width));
 }
-.ds-input--error { 
-    @apply util-input--error;
+.ds-input--error {
+  @apply util-input--error;
 }
 .ds-input--disabled {
-    @apply bg-base-300 border-base-700 text-base-800;
+  @apply bg-base-300 border-base-700 text-base-800;
 }
 
-.ds-input--width-20-char__wrapper--focus {
-}
-.ds-input--width-10-char {
+.ds-input--width-2-char {
+  width: var(--input--width-2-char-width);
+  text-align: center;
 }
-.ds-input--width-5-char {
+.ds-input--width-3-char {
+  width: var(--input--width-3-char-width);
+  text-align: center;
 }
 .ds-input--width-4-char {
-    width: var(--input-width-4-char);
-    text-align: center;
+  width: var(--input--width-4-char-width);
+  text-align: center;
 }
-.ds-input--width-3-char {
+.ds-input--width-5-char {
+  width: var(--input--width-5-char-width);
+  text-align: center;
 }
-.ds-input--width-2-char {
-    width: var(--input-width-2-char);
-    text-align: center;
+.ds-input--width-10-char {
+  width: var(--input--width-10-char-width);
+  text-align: center;
 }
-
-.ds-input--width-20-char__wrapper--focus {
+.ds-input--width-20-char {
+  width: var(--input--width-20-char-width);
+  text-align: center;
 }
-.ds-input--width-10-char__wrapper--focus {
+.ds-input--width-2-char__wrapper--focus {
+  width: calc(
+    var(--input--width-2-char-width) + (2 * var(--input--focus-border-width))
+  );
 }
-.ds-input--width-5-char__wrapper--focus {
+.ds-input--width-3-char__wrapper--focus {
+  width: calc(
+    var(--input--width-3-char-width) + (2 * var(--input--focus-border-width))
+  );
 }
 .ds-input--width-4-char__wrapper--focus {
-    margin-top: calc(-1*var(--input-focus-border-width));
-    width: var(--input-width-4-char--focus);
-    border-width:  var(--input-focus-border-width);
-    border-color: var(--color-focus);
+  width: calc(
+    var(--input--width-4-char-width) + (2 * var(--input--focus-border-width))
+  );
 }
-.ds-input--width-3-char__wrapper--focus {
+.ds-input--width-5-char__wrapper--focus {
+  width: calc(
+    var(--input--width-5-char-width) + (2 * var(--input--focus-border-width))
+  );
 }
-.ds-input--width-2-char__wrapper--focus {
-    margin-top: calc(-1*var(--input-focus-border-width));
-    width: var(--input-width-2-char--focus);
-    border-width: var(--input-focus-border-width);
-    border-color: var(--color-focus);
+.ds-input--width-10-char__wrapper--focus {
+  width: calc(
+    var(--input--width-10-char-width) + (2 * var(--input--focus-border-width))
+  );
+}
+.ds-input--width-20-char__wrapper--focus {
+  width: calc(
+    var(--input--width-20-char-width) + (2 * var(--input--focus-border-width))
+  );
 }
 
 /* Error Message */
 .ds-error-message {
-    @apply mb-4;
+  @apply mb-4;
 }
 .ds-error-message__text {
-    @apply md:text-lg text-base text-error-text font-semibold;
+  @apply md:text-lg text-base text-error-text font-semibold;
 }
 
 /* Date Input */
 .ds-date-input {
-    @apply flex flex-row gap-y-2;
+  @apply flex flex-row gap-y-2;
 }
 .ds-date-input__item {
-    @apply mr-4;
+  @apply mr-4;
 }
 
 /* Textarea */
 .ds-textarea {
-    @apply util-textarea text-lg;
+  @apply util-textarea text-lg;
 }
 .ds-textarea__wrapper--focus {
-    border-width: 4px;
-    border-color: var(--color-focus);
+  border-width: var(--input--focus-border-width);
+  border-color: var(--color-focus);
+  margin-top: calc(-1 * var(--input--focus-border-width));
+  margin-bottom: calc(-1 * var(--input--focus-border-width));
 }
 
 /* Radios Checkboxes */
 .ds-radios__label--disabled,
 .ds-checkboxes__label--disabled {
   @apply opacity-40;
-}
+}

package/src/components/header.common.css

@@ -1,36 +1,35 @@
 @tailwind utilities;
 
 @layer utilities {
-    .util-header {
-        @apply relative border-b-8 print:border-b-2 border-tertiary print:bg-white;
-        border: var(--header-border);
-    }
-    .util-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;
-    }
-    .util-header__section {
-        @apply flex justify-start flex-wrap items-center
-        print:gap-1;
-    }
-    .util-header__logo {
-        @apply h-12 print:hidden;
-    }
-    .util-header__logo-inverted {
-        @apply h-12 hidden print:block;
-    }
-    .util-header__secondary-logo {
-        @apply h-10 print:hidden;
-    }
-    .util-header__title {
-        @apply align-middle;
-    }
-    .util-header__title-text {
-        @apply font-bold text-2xl leading-10 tracking-wide no-underline hover:no-underline 
-        print:text-base-content;
-        color: var(--header__title-color);
-    }
-    .util-header-nav-menu__content {
-        @apply flex justify-start items-center print:gap-1;
-    }
-}
+  .util-header {
+    @apply relative border-solid;
+    background-color: var(--header-background);
+    border-color: var(--header-border-color);
+    border-bottom-width: var(--header-border-bottom-width);
+  }
+  .util-header__content {
+    @apply px-4 py-2 mx-auto max-w-5xl w-full flex justify-between items-center flex-wrap sm:flex-nowrap gap-3;
+  }
+  .util-header__section {
+    @apply flex justify-start flex-wrap items-center;
+  }
+  .util-header__logo {
+    @apply h-12;
+  }
+  .util-header__logo-inverted {
+    @apply h-12 hidden;
+  }
+  .util-header__secondary-logo {
+    @apply h-10;
+  }
+  .util-header__title {
+    @apply align-middle;
+  }
+  .util-header__title-text {
+    @apply font-bold text-2xl leading-10 tracking-wide no-underline hover:no-underline;
+    color: var(--header__title-color);
+  }
+  .util-header-nav-menu__content {
+    @apply flex justify-start items-center;
+  }
+}

package/src/components/header.css

@@ -1,29 +1,25 @@
 @import './header.common.css';
 
 .ds-header {
-  @apply util-header;
-  background: var(--header-background);
-  border-width: var(--header-border-width);
+  @apply util-header print:border-b-2 print:bg-white;
 }
 .ds-header__content {
-  @apply util-header__content;
+  @apply util-header__content print:px-0;
 }
 .ds-header__section {
-  @apply util-header__section gap-x-4 gap-y-2;
+  @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 util-header__logo;
-  print-color-adjust: exact !important;
-  -webkit-print-color-adjust: exact !important;
+  @apply util-header__logo print:hidden;
 }
 .ds-header__logo-inverted {
-  @apply util-header__logo-inverted;
+  @apply util-header__logo-inverted print:block;
 }
 .ds-header__secondary-logo {
-  @apply util-header__secondary-logo;
+  @apply util-header__secondary-logo print:hidden;
 }
 .ds-header__link:focus {
   box-shadow: 0 0 0 4px var(--color-focus);
@@ -31,7 +27,7 @@
   text-decoration: none;
 }
 .ds-header__title {
-  @apply util-header__title util-header__title-text w-auto;
+  @apply util-header__title util-header__title-text w-auto print:text-base-content;
   &:hover {
     /* @apply text-white; */
     color: var(--header__title-color-hover);
@@ -43,7 +39,7 @@
   }
 }
 .ds-header-nav-menu__content {
-  @apply util-header-nav-menu__content gap-x-4 gap-y-2;
+  @apply util-header-nav-menu__content gap-x-4 gap-y-2 print:gap-1;
 }
 
 /* overrides */
@@ -88,7 +84,7 @@
       }
     }
     .ds-svg-icon {
-      fill: var(--color-white);
+      fill: var(--color-header-text);
     }
   }
   .ds-phase-banner__message {

package/src/components/header.native.css

@@ -1,18 +1,13 @@
 @import './header.common.css';
 
 .ds-header {
-    @apply util-header;
-    background-color: var(--header-background);
-    border-top-width: var(--header-border-top-width);
-    border-bottom-width: var(--header-border-bottom-width);
-    border-left-width: var(--header-border-left-width);
-    border-right-width: var(--header-border-right-width);
+  @apply util-header;
 }
 .ds-header__content {
   @apply util-header__content;
 }
 .ds-header__section {
-    @apply util-header__section flex-row;
+  @apply util-header__section flex-row;
 }
 .ds-header__logo {
   @apply util-header__logo;
@@ -27,8 +22,8 @@
   @apply util-header__title;
 }
 .ds-header__title__text {
-    @apply util-header__title-text ;
-  }
+  @apply util-header__title-text;
+}
 .ds-header-nav-menu__content {
   @apply util-header-nav-menu__content;
-}
+}

package/src/components/layout.common.css

@@ -7,7 +7,7 @@
     @apply flex flex-col flex-wrap;
   }
   .util-btn-group {
-    @apply flex flex-row flex-wrap gap-x-4 items-center print:items-baseline;
+    @apply flex flex-row flex-wrap items-center print:items-baseline;
   }
   .util-top {
     @apply mb-4;
@@ -33,4 +33,4 @@
 }
 .util-section-break--xl {
   @apply mb-7 md:mb-9;
-}
+}

package/src/components/layout.css

@@ -43,7 +43,7 @@
   @apply util-bottom w-full box-border;
 }
 .ds-btn-group {
-  @apply util-btn-group gap-y-4 mb-4 md:mb-8;
+  @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.  */
@@ -88,6 +88,6 @@
 .ds-btn-group {
   .ds-btn,
   .ds-link {
-    @apply mb-0 !important;
+    @apply mb-0;
   }
 }

package/src/components/layout.native.css

@@ -3,6 +3,7 @@
 
 .ds-btn-group {
   @apply util-btn-group;
+  gap: 1rem 1rem;
 }
 .ds-layout {
   @apply util-layout;

package/src/components/loader.common.css

@@ -4,4 +4,4 @@
   .util-loader {
     @apply m-auto overflow-hidden;
   }
-}
+}

package/src/components/loader.native.css

@@ -2,4 +2,4 @@
 
 .ds-loader {
   @apply util-loader;
-}
+}

package/src/components/modal.common.css

@@ -13,5 +13,4 @@
   .util-modal__action {
     @apply flex flex-wrap items-center gap-4;
   }
-  
-}
+}

package/src/components/modal.css

@@ -2,7 +2,7 @@
 
 .ds-modal-container {
   @apply hidden justify-center items-center content-center text-left
-  text-base-content bg-opacity-50 bg-base-700
+  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-container--open {

package/src/components/modal.native.css

@@ -5,14 +5,14 @@
   background-color: rgba(var(--color-black-rgb), 0.5);
 }
 .ds-modal {
-  @apply util-modal__body;
+  @apply util-modal;
 }
 .ds-modal__body {
-  @apply util-modal__container;
+  @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

@@ -1,22 +1,22 @@
 @tailwind utilities;
 
 @layer utilities {
-    .util-nav {
-      @apply relative w-full bg-base-100 text-base-content;
-    }
+  .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;
-    }
-}
+  .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.native.css

@@ -4,10 +4,9 @@
   @apply util-nav;
 }
 .ds-nav--border {
-  @apply xs:border-b xs:border-base-400;
+  @apply border-b border-base-400;
 }
 
-
 .ds-nav__list {
   @apply util-nav__list;
 }
@@ -15,14 +14,13 @@
   @apply gap-y-3;
 }
 .ds-nav__list--horizontal {
-  @apply xs:mx-auto xs:gap-x-6 xs:py-1 px-4 xs:flex-row items-center;
+  @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;
 }
@@ -38,4 +36,4 @@
 }
 .ds-nav__list-item--border-bottom {
   @apply border-b border-base-300 pb-3 px-4;
-}
+}

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

@@ -5,7 +5,7 @@
 
 @layer utilities {
   .util-notification-banner {
-    @apply border-5 mb-4 md:mb-8 print:bg-white;
+    @apply border-5 mb-6 md:mb-8 print:bg-white;
 
     /* border-radius: var(--notification-banner-border-radius); */
   }
@@ -29,7 +29,7 @@
     print:text-base-content print:pt-2;
   }
   .util-notification-banner__content {
-    @apply bg-base-100 p-4 md:p-5;
+    @apply bg-base-100 px-4 py-4 md:px-5 md:py-5;
   }
   .util-notification-banner__content-text {
     @apply text-base-content;
@@ -43,4 +43,4 @@
   .util-notification-banner_link--error-text {
     @apply text-error;
   }
-}
+}

package/src/components/notification-banner.css

@@ -1,7 +1,7 @@
 @import './notification-banner.common.css';
 
 .ds-notification-banner {
-  @apply util-notification-banner util-notification-banner-text ;
+  @apply util-notification-banner util-notification-banner-text;
   border-radius: var(--notification-banner-border-radius);
   &.ds-notification-banner--dense,
   .ds-dense & {
@@ -24,7 +24,8 @@
       }
     }
   }
-  &.ds-notification-banner--error {
+  &.ds-notification-banner--error,
+  &.ds-notification-banner--error-group {
     @apply util-notification-banner--error;
     .ds-notification-banner__link {
       &:link:not(:focus) {
@@ -32,6 +33,23 @@
       }
     }
   }
+  &.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

package/src/components/pagination.css

@@ -1,5 +1,5 @@
 .ds-pagination {
-  @apply flex flex-wrap items-center justify-items-center justify-between 
+  @apply flex flex-wrap items-center justify-items-center justify-between
   gap-y-2 md:gap-y-4 gap-x-6 mb-4 md:mb-8;
   &.ds-pagination--sm {
     .ds-pagination__label,