Skip to content

Commit 75fb282

Browse files
committed
Merge branch 'master' into peterz/rate
2 parents aa2319c + 716c2d6 commit 75fb282

File tree

3 files changed

+83
-2
lines changed

3 files changed

+83
-2
lines changed

.github/workflows/test.yml

+11
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,14 @@ jobs:
1313
registry-url: https://registry.npmjs.org/
1414
- run: yarn install
1515
- run: yarn test
16+
build:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v1
20+
- uses: actions/setup-node@v1
21+
with:
22+
node-version: 12
23+
registry-url: https://registry.npmjs.org/
24+
- run: yarn install
25+
- run: yarn run build-storybook
26+
- run: yarn run build

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
"prepublish": "run-s build",
1818
"test": "run-s test:unit test:lint test:build",
1919
"test:build": "run-s build",
20-
"test:lint": "eslint .",
20+
"test:lint": "run-s lint",
2121
"test:unit": "cross-env CI=1 react-scripts test --env=jsdom --passWithNoTests",
2222
"test:watch": "react-scripts test --env=jsdom",
2323
"predeploy": "cd example && yarn install && yarn run build",
2424
"deploy": "gh-pages -d example/build",
2525
"lint": "eslint --ext .tsx ./src",
26-
"lint:watch": "esw --watch --fix --ext .tsx ./src --no-ignore",
26+
"lint:watch": "esw --watch --fix --ext .tsx ./src",
2727
"storybook": "start-storybook -p 9009",
2828
"build-storybook": "build-storybook"
2929
},

src/styles/style.scss

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
.vant-ellipsis {
2+
overflow: hidden;
3+
white-space: nowrap;
4+
text-overflow: ellipsis;
5+
}
6+
7+
.vant-multi-ellipsis {
8+
display: -webkit-box;
9+
overflow: hidden;
10+
text-overflow: ellipsis;
11+
-webkit-box-orient: vertical;
12+
13+
&--l2 {
14+
-webkit-line-clamp: 2;
15+
}
16+
17+
&--l3 {
18+
-webkit-line-clamp: 3;
19+
}
20+
}
21+
22+
.vant-hairline {
23+
border: 0 solid #ebedf0;
24+
25+
&--top {
26+
border-top-width: 1px;
27+
}
28+
&--bottom {
29+
border-bottom-width: 1px;
30+
}
31+
&--left {
32+
border-left-width: 1px;
33+
}
34+
&--right {
35+
border-right-width: 1px;
36+
}
37+
&--top-bottom {
38+
border-top-width: 1px;
39+
border-bottom-width: 1px;
40+
}
41+
&--surround {
42+
border-width: 1px;
43+
}
44+
}
45+
46+
.vant-fade {
47+
visibility: visible;
48+
transition: all 0.3s ease-out;
49+
}
50+
51+
.vant-slide {
52+
visibility: visible;
53+
transition: all 0.3s ease-out;
54+
55+
&-up {
56+
transform: translateY(-100%);
57+
}
58+
59+
&-down {
60+
transform: translateY(100%);
61+
}
62+
63+
&-left {
64+
transform: translateX(100%);
65+
}
66+
67+
&-right {
68+
transform: translateX(-100%);
69+
}
70+
}

0 commit comments

Comments
 (0)