Merge pull request #1495 from scireum/feature/jmu/SE-13735-design-sys…

…tem-additions Design System additions
scireum · Jan 15, 2025 · dc14f2b · dc14f2b
2 parents 3a74ebc + 4d8dadb
commit dc14f2b
Show file tree

Hide file tree

Showing 11 changed files with 301 additions and 17 deletions.
diff --git a/src/main/resources/assets/design-system/button.scss b/src/main/resources/assets/design-system/button.scss
@@ -8,7 +8,7 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
-  padding: 12px 16px;
+  padding: var(--sci-margin-1_5) var(--sci-margin-2);
   display: inline-block;
 
   transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out;
@@ -17,7 +17,7 @@
 .sci-btn-small {
   @extend .sci-btn;
 
-  padding: 6px;
+  padding: var(--sci-margin-1);
 }
 
 .sci-btn-outline {
@@ -42,6 +42,10 @@
     background-color: lighten($sirius-primary, 25%) !important;
     cursor: default;
   }
+
+  &.sci-btn-disabled {
+    pointer-events: none;
+  }
 }
 
 .sci-btn-secondary {
@@ -59,6 +63,10 @@
     background-color: lighten($sirius-gray-dark, 25%) !important;
     cursor: default;
   }
+
+  &.sci-btn-disabled {
+    pointer-events: none;
+  }
 }
 
 .sci-btn-white {
@@ -90,6 +98,10 @@
     color: lighten($sirius-primary, 25%) !important;
     cursor: default;
   }
+
+  &.sci-btn-disabled {
+    pointer-events: none;
+  }
 }
 
 .sci-btn-secondary-outline {
@@ -109,6 +121,10 @@
     color: lighten($sirius-gray-dark, 25%) !important;
     cursor: default;
   }
+
+  &.sci-btn-disabled {
+    pointer-events: none;
+  }
 }
 
 .sci-btn-white-outline {

diff --git a/src/main/resources/assets/design-system/card.scss b/src/main/resources/assets/design-system/card.scss
@@ -4,7 +4,7 @@
   min-width: 0;
   word-wrap: break-word;
   background-clip: border-box;
-  border: var(--sci-border-width-05) solid rgba(0,0,0,.125);
+  border: var(--sci-border-width-0_5) solid rgba(0,0,0,.125);
   overflow-x: auto;
   overflow-y: hidden;
 }

diff --git a/src/main/resources/assets/design-system/display.scss b/src/main/resources/assets/design-system/display.scss
@@ -19,6 +19,10 @@
   display: grid !important;
 }
 
+.sci-d-table-cell {
+  display: table-cell !important;
+}
+
 .sci-d-none {
   display: none !important;
 }
@@ -40,6 +44,15 @@
     display: block !important;
   }
 
+  .sci-d-sm-grid {
+    display: -ms-grid !important;
+    display: grid !important;
+  }
+
+  .sci-d-sm-table-cell {
+    display: table-cell !important;
+  }
+
   .sci-d-sm-none {
     display: none !important;
   }
@@ -62,6 +75,15 @@
     display: block !important;
   }
 
+  .sci-d-md-grid {
+    display: -ms-grid !important;
+    display: grid !important;
+  }
+
+  .sci-d-md-table-cell {
+    display: table-cell !important;
+  }
+
   .sci-d-md-none {
     display: none !important;
   }
@@ -84,6 +106,15 @@
     display: block !important;
   }
 
+  .sci-d-lg-grid {
+    display: -ms-grid !important;
+    display: grid !important;
+  }
+
+  .sci-d-lg-table-cell {
+    display: table-cell !important;
+  }
+
   .sci-d-lg-none {
     display: none !important;
   }

diff --git a/src/main/resources/assets/design-system/flex.scss b/src/main/resources/assets/design-system/flex.scss
@@ -66,6 +66,10 @@
   align-items: stretch;
 }
 
+.sci-align-items-baseline {
+  align-items: baseline;
+}
+
 .sci-align-self-start {
   align-self: flex-start;
 }

diff --git a/src/main/resources/assets/design-system/form.scss b/src/main/resources/assets/design-system/form.scss
@@ -3,8 +3,8 @@
   border-style: solid;
   border-radius: var(--sci-border-radius);
   border-color: $sirius-gray;
-  padding: 12px;
-  font-size: var(sci-font-size-base);
+  padding: var(--sci-margin-1_5);
+  font-size: var(--sci-font-size-base);
   line-height: 1.5;
 }