From eb766e9660aeb3eddc3f3ebefa5d4c258312c2bc Mon Sep 17 00:00:00 2001 From: neverland Date: Sun, 4 Nov 2018 20:30:40 +0800 Subject: [PATCH] update css variables (#2026) --- packages/checkbox/index.less | 6 +++--- packages/number-keyboard/index.less | 10 +++++----- packages/radio/index.less | 4 ++-- packages/style/var.less | 12 ++++++------ packages/swipe/index.less | 8 ++++---- packages/tab/index.less | 2 +- packages/tabs/index.less | 12 ++++++------ 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/checkbox/index.less b/packages/checkbox/index.less index d37c0ad37..f6e6dd1c5 100644 --- a/packages/checkbox/index.less +++ b/packages/checkbox/index.less @@ -8,7 +8,7 @@ &__label { display: inline-block; vertical-align: middle; - line-height: @van-checkbox-size; + line-height: @checkbox-size; } &__icon { @@ -18,8 +18,8 @@ text-align: center; line-height: inherit; border: 1px solid @gray-light; - width: @van-checkbox-size; - height: @van-checkbox-size; + width: @checkbox-size; + height: @checkbox-size; box-sizing: border-box; transition: .2s; } diff --git a/packages/number-keyboard/index.less b/packages/number-keyboard/index.less index 8104314e6..e76c8620e 100644 --- a/packages/number-keyboard/index.less +++ b/packages/number-keyboard/index.less @@ -39,7 +39,7 @@ bottom: 0; width: 25%; position: absolute; - height: @van-number-keyboard-key-height * 4; + height: @number-keyboard-key-height * 4; } &--custom { @@ -56,8 +56,8 @@ text-align: center; display: inline-block; vertical-align: middle; - height: @van-number-keyboard-key-height; - line-height: @van-number-keyboard-key-height; + height: @number-keyboard-key-height; + line-height: @number-keyboard-key-height; &::after { border-width: 1px 1px 0 0; @@ -69,8 +69,8 @@ &--big { width: 100%; - height: @van-number-keyboard-key-height * 2; - line-height: @van-number-keyboard-key-height * 2; + height: @number-keyboard-key-height * 2; + line-height: @number-keyboard-key-height * 2; } &--blue { diff --git a/packages/radio/index.less b/packages/radio/index.less index b13702f0a..ba5c34f53 100644 --- a/packages/radio/index.less +++ b/packages/radio/index.less @@ -13,7 +13,7 @@ &__input { height: 1em; position: relative; - font-size: @van-radio-size; + font-size: @radio-size; } &__control { @@ -27,7 +27,7 @@ } &__label { - line-height: @van-radio-size; + line-height: @radio-size; margin-left: 10px; &--left { diff --git a/packages/style/var.less b/packages/style/var.less index 4a08db9d9..6b2a93c43 100644 --- a/packages/style/var.less +++ b/packages/style/var.less @@ -38,17 +38,17 @@ @button-bottom-action-primary-background-color: @red; // checkbox -@van-checkbox-size: 20px; +@checkbox-size: 20px; // radio -@van-radio-size: 20px; +@radio-size: 20px; // swipe -@van-swipe-indicator: 6px; +@swipe-indicator: 6px; // tab -@van-tabs-line-height: 44px; -@van-tabs-card-height: 30px; +@tabs-line-height: 44px; +@tabs-card-height: 30px; // number keyboard -@van-number-keyboard-key-height: 54px; +@number-keyboard-key-height: 54px; diff --git a/packages/swipe/index.less b/packages/swipe/index.less index e266b7d8a..9b8c4a9dd 100644 --- a/packages/swipe/index.less +++ b/packages/swipe/index.less @@ -24,7 +24,7 @@ transform: translateY(-50%); .van-swipe__indicator:not(:last-child) { - margin-bottom: @van-swipe-indicator; + margin-bottom: @swipe-indicator; } } } @@ -32,11 +32,11 @@ &__indicator { border-radius: 100%; background-color: @gray-dark; - width: @van-swipe-indicator; - height: @van-swipe-indicator; + width: @swipe-indicator; + height: @swipe-indicator; &:not(:last-child) { - margin-right: @van-swipe-indicator; + margin-right: @swipe-indicator; } &--active { diff --git a/packages/tab/index.less b/packages/tab/index.less index 27854ebdd..b07570b81 100644 --- a/packages/tab/index.less +++ b/packages/tab/index.less @@ -7,7 +7,7 @@ font-size: 14px; position: relative; color: @text-color; - line-height: @van-tabs-line-height; + line-height: @tabs-line-height; text-align: center; box-sizing: border-box; background-color: @white; diff --git a/packages/tabs/index.less b/packages/tabs/index.less index 0f1b93b9a..627ffcef2 100644 --- a/packages/tabs/index.less +++ b/packages/tabs/index.less @@ -54,12 +54,12 @@ border-radius: 2px; box-sizing: border-box; border: 1px solid @red; - height: @van-tabs-card-height; + height: @tabs-card-height; .van-tab { color: @red; border-right: 1px solid @red; - line-height: @van-tabs-card-height - 2px; + line-height: @tabs-card-height - 2px; &:last-child { border-right: none; @@ -88,18 +88,18 @@ } &--line { - padding-top: @van-tabs-line-height; + padding-top: @tabs-line-height; .van-tabs__wrap { - height: @van-tabs-line-height; + height: @tabs-line-height; } } &--card { - padding-top: @van-tabs-card-height; + padding-top: @tabs-card-height; .van-tabs__wrap { - height: @van-tabs-card-height; + height: @tabs-card-height; } } }