@trilogy-ds/styles 0.0.1-beta.9 → 0.0.1-fix-timepicker

package/framework/src/components/_modal.scss

@@ -2,207 +2,231 @@ $modal-content-width: 640px !default;
 $modal-content-margin-mobile: 20px !default;
 $modal-close-dimensions: 40px !default;
 $modal-dimensions: (
-    'xsmall': 40vw,
-    'small': 50vw,
-    'medium': 60vw,
-    'large': 70vw,
-    'xlarge': 80vw
+  'xsmall': 40vw,
+  'small': 50vw,
+  'medium': 60vw,
+  'large': 70vw,
+  'xlarge': 80vw
 );
 
 body:has(.modal.is-active) {
-    height: 100%;
-    overflow: hidden
+  height: 100%;
+  overflow: hidden
 }
 
 .modal {
+  @include overlay;
+
+  position: fixed;
+  z-index: zindex('modal');
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: flex-end;
+  visibility: hidden;
+  opacity: 0;
+  transition: opacity 250ms ease-in-out,
+  visibility 0ms linear 250ms;
+
+  // overlay
+  &::after {
     @include overlay;
 
-    position: fixed;
-    z-index: zindex('modal');
-    overflow: hidden;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: flex-end;
-    visibility: hidden;
-    opacity: 0;
-    transition:
-        opacity 250ms ease-in-out,
-        visibility 0ms linear 250ms;
-
-    // overlay
-    &::after {
-        @include overlay;
+    content: '';
+    background-color: rgba(#000, 0.86);
+  }
+
+  &.is-active {
+    opacity: 1;
+    visibility: inherit;
+    transition: opacity 250ms ease-in-out,
+    visibility 0ms linear;
 
-        content: '';
-        background-color: rgba(#000, 0.86);
+    .modal-content {
+      transform: translateY(0);
     }
+  }
 
-    &.is-active {
-        opacity: 1;
-        visibility: inherit;
-        transition:
-            opacity 250ms ease-in-out,
-            visibility 0ms linear;
+  @include tablet {
+    justify-content: center;
+    @each $name, $dimension in $modal-dimensions {
+      &.is-#{$name} {
         .modal-content {
-            transform: translateY(0);
+          width: $dimension;
         }
+      }
     }
+  }
+
+  // spécificité pour le bouton en position: relative par défaut
+  .button {
+    position: static;
+  }
+
+  .modal-content {
+    background-color: getColor('background');
+    border-radius: var(--radius) var(--radius) 0 0;
+    color: getColor('font');
+    overflow: auto;
+    position: relative;
+    margin: 0 $modal-content-margin-mobile;
+    max-height: calc(100vh - 40px);
+    width: 100%;
+    z-index: zindex('tiny');
+    transition: transform ease-in-out 250ms;
+    transform: translateY(50%);
 
-    // gestion des tailles
     @include tablet {
-        justify-content: center;
-        @each $dimension in $dimensions-extended {
-            &.is-#{$dimension} {
-                .modal-content {
-                    width: map-get($modal-dimensions, $dimension);
-                }
-            }
-        }
+      max-height: calc(100vh - 120px);
+      width: $modal-content-width;
+      border-radius: $radius;
     }
 
-    // spécificité pour le bouton en position: relative par défaut
-    .button {
-        position: static;
+    // Annulation des propriétés du composant box, se trouvant dans une modal
+    > .box {
+      background-color: transparent;
+      border-radius: 0;
+      box-shadow: none;
+      padding: 0;
+      max-height: inherit;
+
+      .box-content {
+        background-color: transparent;
+        border-radius: 0;
+        padding: 0;
+        padding-bottom: 30px;
+        margin: 0;
+        text-align: inherit;
+      }
     }
 
-    // ancien overlay : n'a plus d'utilité mais conservée pour rétrocompatibilité
-    .modal-background {
-        display: none;
+    // If Close Icon Modal & Title Modal are sibling elements, override margin
+    .modal-close ~ .modal-title {
+      margin-top: -32px;
     }
 
-    .modal-content {
-        background-color: getColor('background');
-        border-radius: $radius $radius 0 0;
-        color: getColor('font');
-        overflow: auto;
-        position: relative;
-        padding: 0 30px 30px;
-        margin: 0 $modal-content-margin-mobile;
-        max-height: calc(100vh - 40px);
+    .modal-header {
+      padding: $spacing-5;
+      color: getColor('font');
+      font-family: $family-primary;
+      font-size: $size-3;
+      font-weight: $weight-semibold;
+      line-height: 1.1;
+      background-color: getColor('background');
+      z-index: zindex('medium');
+      position: sticky;
+      top: 0;
+      width: 100%;
+      word-wrap: break-word;
+      display: flex;
+      justify-content: space-between;
+
+      &:has(.modal-close) {
+        flex-direction: row-reverse;
+      }
+
+      &:has(.icon) {
         text-align: center;
-        width: 100%;
-        z-index: zindex('tiny');
-        transition: transform ease-in-out 250ms;
-        transform: translateY(100%);
-
-        &.is-fullwidth {
-          width: 100% !important;
-        }
+      }
 
-        @include tablet {
-            max-height: calc(100vh - 120px);
-            width: $modal-content-width;
-            border-radius: $radius;
-        }
-
-        // Annulation des propriétés du composant box, se trouvant dans une modal
-        > .box {
-            background-color: transparent;
-            border-radius: 0;
-            box-shadow: none;
-            padding: 0;
-            max-height: inherit;
-
-            .box-content {
-                background-color: transparent;
-                border-radius: 0;
-                padding: 0;
-                padding-bottom: 30px;
-                margin: 0;
-                text-align: inherit;
-            }
-        }
-
-        .modal-footer {
-            position: sticky;
-            background: getColor('background');
-            bottom: -30px;
-            margin: 30px -30px -30px;
-            padding: 20px 30px;
-        }
+      @include desktop {
+        font-size: $size-3-desktop;
+      }
 
-        // If Close Icon Modal & Title Modal are sibling elements, override margin
-        .modal-close ~ .modal-title   {
-          margin-top: -32px;
-        }
-    }
-
-    .modal-close {
+      .modal-close {
         @include delete;
 
         background-color: getColor('background');
-        position: sticky;
-        top: 20px;
-        left: 100%;
         display: block;
         height: $modal-close-dimensions;
         width: $modal-close-dimensions;
-        z-index: zindex('medium');
+        z-index: zindex('large');
 
-        &:hover {
-            background-color: getColor('grey-light');
+        #{$hoverSelector} {
+          background-color: getColor('neutral-fade');
         }
 
         &::after,
         &::before {
-            background-color: getColor('font');
+          background-color: getColor('font');
         }
-    }
 
-    .modal-title {
-        color: getColor('font');
-        font-family: $family-sans-serif;
-        font-size: $size-3;
-        font-weight: $weight-semibold;
-        line-height: 1.1;
-        background-color: getColor('background');
-        z-index: zindex('small');
-        position: sticky;
-        top: 0;
-        padding: 20px 0;
-        width: 100%;
-        word-wrap: break-word;
-
-        @include desktop {
-            font-size: $size-3-desktop;
+        &:focus-visible,
+        &:focus:focus-visible {
+          outline: 2px solid getColor('font') !important;
+          outline-offset: 2px;
+        }
+        &:focus{
+          background-color: transparent !important;
         }
+      }
     }
 
-    // version "panel" de la modal
-    &.is-panel {
-        &::after {
-            position: fixed;
-        }
+    .modal-body {
+      padding: 0 $spacing-5 $spacing-5 ;
+    }
+    &:has(>.modal-footer) > .modal-body {
+      padding-bottom: 0;
+    }
 
-        .modal-content {
-            border-radius: 0;
-            position: fixed;
-            right: 0;
-            top: 0;
-            min-height: 100%;
-            height: 100%;
-            max-height: none;
-            margin: 0;
-            text-align: left;
-            display: flex;
-            flex-direction: column;
-            align-items: flex-start;
-            transform: translateX(100%);
-
-            @include tablet {
-                max-width: 375px;
-            }
-
-            .modal-footer {
-                margin-top: auto;
-            }
-        }
+    .modal-footer {
+      padding: $spacing-5;
+      position: sticky;
+      width: 100%;
+      background: getColor('background');
+      bottom: 0;
+
+      .buttons {
+        display: flex;
+        flex-direction: column-reverse;
+      }
+
+      @include tablet {
+        display: flex;
+        justify-content: flex-end;
 
-        &.is-active {
-            .modal-content {
-                transform: translateX(0);
-            }
+        .buttons {
+          flex-direction: row;
         }
+      }
+    }
+  }
+
+  // version "panel" de la modal
+  &.is-panel {
+    &::after {
+      position: fixed;
+    }
+
+    .modal-content {
+      border-radius: 0;
+      position: fixed;
+      right: 0;
+      top: 0;
+      min-height: 100%;
+      height: 100%;
+      max-height: none;
+      margin: 0;
+      text-align: left;
+      display: flex;
+      flex-direction: column;
+      align-items: flex-start;
+      transform: translateX(100%);
+
+      @include tablet {
+        max-width: 375px;
+      }
+
+      .modal-footer {
+        margin-top: auto;
+      }
+    }
+
+    &.is-active {
+      .modal-content {
+        transform: translateX(0);
+      }
     }
+  }
 }

package/framework/src/components/_otp.scss

@@ -3,15 +3,17 @@
   flex-wrap: nowrap;
 
   .otp {
+    @include hover();
     outline: none;
-    border: 1px solid currentColor;
-    border-radius: 4px;
+    border: var(--border);
+    border-radius: var(--radius-small);
     background: transparent;
     width: 33px;
     height: 40px;
     margin: 4px 4px 0 4px;
     text-align: center;
-    color: getColor('grey');
+    color: getColor('main');
+
     &:first-child {
       margin: 4px 4px 0 0;
     }
@@ -24,13 +26,7 @@
 
   &.is-danger {
     .otp {
-      border: 2px solid  getColor('error');
-    }
-  }
-
-  &.is-tertiary {
-    .otp {
-      border: 2px solid getColor('font');
+      border: 1px solid getColor('error');
     }
   }
 
@@ -42,7 +38,7 @@
 
   &.is-focus {
     .otp {
-      border: 2px solid getColor('alternate');;
+      border: 1px solid getColor('font');;
       color: getColor('font')
     }
   }
@@ -50,43 +46,28 @@
 
   &.is-error {
     .otp {
-      border: 2px solid getColor('error');
+      border: 1px solid getColor('error');
       color: getColor('font')
     }
   }
 
-  &.is-tertiary {
-    .otp {
-      border: 2px solid getColor('font');
-    }
-  }
-
-  &.is-disabled {
-    .otp {
-      border: none !important;
-      background: getColor('grey-disabled');
-      pointer-events: none;
-      color: getColor('grey');
-    }
-  }
-
 }
 
 .otp-list:focus-within {
   .otp {
-    border: 2px solid getColor('alternate');;
+    border: 1px solid getColor('font');;
     color: getColor('font');
   }
 }
 
 .otp-list.is-error:focus-within {
   .otp {
-    border: 2px solid getColor('error');
+    border: 1px solid getColor('error');
     color: getColor('font');
   }
 }
 
-.otp-error-message {
+.help {
   font-size: $text-12;
   margin-top: 4px;
 }