Showing
2 changed files
with
1 additions
and
4 deletions
| 1 | { | 1 | { |
| 2 | "name": "@qx/common", | 2 | "name": "@qx/common", |
| 3 | - "version": "3.0.0-alpha.14", | 3 | + "version": "3.0.0-alpha.16", |
| 4 | "description": "A react library developed with dumi", | 4 | "description": "A react library developed with dumi", |
| 5 | "license": "MIT", | 5 | "license": "MIT", |
| 6 | "module": "dist/index.js", | 6 | "module": "dist/index.js", |
| @@ -10,12 +10,9 @@ | @@ -10,12 +10,9 @@ | ||
| 10 | justify-content: space-between; | 10 | justify-content: space-between; |
| 11 | font-size: 14px; | 11 | font-size: 14px; |
| 12 | color: @N9; | 12 | color: @N9; |
| 13 | -<<<<<<< HEAD | ||
| 14 | height: 22px; | 13 | height: 22px; |
| 15 | margin-bottom: 4px; | 14 | margin-bottom: 4px; |
| 16 | overflow: hidden; | 15 | overflow: hidden; |
| 17 | -======= | ||
| 18 | ->>>>>>> 9a6887dfe15d01f555b9adbae7bca829b7d2e99d | ||
| 19 | } | 16 | } |
| 20 | 17 | ||
| 21 | &__header-icon { | 18 | &__header-icon { |