@digigov/css 2.0.0-b3ec0588 → 2.0.0-b4cd6916

package/src/components/button.css

@@ -1,46 +1,37 @@
+@import './button.common.css';
 .ds-btn,
-.ds-btn[type=submit],
-.ds-btn[type=button],
-.ds-btn[type=reset] {
-  @apply no-underline font-medium cursor-pointer 
-  m-0 mb-8 w-max min-h-10 md:min-h-12 
-  flex gap-x-3 items-center;
-  border-radius: var(--btn-border-radius);
-  padding: var(--btn-padding);
-  letter-spacing: var(--btn-letter-spacing);
-  font-size: var(--btn-font-size);
+.ds-btn[type='submit'],
+.ds-btn[type='button'],
+.ds-btn[type='reset'] {
+  @apply util-btn util-btn-text min-h-10 md:min-h-12 w-max cursor-pointer gap-x-3;
   &:focus {
-    -webkit-box-shadow: 0 0 0 2px var(--color-white),
-      0 0 0 6px var(--color-base-content), 0 0 0 10px var(--color-focus);
-    box-shadow: 0 0 0 2px var(--color-white),
-      0 0 0 6px var(--color-base-content), 0 0 0 10px var(--color-focus);
+    box-shadow:
+      0 0 0 2px var(--color-white),
+      0 0 0 6px var(--color-base-content),
+      0 0 0 10px var(--color-focus);
   }
   &:focus-within {
     @apply outline-none;
   }
+
   &.ds-btn--dense,
   .ds-dense & {
-    --btn-padding: 0.375rem 0.75rem;
-    @apply min-h-8;
+    @apply util-btn--dense;
     &:focus {
-      -webkit-box-shadow: 0 0 0 2px var(--color-white),
-        0 0 0 5px var(--color-base-content), 0 0 0 8px var(--color-focus);
-      box-shadow: 0 0 0 2px var(--color-white),
-        0 0 0 5px var(--color-base-content), 0 0 0 8px var(--color-focus);
+      box-shadow:
+        0 0 0 2px var(--color-white),
+        0 0 0 5px var(--color-base-content),
+        0 0 0 8px var(--color-focus);
     }
   }
 }
 .ds-btn-primary,
-.ds-btn-primary[type="submit"],
-.ds-btn-primary[type="button"],
-.ds-btn-primary[type="reset"] {
-  -webkit-box-shadow: 0 2px 0 var(--color-base-content);
-  box-shadow: 0 2px 0 var(--color-base-content);
-  background-color: var(--btn-primary-background-color);
-  color: var(--btn-primary-color);
-  @apply hover:no-underline
-  print:border-2 print:border-success print:shadow-none;
+.ds-btn-primary[type='submit'],
+.ds-btn-primary[type='button'],
+.ds-btn-primary[type='reset'] {
+  @apply util-btn-primary util-btn-primary-text;
   &:hover {
+    @apply no-underline;
     background-color: var(--btn-primary-background-color-hover);
     color: var(--btn-primary-color-hover);
   }
@@ -49,23 +40,19 @@
   }
 }
 .ds-btn-cta {
-  @apply py-4 print:pr-2;
-  font-size: var(--btn-cta-font-size);
-  &.ds-btn--dense, .ds-dense & {
+  @apply py-4 print:pr-2 mb-8 util-btn-cta-text;
+  &.ds-btn--dense,
+  .ds-dense & {
     @apply py-3 px-4;
   }
 }
 .ds-btn-secondary,
-.ds-btn-secondary[type="submit"],
-.ds-btn-secondary[type="button"],
-.ds-btn-secondary[type="reset"] {
-  -webkit-box-shadow: 0 2px 0 var(--color-base-500);
-  box-shadow: 0 2px 0 var(--color-base-500);
-  @apply hover:no-underline
-    print:border-2 print:border-base-700 print:shadow-none;
-  background-color: var(--btn-secondary-background-color);
-  color: var(--btn-secondary-color);
+.ds-btn-secondary[type='submit'],
+.ds-btn-secondary[type='button'],
+.ds-btn-secondary[type='reset'] {
+  @apply util-btn-secondary util-btn-secondary-text;
   &:hover {
+    @apply no-underline;
     background-color: var(--btn-secondary-background-color-hover);
     color: var(--btn-secondary-color-hover);
   }
@@ -74,16 +61,12 @@
   }
 }
 .ds-btn-warning,
-.ds-btn-warning[type="submit"],
-.ds-btn-warning[type="button"],
-.ds-btn-warning[type="reset"] {
-  -webkit-box-shadow: 0 2px 0 var(--color-base-content);
-  box-shadow: 0 2px 0 var(--color-base-content);
-  @apply hover:no-underline
-    print:border-2 print:border-error print:shadow-none;
-  background-color: var(--btn-warning-background-color);
-  color: var(--btn-warning-color);
+.ds-btn-warning[type='submit'],
+.ds-btn-warning[type='button'],
+.ds-btn-warning[type='reset'] {
+  @apply util-btn-warning util-btn-warning-text;
   &:hover {
+    @apply no-underline;
     background-color: var(--btn-warning-background-color-hover);
     color: var(--btn-warning-color-hover);
   }
@@ -93,13 +76,8 @@
   }
 }
 .ds-btn--disabled {
-  @apply opacity-50 hover:bg-opacity-50
-  print:text-base-400 print:border-opacity-50;
   @apply cursor-not-allowed !important;
-}
-.ds-svg-icon--caret {
-  fill: var(--color-base-content);
-  @apply w-4 h-4 inline-block;
+  @apply util-btn--disabled util-btn--disabled-text;
 }
 .ds-close-btn {
   @apply flex flex-nowrap text-right w-max float-right items-center;
@@ -112,39 +90,42 @@
     @apply h-4 w-4 inline transition-all;
   }
 }
-.ds-btn-primary,
-.ds-btn-warning {
+.ds-btn-primary {
   .ds-svg-icon {
-    fill: var(--color-white);
+    fill: var(--btn-primary-color);
   }
+  /* stylelint-disable-next-line digigov/nest-related-rules */
   .ds-svg-icon--more-vert {
     @apply h-6 w-6 md:h-8 md:w-8;
   }
 }
-.ds-btn-cta {
-  .ds-svg-icon--chevron {
-    @apply w-5 h-5 inline-block ml-2 mr-2 transition-all;
+.ds-btn-warning {
+  .ds-svg-icon {
+    fill: var(--color-white);
+    &.ds-svg-icon--more-vert {
+      @apply h-6 w-6 md:h-8 md:w-8;
+    }
   }
+}
+.ds-btn-cta {
   &:hover {
-    .ds-svg-icon--chevron {
+    .ds-svg-icon {
       @apply ml-4 mr-0;
     }
   }
+  .ds-svg-icon {
+    @apply w-5 h-5 inline-block ml-2 mr-2 transition-all;
+  }
 }
 .ds-btn-secondary {
   .ds-svg-icon {
     fill: var(--color-base-content);
-  }
-  .ds-svg-icon--more-vert {
-    @apply h-6 w-6;
+    &.ds-svg-icon--more-vert {
+      @apply h-6 w-6;
+    }
   }
 }
 .ds-close-btn {
-  .ds-svg-icon--close {
-    @apply w-5 h-5 float-right;
-    @apply ml-1 !important;
-    fill: var(--color-link);
-  }
   &:focus {
     .ds-svg-icon--close {
       fill: var(--color-link-active);
@@ -155,6 +136,11 @@
       fill: var(--color-link-hover);
     }
   }
+  .ds-svg-icon--close {
+    @apply w-5 h-5 float-right;
+    @apply ml-1 !important;
+    fill: var(--color-link);
+  }
 }
 @media print {
   .ds-btn {

package/src/components/button.native.css

@@ -0,0 +1,56 @@
+/* stylelint-disable declaration-block-no-redundant-longhand-properties */
+/* stylelint-disable digigov/nest-related-rules */
+@import './button.common.css';
+
+.ds-btn {
+  @apply util-btn min-h-4 flex-row flex-nowrap justify-center;
+  border-bottom-width: 2px;
+  border-bottom-color: var(--color-base-content);
+  padding-top: calc( 1.5 * var(--btn-padding-y)) !important;
+  padding-bottom: calc( 1.5 * var(--btn-padding-y)) !important;
+}
+.ds-btn__text {
+  @apply util-btn-text min-h-4 text-center;
+}
+.ds-btn--dense {
+  @apply min-h-6;
+}
+.ds-btn--dense__text {
+  @apply min-h-4;
+}
+.ds-btn--disabled {
+  @apply util-btn--disabled;
+}
+.ds-btn--disabled__text {
+  @apply util-btn--disabled-text;
+}
+.ds-btn-primary {
+  @apply util-btn-primary util-btn;
+}
+.ds-btn-primary__text {
+  @apply util-btn-primary-text;
+}
+.ds-btn-secondary {
+  @apply util-btn-secondary;
+}
+.ds-btn-secondary__text {
+  @apply util-btn-secondary-text;
+}
+.ds-btn-warning {
+  @apply util-btn-warning;
+}
+.ds-btn-warning__text {
+  @apply util-btn-warning-text;
+}
+.ds-btn-cta {
+  padding-top: calc( 2.25 * var(--btn-padding-y)) !important;
+  padding-bottom: calc( 2.25 * var(--btn-padding-y)) !important;
+}
+
+.ds-btn-cta__text {
+  @apply util-btn-cta-text;
+}
+.ds-btn-cta__icon {
+  @apply ml-2;
+  fill: var(--color-white) !important;
+}

package/src/components/card.common.css

@@ -0,0 +1,33 @@
+@tailwind utilities;
+
+@layer utilities {
+    .util-card {
+      @apply mb-4 md:mb-8 text-base-content max-w-full bg-base-100;
+      border-radius: var(--card-border-radius);
+    }
+    .util-card--border {
+      @apply border-2 border-base-content p-6;
+    }
+    .util-card--border-top {
+      @apply border-t border-base-300 pt-4;
+    }
+    .util-card--border-light {
+      @apply border-base-300;
+    }
+    .util-card--border-dark {
+      @apply border-base-content;
+    }
+    .util-card--divider {
+      --card-border-radius: 0;
+      @apply border-b border-base-300 pb-4 mb-4;
+    }
+    .util-card__heading-text {
+      @apply md:text-2xl text-xl font-bold;
+  }
+    .util-card__body {
+      @apply flex flex-col gap-3 md:gap-4;
+    }
+    .util-card__action {
+      @apply flex flex-wrap items-center gap-y-4 mt-auto;
+    }
+}

package/src/components/card.css

@@ -1,80 +1,93 @@
+@import './card.common.css';
+
 .ds-card {
-  @apply mb-7 text-base-content;
-  &.ds-card--dense, .gov-dense & {
+  @apply util-card;
+  &.ds-card--dense,
+  .ds-dense & {
     @apply mb-5;
     .ds-card__body {
       @apply gap-2 md:gap-3;
     }
   }
-}
-.ds-card--border {
-  @apply border-2 border-base-content p-6;
-  &.ds-card--border-light {
-    @apply border;
-  }
-  &.ds-card--dense, .ds-dense & {
-    @apply p-4 pt-3;
+  &.ds-card--border {
+    @apply util-card--border;
+    &.ds-card--border-light {
+      @apply border;
+    }
+    &.ds-card--dense,
+    .ds-dense & {
+      @apply p-4 pt-3;
+    }
   }
-}
-.ds-card--border-top {
-  @apply border-t border-base-300 pt-4;
-  &.ds-card--border-dark {
-    @apply border-t-3;
+  &.ds-card--border-top {
+    @apply util-card--border-top;
+    &.ds-card--border-dark {
+      @apply border-t-3;
+    }
+    &.ds-card--dense,
+    .ds-dense & {
+      @apply p-3;
+    }
   }
-  &.ds-card--dense, .ds-dense & {
-    @apply p-3;
+  &.ds-card--divider {
+    @apply util-card--divider;
   }
-}
-.ds-card--divider {
-  @apply border-b border-base-300 pb-4 mb-4;
-}
-.ds-card--cta {
-  .ds-card__body {
-    @apply pr-8 relative;
-    &:after {
-      content: "";
-      transition: all 0.1s ease;
-      @apply w-5 h-5 bg-contain bg-no-repeat bg-center absolute right-2 top-2;
-      background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' aria-hidden='true'> <path d='M8.5,2L6.1,4.3l7.6,7.7l-7.6,7.6L8.5,22l10-10L8.5,2z' />  </svg>");
-    }
-    &:hover {
-      &:after {
-        @apply right-1;
+  &.ds-card--cta {
+    .ds-card__body {
+      @apply pr-8 relative;
+      &::after {
+        @apply w-5 h-5 bg-contain bg-no-repeat bg-center absolute right-2 top-2;
+        content: '';
+        transition: all 0.1s ease;
+        background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' aria-hidden='true'> <path d='M8.5,2L6.1,4.3l7.6,7.7l-7.6,7.6L8.5,22l10-10L8.5,2z' />  </svg>");
+      }
+      &:hover {
+        &::after {
+          @apply right-1;
+        }
       }
     }
-  }
 
-  .ds-card__heading {
-    @apply md:text-xl text-lg tracking-wide;
-    @apply leading-8 !important;
+    .ds-card__heading {
+      @apply md:text-xl text-lg tracking-wide;
+      @apply leading-8 !important;
+    }
+  }
+  &.ds-card--border-light {
+    @apply util-card--border-light;
+  }
+  &.ds-card--border-dark {
+    @apply util-card--border-dark;
+  }
+  &.ds-card--full-height {
+    @apply h-full;
   }
-}
-.ds-card--border-light {
-  @apply border-base-300;
-}
-.ds-card--border-dark {
-  @apply border-base-content;
 }
 .ds-card__body {
-  @apply flex flex-col gap-3 md:gap-4 h-full;
+  @apply util-card__body h-full;
+}
+.ds-card__image {
+  @apply  w-full h-40
+  /* @apply  h-40 -mx-6 */
+  bg-base-200 bg-cover bg-top
+  border border-base-300;
 }
 .ds-card__heading {
+  @apply util-card__heading-text;
   word-break: break-word;
-  @apply md:text-2xl text-xl font-bold;
 }
 .ds-card__content {
   word-break: break-word;
-  @apply text-base;
-  font-size: var(--card__text-font-size);
-  line-height: var(--card__text-line-height);
+  font-size: var(--card__content-font-size);
+  line-height: var(--card__content-line-height);
 }
 .ds-card__action {
-  @apply flex flex-wrap items-center gap-y-4 mt-auto;
+  @apply util-card__action;
 }
 @media print {
   /* When ds-card__action is empty at print, content at :after limits its height.  */
-  .ds-card__action:after {
-    content: "";
+  .ds-card__action::after {
+    content: '';
   }
 }
 
@@ -85,8 +98,8 @@
     .ds-link {
       /* Clickable area will be at all the card with 'after' */
       &::after {
-        content: "";
         @apply block absolute top-0 bottom-0 right-0 left-0;
+        content: '';
       }
     }
   }

package/src/components/card.native.css

@@ -0,0 +1,29 @@
+@import './card.common.css';
+
+.ds-card {
+  @apply util-card;
+}
+.ds-card--border {
+  @apply util-card--border;
+}
+.ds-card__body {
+  @apply util-card__body;
+}
+.ds-card__action {
+  @apply util-card__action;
+}
+.ds-card--border-top {
+  @apply util-card--border-top;
+}
+.ds-card--border-light {
+  @apply util-card--border-light;
+}
+.ds-card--border-dark {
+  @apply util-card--border-dark;
+}
+.ds-card--divider {
+  @apply util-card--divider;
+}
+.ds-card__heading__text {
+  @apply util-card__heading-text;
+}

package/src/components/checkboxes.common.css

@@ -0,0 +1,16 @@
+@tailwind utilities;
+
+@layer utilities {
+    .util-checkboxes__item {
+      @apply relative mb-4 min-h-10;
+    }
+    .util-checkboxes__input {
+      @apply absolute z-1 left-0.5 -top-0.5 m-0 opacity-100 w-10 h-10;
+    }
+    .util-checkboxes__input__after {
+      @apply absolute border-b-5 border-l-5;
+      width: 23px;
+      height: 12px;
+      transform: rotate(-45deg);
+    }
+}

package/src/components/checkboxes.css

@@ -1,3 +1,5 @@
+@import './checkboxes.common.css';
+
 .ds-checkboxes {
   &.ds-checkboxes--dense,
   .ds-dense & {
@@ -9,18 +11,18 @@
     }
     .ds-checkboxes__input {
       @apply w-8 h-8 left-0.5 md:top-0.5;
-      &:before {
+      &::before {
         @apply w-8 h-8;
       }
-      &:after {
+      &::after {
+        @apply border-b-4 border-l-4;
         top: 10px;
         left: 7px;
         width: 19px;
         height: 10px;
-        @apply border-b-4 border-l-4;
       }
       &:focus {
-        &:before {
+        &::before {
           @apply border-3;
         }
       }
@@ -29,12 +31,12 @@
       @apply mb-4 md:mb-6;
     }
   }
-}
-.ds-checkboxes--horizontal {
-  @apply inline-flex flex-wrap items-baseline gap-4 md:gap-6;
+  &.ds-checkboxes--horizontal {
+    @apply inline-flex flex-wrap items-baseline gap-4 md:gap-6;
+  }
 }
 .ds-checkboxes__item {
-  @apply block relative mb-4 pl-12 min-h-10;
+  @apply util-checkboxes__item block pl-12;
   &:last-child {
     @apply mb-0;
   }
@@ -43,29 +45,22 @@
   @apply inline-block py-1 px-2 cursor-pointer;
 }
 .ds-checkboxes__input {
-  @apply absolute z-1 left-0.5 -top-0.5 m-0 opacity-100
-  w-10 h-10 cursor-pointer;
-  &:before {
-    content: "";
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
+  @apply util-checkboxes__input cursor-pointer;
+  &::before {
     @apply absolute top-0 left-0 w-10 h-10
     border-solid border-base-content border-2 bg-base-100 opacity-100;
+    content: '';
+    box-sizing: border-box;
   }
-  &:after {
-    content: "";
-    @apply absolute bg-transparent opacity-0 box-border
-    border-accent border-b-5 border-l-5 border-t-0 border-r-0;
+  &::after {
+    @apply util-checkboxes__input__after bg-transparent opacity-0 box-border
+    border-accent border-t-0 border-r-0;
+    content: '';
     top: 11px;
     left: 9px;
-    width: 23px;
-    height: 12px;
-    -webkit-transform: rotate(-45deg);
-    -ms-transform: rotate(-45deg);
-    transform: rotate(-45deg);
   }
   &:checked {
-    &:after {
+    &::after {
       @apply opacity-100;
     }
   }
@@ -73,7 +68,7 @@
     outline: 3px solid transparent;
     outline-offset: 1px;
     box-shadow: 0 0 0 4px var(--color-focus);
-    &:before {
+    &::before {
       @apply border-4;
     }
   }
@@ -83,12 +78,6 @@
 }
 
 /* overrides */
-
-.ds-checkboxes--horizontal {
-  .ds-choice-divider-text {
-    @apply min-w-max mx-2;
-  }
-}
 .ds-checkboxes {
   &.ds-checkboxes--dense,
   .ds-dense & {
@@ -96,4 +85,10 @@
       @apply mb-4 md:mb-6;
     }
   }
+
+  &.ds-checkboxes--horizontal {
+    .ds-choice-divider-text {
+      @apply min-w-max mx-2;
+    }
+  }
 }

package/src/components/checkboxes.native.css

@@ -0,0 +1,28 @@
+@import './checkboxes.common.css';
+
+.ds-checkboxes__item {
+  @apply util-checkboxes__item;
+}
+.ds-checkboxes__label {
+  @apply pl-12;
+}
+.ds-checkboxes__input {
+  @apply util-checkboxes__input top-0 left-0 border-solid border-base-content border-2 bg-base-100;
+}
+
+
+.ds-checkboxes__input--checked {
+  @apply util-checkboxes__input__after text-black;
+  top: 8;
+  left: 5;
+}
+
+.ds-checkboxes__input__wrapper--focus {
+  border-width: 4px;
+  border-color: var(--color-focus);
+}
+.ds-checkboxes__label__text {
+  font-size: var(--label-font-size);
+  line-height: 2rem;
+  letter-spacing: 0rem;
+}