@trilogy-ds/styles 4.2.2-beta-3 → 4.2.2-beta-4

package/framework/src/_all.scss

@@ -2,7 +2,7 @@
 
 @import "utilities/all";
 @import "base/all";
-@import "elements/all";
-@import "components/all";
+@import "elements";
+@import "components";
 @import "grid/all";
 @import "layout/all";

package/framework/src/base/_all.scss

@@ -1,7 +1,7 @@
 @charset "utf-8";
 
-@import "reset";
 @import "color";
+@import "reset";
 @import "generic";
 @import "fonts";
 @import "helpers";

package/framework/src/base/_color.scss

@@ -1,28 +1,7 @@
 @use "sass:map";
 
-@function getColor( $name ) {
-  @return var(--color-#{nth(map-get($colors,$name),2)});
-}
-
-@function getColorValue( $name ) {
-  @return #{nth(map-get($colors,$name),1)}
-}
-
-@function getColorBrandName( $name ) {
-  @return #{nth(map-get($colors,$name),2)}
-}
-
 :root {
   @each $name, $color in $colors {
     --color-#{nth($color,2)}: #{nth($color,1)};
   }
 }
-
-@function invertColor ($colorName) {
-  @return var(--color-#{nth(map-get($colors,$colorName),3)})
-}
-
-@function fadeColor ($colorName) {
-  $name: map-get($fade-colors,$colorName);
-  @return getColor($name);
-}

package/framework/src/base/_elements.scss

@@ -6,7 +6,7 @@ body {
     @extend .main-wrap;
     @extend .body-wrap;
     @extend .reset-wrap;
-    font-family: $family-sans-serif;
+    font-family: $family-primary;
 }
 
 header {

package/framework/src/components/_card.scss

@@ -56,7 +56,7 @@
 
   &.is-strong {
     .title {
-      font-family: $family-serif;
+      font-family: $family-secondary;
       font-size: 24px !important;
     }
   }

package/framework/src/components/_countdown.scss

@@ -6,7 +6,7 @@
   color: getColor('font');
 
   .count {
-    font-family: $family-sans-serif;
+    font-family: $family-primary;
     font-size: $text-14;
     font-weight: 400;
     list-style-type: none;

package/framework/src/{elements/_all.scss → components/_index.scss}

@@ -1,32 +1,46 @@
 @charset "utf-8";
 @import '../utilities/spacing';
 
+@import 'accordion';
 @import 'alert';
 @import 'autocomplete';
+@import 'autolayout';
 @import 'badge';
 @import 'box';
+@import 'breadcrumb';
 @import 'button';
-@import 'chips';
+@import 'card';
 @import 'checkbox';
+@import 'chips';
 @import 'container';
-@import 'entry';
-@import 'form';
+@import 'countdown';
+@import 'divider';
+@import 'fab';
 @import 'icon';
 @import 'image';
-@import 'loader';
+@import 'input';
 @import 'link';
 @import 'list';
-@import 'toaster';
+@import 'loader';
+@import 'modal';
+@import 'otp';
+@import 'pagination';
+@import 'popover';
+@import 'price';
+@import 'product-tour';
 @import 'progress';
-@import 'paragraph';
 @import 'radio';
+@import 'range';
+@import 'scroll-view';
+@import 'segmented-control';
+@import 'select';
+@import 'stepper';
+@import 'sticker';
 @import 'switch';
 @import 'table';
+@import 'tabs';
 @import 'tag';
-@import 'title';
-@import 'other';
-@import 'select';
-@import 'sticker';
+@import 'text';
 @import 'textarea';
-@import 'input-gauge';
-@import 'input-icons';
+@import 'timeline';
+@import 'title';

package/framework/src/components/_modal.scss

@@ -48,13 +48,12 @@ body:has(.modal.is-active) {
     }
   }
 
-  // gestion des tailles
   @include tablet {
     justify-content: center;
-    @each $dimension in $dimensions-extended {
-      &.is-#{$dimension} {
+    @each $name, $dimension in $modal-dimensions {
+      &.is-#{$name} {
         .modal-content {
-          width: map-get($modal-dimensions, $dimension);
+          width: $dimension;
         }
       }
     }
@@ -110,7 +109,7 @@ body:has(.modal.is-active) {
     .modal-header {
       padding: $spacing-5;
       color: getColor('font');
-      font-family: $family-sans-serif;
+      font-family: $family-primary;
       font-size: $size-3;
       font-weight: $weight-semibold;
       line-height: 1.1;

package/framework/src/{elements → components}/_table.scss

@@ -204,7 +204,7 @@
   .subtable {
     background-color: getColor('neutral-fade');
     border-radius: var(--radius);
-    padding: $box-padding * 2;
+    padding: 25px;
 
     @include mobile() {
       padding: 15px;

package/framework/src/{elements/_paragraph.scss → components/_text.scss}

@@ -1,16 +1,4 @@
-$text-levels: (
-    ($text-16, $text-20, $text-16),
-    ($text-14, $text-18, $text-16),
-    ($text-12, $text-15, $text-16),
-    ($text-10, $text-12, $text-16)
-);
-$text-levels-mobile: (
-    ($text-16, $text-20, $text-8),
-    ($text-14, $text-18, $text-8),
-    ($text-12, $text-15, $text-8),
-    ($text-10, $text-12, $text-8)
-);
-
+@import "../utilities/variables/_font.scss";
 
 .text {
   @each $text-level in $text-levels {

package/framework/src/components/_timeline.scss

@@ -140,7 +140,7 @@ $timeline-image-dimensions: 16 24 32 48 64 96 128 !default;
       .heading {
         font-size: $text-12;
         color: getColor('font');
-        font-family: $family-sans-serif;
+        font-family: $family-primary;
         text-transform: none;
         letter-spacing: 0;
         line-height: 15px;

package/framework/src/components/alert/_index.scss

@@ -0,0 +1,2 @@
+@import "alert";
+@import "toaster";

package/framework/src/{elements → components/input}/_form.scss

@@ -281,7 +281,7 @@ $label-weight: $weight-bold;
       position: absolute;
       bottom: 5px;
       right: 16px;
-      font-size: $size-xsmall;
+      font-size: $text-10;
     }
 
     .is-error ~ .textarea-counter {

package/framework/src/components/input/_index.scss

@@ -0,0 +1,4 @@
+@import "entry";
+@import "form";
+@import "input-gauge";
+@import "input-icons";

package/framework/src/components/progress/_index.scss

@@ -0,0 +1,2 @@
+@import "progress";
+@import "progress-radial";

package/framework/src/{elements → components/progress}/_progress.scss

@@ -1,6 +1,6 @@
 @use "sass:math";
 
-@import "../base/color";
+@import "../../base/color";
 
 $progressbar-height: 10px;
 $progressbar-small: 5px;

package/framework/src/elements/_index.scss

@@ -0,0 +1,5 @@
+@charset "utf-8";
+@import '../utilities/spacing';
+
+@import 'other';
+@import 'plus-symbol';

package/framework/src/elements/_other.scss

@@ -1,7 +1,3 @@
-.block {
-    @include block;
-}
-
 .delete {
     @include delete;
 }

package/framework/src/trilogy-mangled.scss

@@ -8,7 +8,7 @@
 @import "base/loading";
 @import "base/elements";
 
-@import "elements/all";
-@import "components/all";
+@import "elements";
+@import "components";
 @import "grid/all";
 @import "layout/all";

package/framework/src/trilogy.scss

@@ -2,7 +2,7 @@
 
 @import "utilities/all";
 @import "base/all";
-@import "elements/all";
-@import "components/all";
+@import "elements";
+@import "components";
 @import "grid/all";
 @import "layout/all";

package/framework/src/utilities/_derived-variables.scss

@@ -1,93 +1 @@
 @import './initial-variables';
-
-// Typography
-$family-primary: $family-sans-serif !default;
-$family-secondary: $family-serif !default;
-$family-code: $family-monospace !default;
-
-$size-xsmall: $text-10 !default;
-$size-small: $text-13 !default;
-$size-normal: $text-16 !default;
-$size-medium: $text-16 !default;
-$size-large: $text-24 !default;
-
-
-// Brand Color
-$colors-brand: (
-  'background', 'main', 'accent'
-);
-
-// Brand Color Functionnal
-$colors-brand-functionnal: (
-  'background', 'main', 'accent', 'info', 'success', 'error', 'warning', 'neutral'
-);
-
-$colors-feedback: (
-  'success', 'error', 'warning', 'info'
-);
-
-// Gestion des z-index
-$zindex: (
-  subzero: -1,
-  void: 0,
-  tiny: 1,
-  small: 10,
-  medium: 100,
-  large: 1000,
-  dropdown: 5000,
-  sticky: 6000,
-  fixed: 7000,
-  modal: 8000,
-  popover: 9000,
-  tooltip: 9999,
-);
-
-// Gestion des tailles de police
-$sizes: $size-1 $size-2 $size-3 $size-4 $size-5 $size-6 $size-7 $size-8;
-$sizes-desktop: $size-1-desktop $size-2-desktop $size-3-desktop $size-4-desktop $size-5-desktop $size-6-desktop $size-7-desktop $size-8-desktop;
-$sizes-fluid: (
-    ($size-1, $size-1-desktop),
-    ($size-2, $size-2-desktop),
-    ($size-3, $size-3-desktop),
-    ($size-4, $size-4-desktop),
-    ($size-5, $size-5-desktop),
-    ($size-6, $size-6-desktop),
-    ($size-7, $size-7-desktop),
-    ($size-8, $size-8-desktop)
-);
-$sizes-desktop-interim: $size-7-desktop $size-6-desktop $size-5-desktop $size-4-desktop $size-3-desktop $size-2-desktop $size-1-desktop;
-$sizes-fluid-interim: (
-    ($size-7, $size-7-desktop),
-    ($size-6, $size-6-desktop),
-    ($size-5, $size-5-desktop),
-    ($size-4, $size-4-desktop),
-    ($size-3, $size-3-desktop),
-    ($size-2, $size-2-desktop),
-    ($size-1, $size-1-desktop)
-);
-
-// Gestion des déclinaisons de tailles utilisables par les composants (préfixées par is-)
-$dimension-xxsmall: 'xxsmall';
-$dimension-xsmall: 'xsmall';
-$dimension-small: 'small';
-$dimension-medium: 'medium';
-$dimension-large: 'large';
-$dimension-xlarge: 'xlarge';
-$dimension-xxlarge: 'xxlarge';
-
-$dimensions-limited: $dimension-small $dimension-medium $dimension-large;
-$dimensions-extended: $dimension-xsmall $dimension-small $dimension-medium $dimension-large $dimension-xlarge;
-$dimensions-all: $dimension-xxsmall $dimension-xsmall $dimension-small $dimension-medium $dimension-large $dimension-xlarge $dimension-xxlarge;
-
-$shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
-$focus-shadow: 0 1px 3px 0 rgba(69, 69, 69, 0.15),
-0 2px 20px -3px rgba(69, 69, 69, 0.3);
-
-$box-padding-mobile: 15px !default;
-$box-padding: 12.5px !default;
-$column-gap-mobile: 8px !default;
-$column-gap-tablet-desktop: 12px !default;
-$row-gap-mobile: 8px !default;
-$row-gap-tablet-desktop: 12px !default;
-
-$control-border-width: 1px !default;

package/framework/src/utilities/_initial-variables.scss

@@ -1,118 +1,8 @@
-@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');
-@import "colors";
+@import './variables';
 
 $hoverSelector: "&:hover:not([disabled]):not([aria-disabled=true])";
 
-// Typography OS-regular
-$family-sans-serif: 'Poppins Read', BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Helvetica', 'Arial', sans-serif !default;
-$family-serif: 'Poppins Speak', 'Poppins', 'Arial Black', 'Arial Bold', serif !default;
-$family-monospace: monospace !default;
-$render-mode: optimizeLegibility !default;
-
-$font-ratio: 1 !default;
-$font-convert-to-px: false !default;
-
-$text-8: 8px !default;
-$text-9: 9px !default;
-$text-10: 10px !default;
-$text-11: 11px !default;
-$text-12: 12px !default;
-$text-13: 13px !default;
-$text-14: 14px !default;
-$text-15: 15px !default;
-$text-16: 16px !default;
-$text-17: 17px !default;
-$text-18: 18px !default;
-$text-19: 19px !default;
-$text-20: 20px !default;
-$text-22: 22px !default;
-$text-24: 24px !default;
-$text-26: 26px !default;
-$text-27: 27px !default;
-$text-28: 28px !default;
-$text-29: 29px !default;
-$text-32: 32px !default;
-$text-34: 34px !default;
-$text-35: 35px !default;
-$text-36: 36px !default;
-$text-38: 38px !default;
-$text-39: 39px !default;
-$text-40: 40px !default;
-$text-42: 42px !default;
-$text-44: 44px !default;
-$text-46: 46px !default;
-$text-48: 48px !default;
-$text-50: 50px !default;
-$text-54: 54px !default;
-$text-56: 56px !default;
-$text-58: 58px !default;
-$text-60: 60px !default;
-$text-64: 64px !default;
-$text-80: 80px !default;
-
-
-$size-1: 32px;
-$size-2: $text-28;
-$size-3: $text-24;
-$size-4: $text-20;
-$size-5: $text-18;
-$size-6: 14px !default;
-$size-7: $text-12;
-$size-8: $text-11;
-
-$size-1-desktop: $text-48;
-$size-2-desktop: $text-38;
-$size-3-desktop: $text-28;
-$size-4-desktop: $text-24;
-$size-5-desktop: $text-18;
-$size-6-desktop: 14px !default;
-$size-7-desktop: $text-12;
-$size-8-desktop: $text-11;
-
-$weight-extrathin: 400 !default;
-$weight-thin: 400 !default;
-$weight-light: 400 !default;
-$weight-normal: 400 !default;
-$weight-medium: 500 !default;
-$weight-semibold: 600 !default;
-$weight-bold: 600 !default;
-$weight-extrabold: 600 !default;
-$weight-black: 600 !default;
-
-// Responsiveness
-// The container horizontal gap, which acts as the offset for breakpoints
-$gap: 20px !default;
-
-// 960, 1152, and 1344 have been chosen because they are divisible by both 12 and 16
-$tablet: 768px !default;
-
-// 960px container + 3rem
-//$desktop: 960px + 2 * $gap !default;
-$desktop: 984px + 2 * $gap !default;
-
-// 1152px container + 3rem
-$widescreen: 1200px + 2 * $gap !default;
-$widescreen-enabled: true !default;
-
-// 1348px container + 3rem
-$fullhd: 1348px + 2 * $gap !default;
-$fullhd-enabled: true !default;
-
-// Miscellaneous
-$easing: ease-out !default;
-$speed: 86ms !default;
-
 // Radius
 $radius-small: 4px !default;
 $radius: 8px !default;
 
-// Flags
-$variable-columns: true !default;
-
-// Animations
-$animation-duration: 0.3s;
-$animation-timing-function: cubic-bezier(0.075, 0.82, 0.165, 1);
-
-// Logo sizes
-$logo-width: 150px;
-$logo-width-desktop: 200px;

package/framework/src/utilities/variables/_animation.scss

@@ -0,0 +1,2 @@
+$animation-duration: 0.3s;
+$animation-timing-function: cubic-bezier(0.075, 0.82, 0.165, 1);

package/framework/src/utilities/{_colors.scss → variables/_color.scss}

@@ -39,3 +39,40 @@ $fade-colors: (
   'disabled': 'disabled-fade',
   'neutral': 'neutral-fade',
 ) !default;
+
+@function getColor( $name ) {
+  @return var(--color-#{nth(map-get($colors,$name),2)});
+}
+
+@function getColorValue( $name ) {
+  @return #{nth(map-get($colors,$name),1)}
+}
+
+@function getColorBrandName( $name ) {
+  @return #{nth(map-get($colors,$name),2)}
+}
+
+
+
+@function invertColor ($colorName) {
+  @return var(--color-#{nth(map-get($colors,$colorName),3)})
+}
+
+@function fadeColor ($colorName) {
+  $name: map-get($fade-colors,$colorName);
+  @return getColor($name);
+}
+
+// Brand Color
+$colors-brand: (
+  'background', 'main', 'accent'
+);
+
+// Brand Color Functionnal
+$colors-brand-functionnal: (
+  'background', 'main', 'accent', 'info', 'success', 'error', 'warning', 'neutral'
+);
+
+$colors-feedback: (
+  'success', 'error', 'warning', 'info'
+);

package/framework/src/utilities/variables/_font.scss

@@ -0,0 +1,97 @@
+@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');
+
+// Typography OS-regular
+$family-primary: 'Poppins Read', BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Helvetica', 'Arial', sans-serif !default;
+$family-secondary: 'Poppins Speak', 'Poppins', 'Arial Black', 'Arial Bold', serif !default;
+$family-code: monospace !default;
+$render-mode: optimizeLegibility !default;
+
+$font-ratio: 1 !default;
+$font-convert-to-px: false !default;
+
+$weight-extrathin: 400 !default;
+$weight-thin: 400 !default;
+$weight-light: 400 !default;
+$weight-normal: 400 !default;
+$weight-medium: 500 !default;
+$weight-semibold: 600 !default;
+$weight-bold: 600 !default;
+$weight-extrabold: 600 !default;
+$weight-black: 600 !default;
+
+$text-8: 8px !default;
+$text-9: 9px !default;
+$text-10: 10px !default;
+$text-11: 11px !default;
+$text-12: 12px !default;
+$text-13: 13px !default;
+$text-14: 14px !default;
+$text-15: 15px !default;
+$text-16: 16px !default;
+$text-17: 17px !default;
+$text-18: 18px !default;
+$text-19: 19px !default;
+$text-20: 20px !default;
+$text-22: 22px !default;
+$text-24: 24px !default;
+$text-26: 26px !default;
+$text-27: 27px !default;
+$text-28: 28px !default;
+$text-29: 29px !default;
+$text-32: 32px !default;
+$text-34: 34px !default;
+$text-35: 35px !default;
+$text-36: 36px !default;
+$text-38: 38px !default;
+$text-39: 39px !default;
+$text-40: 40px !default;
+$text-42: 42px !default;
+$text-44: 44px !default;
+$text-46: 46px !default;
+$text-48: 48px !default;
+$text-50: 50px !default;
+$text-54: 54px !default;
+$text-56: 56px !default;
+$text-58: 58px !default;
+$text-60: 60px !default;
+$text-64: 64px !default;
+$text-80: 80px !default;
+
+$size-1: $text-32;
+$size-2: $text-28;
+$size-3: $text-24;
+$size-4: $text-20;
+$size-5: $text-18;
+$size-6: $text-14;
+$size-7: $text-12;
+$size-8: $text-11;
+$size-1-desktop: $text-48;
+$size-2-desktop: $text-38;
+$size-3-desktop: $text-28;
+$size-4-desktop: $text-24;
+$size-5-desktop: $text-18;
+$size-6-desktop: $text-14;
+$size-7-desktop: $text-12;
+$size-8-desktop: $text-11;
+
+
+$sizes: $size-1 $size-2 $size-3 $size-4 $size-5 $size-6 $size-7 $size-8;
+
+$size-small: $text-13 !default;
+$size-normal: $text-16 !default;
+$size-medium: $text-16 !default;
+$size-large: $text-24 !default;
+
+/* Real Text level ! */
+$text-levels: (
+    ($text-16, $text-20, $text-16),
+    ($text-14, $text-18, $text-16),
+    ($text-12, $text-15, $text-16),
+    ($text-10, $text-12, $text-16)
+);
+$text-levels-mobile: (
+    ($text-16, $text-20, $text-8),
+    ($text-14, $text-18, $text-8),
+    ($text-12, $text-15, $text-8),
+    ($text-10, $text-12, $text-8)
+);

package/framework/src/utilities/variables/_index.scss

@@ -0,0 +1,6 @@
+@import "animation";
+@import "color";
+@import "font";
+@import "responsiveness";
+@import "shadow";
+@import "zindex";

package/framework/src/utilities/variables/_responsiveness.scss

@@ -0,0 +1,7 @@
+// The container horizontal gap, which acts as the offset for breakpoints
+$gap: 20px !default;
+
+$tablet: 768px !default;
+$desktop: 984px + 2 * $gap !default;
+$widescreen: 1200px + 2 * $gap !default;
+$fullhd: 1348px + 2 * $gap !default;

package/framework/src/utilities/variables/_shadow.scss

@@ -0,0 +1,3 @@
+$shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
+$focus-shadow: 0 1px 3px 0 rgba(69, 69, 69, 0.15),
+0 2px 20px -3px rgba(69, 69, 69, 0.3);

package/framework/src/utilities/variables/_zindex.scss

@@ -0,0 +1,14 @@
+$zindex: (
+  subzero: -1,
+  void: 0,
+  tiny: 1,
+  small: 10,
+  medium: 100,
+  large: 1000,
+  dropdown: 5000,
+  sticky: 6000,
+  fixed: 7000,
+  modal: 8000,
+  popover: 9000,
+  tooltip: 9999,
+);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trilogy-ds/styles",
-  "version": "4.2.2-beta-3",
+  "version": "4.2.2-beta-4",
   "author": "Bouygues Telecom",
   "license": "UNLICENSED",
   "files": [