@digigov/css 2.0.0-b4cd6916 → 2.0.0-c6d0b3b8

package/src/components/form.common.css

@@ -1,82 +1,81 @@
 @tailwind utilities;
 
 @layer utilities {
-    .util-field {
-        @apply mb-8 md:mb-10;
-    }
-    .util-field--error {
-        @apply border-l-5 border-error-text px-0 pl-4;
-    }
+  .util-field {
+    @apply mb-8 md:mb-10;
+  }
+  .util-field--error {
+    @apply border-l-5 border-error-text px-0 pl-4;
+  }
 
-    .util-fieldset__legend {
-        margin-bottom: var(--fieldset__legend-margin-bottom);
-    }
-    .util-fieldset__legend-text {
-        font-weight: var(--fieldset__legend-font-weight);
-        letter-spacing: var(--fieldset__legend-letter-spacing);
-    }
-    .util-fieldset__legend--xl-text {
-        @apply max-w-2xl;
-        font-size: var(--fieldset__legend--xl-font-size);
-        line-height: var(--fieldset__legend--xl-line-height);
-    }
-    .util-fieldset__legend--lg-text {
-        font-size: var(--fieldset__legend--lg-font-size);
-        line-height: var(--fieldset__legend--lg-line-height);
-    }
-    .util-fieldset__legend--md-text {
-        font-size: var(--fieldset__legend--md-font-size);
-        line-height: var(--fieldset__legend--md-line-height);
-    }
-    .util-fieldset__legend--sm-text {
-        font-size: var(--fieldset__legend--sm-font-size);
-        line-height: var(--fieldset__legend--sm-line-height);
-    }
+  .util-fieldset__legend {
+    margin-bottom: var(--fieldset__legend-margin-bottom);
+  }
+  .util-fieldset__legend-text {
+    font-weight: var(--fieldset__legend-font-weight);
+    letter-spacing: var(--fieldset__legend-letter-spacing);
+  }
+  .util-fieldset__legend--xl-text {
+    @apply max-w-2xl;
+    font-size: var(--fieldset__legend--xl-font-size);
+    line-height: var(--fieldset__legend--xl-line-height);
+  }
+  .util-fieldset__legend--lg-text {
+    font-size: var(--fieldset__legend--lg-font-size);
+    line-height: var(--fieldset__legend--lg-line-height);
+  }
+  .util-fieldset__legend--md-text {
+    font-size: var(--fieldset__legend--md-font-size);
+    line-height: var(--fieldset__legend--md-line-height);
+  }
+  .util-fieldset__legend--sm-text {
+    font-size: var(--fieldset__legend--sm-font-size);
+    line-height: var(--fieldset__legend--sm-line-height);
+  }
 
+  .util-label {
+    @apply mb-0 flex gap-y-3 flex-col;
+  }
+  .util-label-text {
+    font-size: var(--label-font-size);
+    line-height: var(--label-line-height);
+    letter-spacing: var(--label-letter-spacing);
+  }
+  .util-label__title--xl-text {
+    @apply max-w-2xl;
+    font-size: var(--label__title--xl-font-size);
+    line-height: var(--label__title--xl-line-height);
+    font-weight: var(--label__title-font-weight);
+    letter-spacing: var(--label__title-letter-spacing);
+  }
+  .util-label__title--lg-text {
+    font-size: var(--label__title--lg-font-size);
+    line-height: var(--label__title--lg-line-height);
+    font-weight: var(--label__title-font-weight);
+    letter-spacing: var(--label__title-letter-spacing);
+  }
+  .util-label__title--md-text {
+    font-size: var(--label__title--md-font-size);
+    line-height: var(--label__title--md-line-height);
+    font-weight: var(--label__title-font-weight);
+    letter-spacing: var(--label__title-letter-spacing);
+  }
+  .util-label__title--sm-text {
+    font-size: var(--label__title--sm-font-size);
+    line-height: var(--label__title--sm-line-height);
+    font-weight: var(--label__title-font-weight);
+    letter-spacing: var(--label__title-letter-spacing);
+  }
 
-    .util-label {
-        @apply mb-0 flex gap-y-3 flex-col;
-    }
-    .util-label-text {
-        font-size: var(--label-font-size);
-        line-height: var(--label-line-height);
-        letter-spacing: var(--label-letter-spacing);
-    }
-    .util-label__title--xl-text {
-        @apply max-w-2xl;
-        font-size: var(--label__title--xl-font-size);
-        line-height: var(--label__title--xl-line-height);
-        font-weight: var(--label__title-font-weight);
-        letter-spacing: var(--label__title-letter-spacing);
-    }
-    .util-label__title--lg-text {
-        font-size: var(--label__title--lg-font-size);
-        line-height: var(--label__title--lg-line-height);
-        font-weight: var(--label__title-font-weight);
-        letter-spacing: var(--label__title-letter-spacing);
-    }
-    .util-label__title--md-text {
-        font-size: var(--label__title--md-font-size);
-        line-height: var(--label__title--md-line-height);
-        font-weight: var(--label__title-font-weight);
-        letter-spacing: var(--label__title-letter-spacing);
-    }
-    .util-label__title--sm-text {
-        font-size: var(--label__title--sm-font-size);
-        line-height: var(--label__title--sm-line-height);
-        font-weight: var(--label__title-font-weight);
-        letter-spacing: var(--label__title-letter-spacing);
-    }
-
-    .util-input {
-        @apply md:text-lg w-full p-2 border-2 border-base-content bg-base-100;
-        border-radius: var(--input-border-radius);
-    }
-    .util-input--error {
-        @apply border-error-text border-3;
-    }
-    .util-textarea {
-        @apply md:text-lg w-full p-2 border-2 border-base-content bg-base-100;
-        border-radius: var(--textarea-border-radius);
-    }
-}
+  .util-input {
+    @apply md:text-lg w-full p-2 border-2 border-base-content bg-base-100;
+    border-radius: var(--input-border-radius);
+  }
+  .util-input--error {
+    @apply border-error-text border-3;
+  }
+  .util-textarea {
+    @apply md:text-lg w-full p-2 border-2 border-base-content bg-base-100;
+    border-radius: var(--textarea-border-radius);
+  }
+}

package/src/components/form.css

@@ -113,6 +113,9 @@
 .ds-uploaded-file {
   @apply flex flex-wrap gap-x-4 mb-0;
 }
+.ds-uploaded-file-border {
+  @apply p-4 border border-base-300;
+}
 .ds-date-input {
   @apply flex flex-wrap gap-y-2;
   &.ds-date-input--dense,
@@ -170,7 +173,7 @@
 
 /* error handling  */
 .ds-error-message {
-  @apply md:text-lg text-base block mb-4 md:mb-8 text-error-text font-semibold;
+  @apply md:text-lg text-base block mb-4 text-error-text font-semibold;
 }
 /* stylelint-disable-next-line digigov/nest-related-rules */
 .ds-input--error {
@@ -219,12 +222,12 @@
   &.ds-grid {
     @apply grid gap-4;
     .ds-fieldset {
-      @apply grid gap-4;
-      :not(.ds-field) {
+      @apply grid gap-4 grid-cols-12;
+      :not(.ds-field, .ds-grid-item) {
         @apply col-span-12;
       }
     }
-    :not(.ds-field) {
+    :not(.ds-field, .ds-grid-item) {
       @apply col-span-12;
     }
   }

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/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

@@ -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.  */

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

@@ -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;
+}