blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

feat: add @border-width-base var (#4595)

Browse Source
This commit is contained in:
neverland 2019-09-26 20:46:46 +08:00 committed by GitHub
parent 557b8ea54d
commit 852314430b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/divider/index.less
View File

@ -19,7 +19,7 @@
height: 1px; height: 1px;
border-color: inherit; border-color: inherit;
border-style: inherit; border-style: inherit;
border-width: 1px 0 0; border-width: @border-width-base 0 0;
} }
&::before { &::before {

4
src/grid-item/index.less
View File

@ -18,7 +18,7 @@
&::after { &::after {
z-index: 1; z-index: 1;
border-width: 0 1px 1px 0; border-width: 0 @border-width-base @border-width-base 0;
} }
&--square { &--square {
@ -35,7 +35,7 @@
&--surround { &--surround {
&::after { &::after {
border-width: 1px; border-width: @border-width-base;
} }
} }

2
src/number-keyboard/index.less
View File

@ -71,7 +71,7 @@
vertical-align: middle; vertical-align: middle;
&::after { &::after {
border-width: 1px 1px 0 0; border-width: @border-width-base @border-width-base 0 0;
} }
&--middle { &--middle {

8
src/pagination/index.less
View File

@ -21,11 +21,11 @@
} }
&::after { &::after {
border-width: 1px 0 1px 1px; border-width: @border-width-base 0 @border-width-base @border-width-base;
} }
&:last-child::after { &:last-child::after {
border-right-width: 1px; border-right-width: @border-width-base;
} }
&--disabled, &--disabled,
@ -43,7 +43,7 @@
&__prev, &__prev,
&__next { &__next {
padding: 0 5px; padding: 0 @padding-base;
} }
&__page { &__page {
@ -60,7 +60,7 @@
.van-pagination__prev, .van-pagination__prev,
.van-pagination__next { .van-pagination__next {
&::after { &::after {
border-width: 1px; border-width: @border-width-base;
} }
} }
} }

2
src/style/hairline.less
View File

@ -41,6 +41,6 @@
} }
&--surround::after { &--surround::after {
border-width: 1px; border-width: @border-width-base;
} }
} }

9
src/style/var.less
View File

@ -14,7 +14,6 @@
// Component Colors // Component Colors
@text-color: #323233; @text-color: #323233;
@border-color: #ebedf0;
@active-color: #f2f3f5; @active-color: #f2f3f5;
@background-color: #f8f8f8; @background-color: #f8f8f8;
@background-color-light: #fafafa; @background-color-light: #fafafa;
@ -27,19 +26,21 @@
@padding-lg: @padding-base * 6; @padding-lg: @padding-base * 6;
@padding-xl: @padding-base * 8; @padding-xl: @padding-base * 8;
// Font Size // Font
@font-size-xs: 10px; @font-size-xs: 10px;
@font-size-sm: 12px; @font-size-sm: 12px;
@font-size-md: 14px; @font-size-md: 14px;
@font-size-lg: 16px; @font-size-lg: 16px;
// Font Weight
@font-weight-bold: 500; @font-weight-bold: 500;
// Animation // Animation
@animation-duration-base: .3s; @animation-duration-base: .3s;
@animation-duration-fast: .2s; @animation-duration-fast: .2s;
// Border
@border-color: #ebedf0;
@border-width-base: 1px;
// ActionSheet // ActionSheet
@action-sheet-max-height: 90%; @action-sheet-max-height: 90%;
@action-sheet-header-height: 44px; @action-sheet-header-height: 44px;

4
src/tabs/index.less
View File

@ -78,13 +78,13 @@
box-sizing: border-box; box-sizing: border-box;
height: @tabs-card-height; height: @tabs-card-height;
margin: 0 @padding-md; margin: 0 @padding-md;
border: 1px solid @tabs-default-color; border: @border-width-base solid @tabs-default-color;
border-radius: 2px; border-radius: 2px;
.van-tab { .van-tab {
color: @tabs-default-color; color: @tabs-default-color;
line-height: @tabs-card-height - 2px; line-height: @tabs-card-height - 2px;
border-right: 1px solid @tabs-default-color; border-right: @border-width-base solid @tabs-default-color;
&:last-child { &:last-child {
border-right: none; border-right: none;