Merge branch 'develop'

hz2 · Nov 23, 2023 · b430ca5 · b430ca5
2 parents 652f3c8 + a5fdd6d
commit b430ca5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/doc.md b/doc.md
@@ -1,5 +1,9 @@
 # Base
 
+## Base
+
+<details><summary><strong>Layout</strong></summary>
+
 ## Layout
 
 | class name      | define        | equals                           |
@@ -11,6 +15,8 @@
 | `.flex.end`     | end           | `justify-content: flex-end;`     |
 | `.flex.top`     | top           | `align-items: flex-start;`       |
 | `.flex.bottom`  | bottom        | `align-items: flex-end;`         |
+| `.grid`         | display grid  | `display: grid;`                 |
+| `.inline-grid`  | inline grid   | `display: inline-grid;`          |
 | `.block`        | display block | `display: block;`                |
 | `.inline-block` | inline block  | `display: inline-block;`         |
 | `.align-top`    | vertical top  | `vertical-align: top;`           |

diff --git a/src/common/base.less b/src/common/base.less
@@ -56,6 +56,14 @@
     flex-shrink: 1;
   }
 
+  >.grow0 {
+    flex-grow: 0;
+  }
+
+  >.shrink0 {
+    flex-shrink: 0;
+  }
+
 }
 
 .inline-flex {
@@ -300,4 +308,4 @@ input {
 
 .z150 {
   z-index: 150;
-}
+}
diff --git a/src/common/typeset.less b/src/common/typeset.less
@@ -44,13 +44,11 @@
 .text-overflow {
   text-overflow: ellipsis;
   overflow: hidden;
-  width: 100%;
 }
 
 .text-two-lines {
   text-overflow: ellipsis;
   overflow: hidden;
-  width: 100%;
 
   display: -webkit-box;
   -webkit-line-clamp: 2;