@digigov/css 1.3.0-rc.0 → 2.0.0-4be8f7cc

package/src/components/header.css

@@ -1,19 +1,24 @@
 .ds-header {
-  @apply relative bg-primary border-b-8 print:border-b-2 border-tertiary print:bg-white;
-  border-bottom-style: solid;
+  @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);
 }
 .ds-header__content {
-  @apply px-4 py-2 mx-auto max-w-5xl w-full flex justify-between items-center
+  @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;
 }
 .ds-header__section {
   @apply flex justify-start flex-wrap items-center 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 h-12 print:hidden;
 }
 .ds-header__logo-inverted {
   @apply h-12 hidden print:block;
@@ -22,18 +27,18 @@
   @apply h-10 print:hidden;
 }
 .ds-header__link:focus {
-  box-shadow: 0px 0px 0px 4px var(--color-focus);
-  -webkit-box-shadow: 0px 0px 0px 4px var(--color-focus);
-  -moz-box-shadow: 0px 0px 0px 4px var(--color-focus);
+  box-shadow: 0 0 0 4px var(--color-focus);
   outline: none;
   text-decoration: none;
 }
 .ds-header__title {
-  @apply text-white font-bold text-2xl leading-10 tracking-wide no-underline
+  @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);
   &:hover {
-    @apply text-white;
+    /* @apply text-white; */
+    color: var(--header__title-color-hover);
   }
   &:focus {
     text-decoration: none;
@@ -51,8 +56,9 @@
   .ds-header__content,
   .ds-header__section {
     > .ds-link,
-    > .ds-dropdown .ds-dropdown__button.ds-link  {
-      @apply text-white focus:text-link-active print:text-base-content;
+    > .ds-dropdown .ds-dropdown__button.ds-link {
+      @apply focus:text-link-active print:text-base-content;
+      color: var(--color-header-text);
     }
   }
   .ds-dropdown {
@@ -62,12 +68,9 @@
     @apply sm:w-max;
   }
   .ds-link {
-    .ds-svg-icon {
-      fill: var(--color-white);
-    }
     &:hover {
       .ds-svg-icon {
-        fill: var(--color-white);
+        fill: var(--color-header-text-hover);
       }
     }
     &:focus {
@@ -75,24 +78,13 @@
         fill: var(--color-link-active);
       }
     }
-  }
-  .ds-phase-banner__text {
-    @apply text-white print:text-base-content;
-  }
-  .ds-link {
     .ds-svg-icon {
       fill: var(--color-white);
     }
-    &:hover {
-      .ds-svg-icon {
-        fill: var(--color-white);
-      }
-    }
-    &:focus {
-      .ds-svg-icon {
-        fill: var(--color-link-active);
-      }
-    }
+  }
+  .ds-phase-banner__text {
+    @apply print:text-base-content;
+    color: var(--color-header-text);
   }
 }
 .ds-header__section {
@@ -104,13 +96,13 @@
 .ds-header__content,
 .ds-header__section {
   > .ds-svg-icon--burger {
-    fill: var(--color-white);
     @apply float-right focus:bg-focus;
+    fill: var(--color-header-text);
   }
   > .ds-close-btn {
     @apply sm:hidden;
     .ds-svg-icon--close {
-      fill: var(--color-link) !important;
+      fill: var(--color-header-text) !important;
     }
   }
   > .ds-nav__list {
@@ -118,16 +110,16 @@
       > .ds-nav__list-item-link,
       > .ds-nav__list-item-btn {
         &:not(:focus) {
-          @apply text-white;
+          color: var(--color-header-text);
         }
       }
       > .ds-nav__list-item-link--active,
       > .ds-nav__list-item-btn--active {
         &:not(:focus) {
-          @apply text-white !important;
+          color: var(--color-header-text) !important;
         }
         .ds-svg-icon {
-          fill: var(--color-white);
+          fill: var(--color-header-text);
         }
       }
     }

package/src/components/hidden.css

@@ -1,19 +1,19 @@
 .ds-hidden {
   @apply hidden;
 }
-.ds-hidden-xs--up {
+.ds-hidden-xs-up {
   @apply xs:hidden;
 }
-.ds-hidden-sm--up {
+.ds-hidden-sm-up {
   @apply sm:hidden;
 }
-.ds-hidden-md--up {
+.ds-hidden-md-up {
   @apply md:hidden;
 }
-.ds-hidden-lg--up {
+.ds-hidden-lg-up {
   @apply lg:hidden;
 }
-.ds-hidden-xl--up {
+.ds-hidden-xl-up {
   @apply xl:hidden;
 }
 .ds-hidden-xs {
@@ -30,4 +30,4 @@
 }
 .ds-hidden-xl {
   @apply xlOnly:hidden;
-}
+}

package/src/components/index.css

@@ -1,47 +1,47 @@
-@import "./accordion.css";
-@import "./autocomplete.css";
-@import "./button.css";
-@import "./bottom-info.css";
-@import "./chip.css";
-@import "./form.css";
-@import "./checkboxes.css";
-@import "./chip.css";
-@import "./dropdown.css";
-@import "./radios.css";
-@import "./header.css";
-@import "./footer.css";
-@import "./layout.css";
-@import "./nav.css";
-@import "./typography.css";
-@import "./back-to-top.css";
-@import "./table.css";
-@import "./filter.css";
-@import "./admin-layout.css";
-@import "./admin-header.css";
-@import "./breadcrumbs.css";
-@import "./card.css";
-@import "./details.css";
-@import "./notification-banner.css";
-@import "./masthead.css";
-@import "./panel.css";
-@import "./phase-banner.css";
-@import "./summary-list.css";
-@import "./stack.css";
-@import "./tabs.css";
-@import "./misc.css";
-@import "./modal.css";
-@import "./svg-icons.css";
-@import "./pagination.css";
-@import "./loader.css";
-@import "./full-page-background.css";
-@import "./drawer.css";
-@import "./copy-to-clipboard.css";
-@import "./fillable.css";
-@import "./skiplink.css";
-@import "./timeline.css";
-@import "./task-list.css";
-@import "./stepnav.css";
-@import "./dev-theme.css";
-@import "./kitchensink.css";
-@import "./hidden.css";
-@import "./warning-text.css";
+@import './accordion.css';
+@import './admin-header.css';
+@import './admin-layout.css';
+@import './autocomplete.css';
+@import './back-to-top.css';
+@import './bottom-info.css';
+@import './breadcrumbs.css';
+@import './button.css';
+@import './card.css';
+@import './form.css';
+@import './checkboxes.css';
+@import './chip.css';
+@import './copy-to-clipboard.css';
+@import './details.css';
+@import './dev-theme.css';
+@import './drawer.css';
+@import './dropdown.css';
+@import './fillable.css';
+@import './filter.css';
+@import './footer.css';
+@import './full-page-background.css';
+@import './header.css';
+@import './hidden.css';
+@import './layout.css';
+@import './loader.css';
+@import './masthead.css';
+@import './misc.css';
+@import './modal.css';
+@import './nav.css';
+@import './pagination.css';
+@import './panel.css';
+@import './phase-banner.css';
+@import './radios.css';
+@import './skeleton.css';
+@import './skiplink.css';
+@import './stack.css';
+@import './stepnav.css';
+@import './summary-list.css';
+@import './svg-icons.css';
+@import './table.css';
+@import './tabs.css';
+@import './task-list.css';
+@import './timeline.css';
+@import './typography.css';
+@import './notification-banner.css';
+@import './warning-text.css';
+@import './kitchensink.css';

package/src/components/kitchensink.css

@@ -12,9 +12,9 @@
 }
 .ds-kitchensink-content {
   @apply max-w-2xl w-2xl;
-}
-.ds-kitchensink-content--wide {
-  @apply max-w-4xl w-4xl;
+  &.ds-kitchensink-content--wide {
+    @apply max-w-4xl w-4xl;
+  }
 }
 .ds-kitchensink-content__info {
   @apply max-w-2xl;
@@ -22,43 +22,43 @@
 .ds-kitchensink-content__tags {
   @apply flex flex-nowrap gap-2 h-16;
 }
-.ds-kitchensink-card {
-  border-style: dashed;
-  container-type: inline-size;
-
-}
 
 /* COMPONENTS */
-.ds-kitchensink-card .ds-modal {
-  position: inherit;
-}
-.ds-kitchensink-card .ds-modal__body {
-  margin: 1rem;
-}
-
-.ds-kitchensink-card .ds-dropdown {
-  margin-bottom: 20rem;
-}
-.ds-kitchensink-card .ds-dropdown.ds-dropdown--up {
-  margin-top: 20rem;
-  margin-bottom: 0rem;
-}
 .ds-kitchensink-card .ds-table__cell .ds-dropdown {
   margin: 0 !important;
 }
-.ds-kitchensink-card .ds-layout--full-height {
-  min-height: inherit;
-}
-@container (min-width: 400px) {
-  .ds-kitchensink-card .ds-drawer {
+.ds-kitchensink-card {
+  border-style: dashed;
+  container-type: inline-size;
+  .ds-layout--full-height {
     min-height: inherit;
-    width: 80%;
-    box-shadow: 0 0 30px rgba(0, 0, 0, 0.6);
   }
-  .ds-kitchensink-card .ds-drawer--closed {
-    @apply hidden;
+  .ds-dropdown.ds-dropdown--up {
+    margin-top: 20rem;
+    margin-bottom: 0;
   }
-  .ds-kitchensink-card .ds-close-btn {
-    @apply block;
+  .ds-dropdown {
+    margin-bottom: 20rem;
+  }
+  .ds-modal__body {
+    margin: 1rem;
+  }
+  .ds-modal {
+    position: inherit;
+  }
+}
+@container (min-width: 400px) {
+  .ds-kitchensink-card {
+    .ds-close-btn {
+      @apply block;
+    }
+    .ds-drawer {
+      min-height: inherit;
+      width: 80%;
+      box-shadow: 0 0 30px rgba(0, 0, 0, 0.6);
+      &.ds-drawer--closed {
+        @apply hidden;
+      }
+    }
   }
 }

package/src/components/layout.css

@@ -1,45 +1,43 @@
-
 .ds-layout {
   display: flex;
-  flex-direction: column;
-  flex-wrap: wrap;
-}
-.ds-layout--full-height {
-  min-height: 100vh;
+  flex-flow: column wrap;
+  &.ds-layout--full-height {
+    min-height: 100vh;
+  }
 }
 .ds-container {
   @apply max-w-5xl box-border mx-auto px-3 md:px-6 w-full;
   flex: 1 1 0%;
-}
-.ds-container--full-width {
-  @apply max-w-full;
+  &.ds-container--full-width {
+    @apply max-w-full;
+  }
 }
 .ds-top {
   @apply mb-4;
 }
 .ds-aside {
   @apply flex flex-wrap flex-col md:top-8 h-fit print:order-1;
+  &.ds-aside--sticky {
+    @apply md:sticky;
+    &.ds-aside--full-height {
+      max-height: calc(100vh - 2rem);
+    }
+  }
+  &.ds-aside--full-height {
+    @apply h-full;
+  }
   .ds-back-to-top {
     @apply flex flex-1 content-end flex-wrap;
-    .ds-back-to-top-link {
-      @apply md:mx-6 md:my-4;
-    }
     &.ds-back-to-top--persistent {
       .ds-back-to-top-content {
         @apply sticky bottom-0 mb-4;
       }
     }
+    .ds-back-to-top-link {
+      @apply md:mx-6 md:my-4;
+    }
   }
 }
-.ds-aside--sticky {
-  @apply md:sticky;
-  &.ds-aside--full-height {
-    max-height: calc(100vh - 2rem);
-  }
-}
-.ds-aside--full-height {
-  @apply h-full;
-}
 .ds-bottom {
   @apply w-full flex flex-wrap  box-border;
 }
@@ -48,30 +46,30 @@
 }
 @media print {
   /* When ds-btn-group is empty at print, content at :after limits its height.  */
-  .ds-btn-group:after {
-    content: "";
+  .ds-btn-group::after {
+    content: '';
   }
 }
 .ds-section-break {
   @apply m-auto px-4 py-2 border-0 w-full bg-transparent;
-}
-.ds-section-break--visible {
-  @apply border-t border-base-300 border-solid;
-}
-.ds-section-break--md {
-  @apply mb-3 md:mb-5;
-}
-.ds-section-break--lg {
-  @apply mb-5 md:mb-7;
-}
-.ds-section-break--xl {
-  @apply  mb-7 md:mb-9;
+  &.ds-section-break--visible {
+    @apply border-t border-base-300 border-solid;
+  }
+  &.ds-section-break--md {
+    @apply mb-3 md:mb-5;
+  }
+  &.ds-section-break--lg {
+    @apply mb-5 md:mb-7;
+  }
+  &.ds-section-break--xl {
+    @apply mb-7 md:mb-9;
+  }
 }
 
 /* overrides */
 
 .ds-main {
-  >.ds-back-to-top--persistent {
+  > .ds-back-to-top--persistent {
     @apply fixed bottom-0 right-0 bg-base-200 w-full z-5;
     .ds-back-to-top-link {
       @apply mx-6 my-4;

package/src/components/loader.css

@@ -2,43 +2,43 @@
   @apply h-fit w-fit m-auto overflow-hidden print:hidden;
 }
 .ds-circular-progress {
-  animation: rotate 10s linear infinite;
   @apply w-fit h-10;
+  animation: rotate 10s linear infinite;
+  &.ds-circular-progress--secondary {
+    .ds-circular_progress__circle--1 {
+      @apply opacity-40;
+      stroke: var(--color-white);
+    }
+
+    .ds-circular-progress__circle--2 {
+      stroke: var(--color-white);
+    }
+  }
+  &.ds-circular-progress--sm {
+    @apply h-5 w-5;
+  }
+  &.ds-circular-progress--md {
+    @apply h-10 w-10;
+  }
+  &.ds-circular-progress--lg {
+    @apply h-12 w-12;
+  }
 }
 .ds-circular-progress__circle {
   fill: none;
   stroke-miterlimit: 10;
   stroke-width: 42px;
-}
-.ds-circular-progress__circle--1 {
-  stroke: var(--color-secondary);
-}
-.ds-circular-progress__circle--2 {
-  --full-length: 470;
-  stroke: var(--color-primary);
-  stroke-dasharray: var(--full-length);
-  stroke-dashoffset: 0;
-  animation: dash 4s ease-in-out 0s forwards infinite;
-}
-.ds-circular-progress--secondary {
-  .ds-circular_progress__circle--1 {
-    @apply opacity-40;
-    stroke: var(--color-white);
+  &.ds-circular-progress__circle--1 {
+    stroke: var(--circular-progress__circle--1-stroke);
   }
-
-  .ds-circular-progress__circle--2 {
-    stroke: var(--color-white);
+  &.ds-circular-progress__circle--2 {
+    --full-length: 470;
+    stroke: var(--circular-progress__circle--2-stroke);
+    stroke-dasharray: var(--full-length);
+    stroke-dashoffset: 0;
+    animation: dash 4s ease-in-out 0s forwards infinite;
   }
 }
-.ds-circular-progress--sm {
-  @apply h-5 w-5;
-}
-.ds-circular-progress--md {
-  @apply h-10 w-10;
-}
-.ds-circular-progress--lg {
-  @apply h-12 w-12;
-}
 @keyframes dash {
   0% {
     stroke-dashoffset: 0;

package/src/components/masthead.css

@@ -1,17 +1,17 @@
 .ds-masthead {
   @apply print:border-2 print:bg-white print:border-tertiary-300 print:text-base-content;
-}
-.ds-masthead--primary {
-  @apply bg-tertiary text-white;
-  .ds-masthead__body {
-    @apply text-white;
+  &.ds-masthead--primary {
+    @apply bg-tertiary text-white;
+    .ds-masthead__body {
+      @apply text-white;
+    }
   }
-}
-.ds-masthead--secondary {
-  @apply border-b border-base-400 !important;
-  @apply bg-base-200;
-  .ds-masthead__body {
-    @apply text-base-content;
+  &.ds-masthead--secondary {
+    @apply border-b border-base-400 !important;
+    @apply bg-base-200;
+    .ds-masthead__body {
+      @apply text-base-content;
+    }
   }
 }
 .ds-masthead__body {
@@ -24,55 +24,56 @@
 /* overrides */
 
 .ds-masthead {
-  .ds-main > *:last-child {
-    @apply mb-0;
-  }
-  .ds-header__content {
-    @apply flex-wrap;
-  }
-}
-.ds-masthead--primary {
-  .ds-body {
-    @apply text-white;
-  }
-  .ds-link {
-    @apply text-white hover:text-white focus:text-base-content print:text-base-content;
-    &:hover {
-      text-decoration-thickness: 2px;
+  &.ds-masthead--primary {
+    .ds-body {
+      @apply text-white;
     }
-  }
-  .ds-link--no-underline {
-    @apply no-underline hover:underline;
-    &:hover {
-      text-decoration-thickness: 2px;
+    .ds-link {
+      @apply text-white hover:text-white focus:text-base-content print:text-base-content;
+      &:hover {
+        text-decoration-thickness: 2px;
+      }
+      &.ds-link--no-underline {
+        @apply no-underline hover:underline;
+        &:hover {
+          text-decoration-thickness: 2px;
+        }
+      }
     }
-  }
-  .ds-back-link {
-    @apply text-white print:text-base-content;
-  }
-  .ds-phase-banner__text {
-    @apply text-white print:text-base-content;
-  }
-}
-.ds-masthead--primary,
-.ds-background-dark {
-  .ds-btn {
-    @apply border-white hover:border-white border-2 shadow-none;
-    &:focus {
-      -webkit-box-shadow: 0 0 0 4px var(--color-base-content), 0 0 0 8px var(--color-focus);
-      box-shadow: 0 0 0 4px var(--color-base-content), 0 0 0 8px var(--color-focus);
+    .ds-back-link {
+      @apply text-white print:text-base-content;
+    }
+    .ds-phase-banner__text {
+      @apply text-white print:text-base-content;
     }
   }
-  .ds-btn-primary {
-    @apply print:border-0 print:border-b-2 print:border-success print:text-base-content print:bg-white print:shadow-none;
-  }
-  .ds-btn-secondary {
-    @apply print:border-0 print:border-b-2 print:border-base-500 print:text-base-content print:bg-white print:shadow-none;
+  &.ds-masthead--primary,
+  &.ds-background-dark {
+    .ds-btn {
+      @apply border-white hover:border-white border-2 shadow-none;
+      &:focus {
+        box-shadow:
+          0 0 0 4px var(--color-base-content),
+          0 0 0 8px var(--color-focus);
+      }
+    }
+    .ds-btn-primary {
+      @apply print:border-0 print:border-b-2 print:border-success print:text-base-content print:bg-white print:shadow-none;
+    }
+    .ds-btn-secondary {
+      @apply print:border-0 print:border-b-2 print:border-base-500 print:text-base-content print:bg-white print:shadow-none;
+    }
+    .ds-btn-warning {
+      @apply print:border-0 print:border-b-2  print:border-error print:text-base-content print:bg-white print:shadow-none;
+    }
+    .ds-hint {
+      @apply opacity-70 text-white print:text-base-content;
+    }
   }
-  .ds-btn-warning {
-    @apply print:border-0 print:border-b-2  print:border-error print:text-base-content print:bg-white print:shadow-none;
+  .ds-main > *:last-child {
+    @apply mb-0;
   }
-  .ds-hint {
-    @apply opacity-70 text-white print:text-base-content;
+  .ds-header__content {
+    @apply flex-wrap;
   }
 }