Browse Source

Merge remote-tracking branch 'upstream/next' into next

zongyue3 4 years ago
parent
commit
2c776ad4d1
3 changed files with 19 additions and 3 deletions
  1. 14 0
      .github/workflows/test.yml
  2. 1 1
      package.json
  3. 4 2
      src/packages/__VUE/col/index.scss

+ 14 - 0
.github/workflows/test.yml

@@ -0,0 +1,14 @@
+name: github pages
+
+on:
+  push:
+    branches:
+      - next # default branch
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: yarn install
+      - run: yarn test

+ 1 - 1
package.json

@@ -60,7 +60,7 @@
     }
   },
   "dependencies": {
-    "sass": "^1.32.8",
+    "sass": "^1.34.0",
     "vue": "^3.0.5",
     "vue-router": "^4.0.4"
   },

+ 4 - 2
src/packages/__VUE/col/index.scss

@@ -1,3 +1,5 @@
+@use 'sass:math';
+
 .nut-col {
   float: left;
   box-sizing: border-box;
@@ -15,10 +17,10 @@
 
 @for $i from 1 through 24 {
   .nut-col-offset-#{$i} {
-    margin-left: 100/24 * $i * 1%;
+    margin-left: math.div(100, 24) * $i * 1%;
   }
 
   .nut-col-#{$i} {
-    width: 100/24 * $i * 1%;
+    width: math.div(100, 24) * $i * 1%;
   }
 }