KYAN-289 add new sizes to 'size' dropdown (#509)

* KYAN-289 add 'xs' and '2xs' sizes to 'size' dropdown * KYAN-289 adjust Content font for XS and 2XS sizes
websight-io · Oct 3, 2024 · ef1be08 · ef1be08
1 parent 7e0fae2
commit ef1be08
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 2 deletions.
diff --git a/...ommon/backend/src/main/resources/libs/kyanite/common/components/common/size/.content.json b/...ommon/backend/src/main/resources/libs/kyanite/common/components/common/size/.content.json
@@ -22,4 +22,4 @@
     "label": "Large",
     "value": "is-large"
   }
-}
+}
diff --git a/...on/backend/src/main/resources/libs/kyanite/common/components/content/dialog/.content.json b/...on/backend/src/main/resources/libs/kyanite/common/components/content/dialog/.content.json
@@ -21,7 +21,21 @@
       },
       "size": {
         "sling:resourceType": "wcm/dialogs/components/include",
-        "path": "kyanite/common/components/common/size"
+        "include": {
+          "sling:resourceSuperType": "/libs/kyanite/common/components/common/size",
+          "extraSmall-2x": {
+            "sling:resourceType": "wcm/dialogs/components/select/selectitem",
+            "label": "2 Extra small",
+            "value": "is-2xsmall",
+            "sling:orderBefore": "small"
+          },
+          "extraSmall": {
+            "sling:resourceType": "wcm/dialogs/components/select/selectitem",
+            "label": "Extra small",
+            "value": "is-xsmall",
+            "sling:orderBefore": "small"
+          }
+        }
       },
       "textweight": {
         "sling:resourceType": "wcm/dialogs/components/include",

diff --git a/applications/common/frontend/src/atomic-design-system/00-token/t.font/t.font-size.scss b/applications/common/frontend/src/atomic-design-system/00-token/t.font/t.font-size.scss
@@ -24,6 +24,7 @@
 // 16px as base
 $map_t-font-sizes: (
   'base': 1rem,
+  '10': 0.625rem,
   '12': 0.75rem,
   '14': 0.875rem,
   '16': 1rem,

diff --git a/applications/common/frontend/src/atomic-design-system/00-token/t.font/t.line-height.scss b/applications/common/frontend/src/atomic-design-system/00-token/t.font/t.line-height.scss
@@ -18,6 +18,7 @@
 
 $map_t-line-heights: (
   '100': 100%,
+  '140': 140%,
   '150': 150%,
   '155': 155%,
 );
diff --git a/applications/common/frontend/src/atomic-design-system/01-atom/a.content.scss b/applications/common/frontend/src/atomic-design-system/01-atom/a.content.scss
@@ -36,7 +36,13 @@
     color: unset;
   }
 
+  &-2xs {
+    line-height: var(--line-height-140);
+    font-size: var(--font-size-10);
+  }
+
   &-xs {
+    line-height: var(--line-height-150);
     font-size: var(--font-size-12);
   }
 

diff --git a/applications/common/frontend/src/components/Content/Content.scss b/applications/common/frontend/src/components/Content/Content.scss
@@ -21,6 +21,10 @@
 .content {
   @extend .a-content;
 
+  &.is-2xsmall {
+    @extend .a-content-2xs;
+  }
+
   &.is-xsmall {
     @extend .a-content-xs;
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,4 @@ @@
         "label": "Large",
         "value": "is-large"
       }
-    }
+    }