From 9dd8a93067fb1b1ebf3ce0f45f9ad64cdc2d2bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Tue, 5 Sep 2017 10:50:17 +0800 Subject: [PATCH] vant-css: use hairline classes instead of mixins --- build/bin/build-lib.js | 2 +- packages/actionsheet/index.vue | 6 +- packages/badge-group/index.vue | 2 +- packages/badge/index.vue | 3 +- packages/cell-group/index.vue | 2 +- packages/cell/index.vue | 2 +- packages/deep-select/index.vue | 8 +-- packages/dialog/dialog.vue | 20 +++++- packages/field/index.vue | 1 + packages/goods-action-mini-btn/index.vue | 2 +- packages/order-coupon-list/index.vue | 2 +- packages/order-goods/Card.vue | 6 +- packages/order-goods/Empty.vue | 2 +- packages/panel/index.vue | 8 +-- packages/picker/index.vue | 2 +- packages/step/index.vue | 2 +- packages/steps/index.vue | 14 ++-- packages/switch/index.vue | 17 +---- packages/tabs/index.vue | 4 +- packages/tag/index.vue | 2 +- packages/vant-css/src/actionsheet.css | 25 +++---- packages/vant-css/src/badge.css | 64 ++++++------------ packages/vant-css/src/base.css | 5 +- packages/vant-css/src/button.css | 17 +++-- packages/vant-css/src/card.css | 7 +- packages/vant-css/src/cell-swipe.css | 2 + packages/vant-css/src/cell.css | 36 +++------- packages/vant-css/src/checkbox.css | 8 +-- packages/vant-css/src/col.css | 2 + packages/vant-css/src/common/hairline.css | 41 ++++++++++++ packages/vant-css/src/common/normalize.css | 27 ++++++++ packages/vant-css/src/common/var.css | 66 +++++++++---------- packages/vant-css/src/deep-select.css | 9 ++- packages/vant-css/src/dialog.css | 21 ++---- packages/vant-css/src/express-way.css | 8 ++- packages/vant-css/src/field.css | 15 +---- packages/vant-css/src/goods-action.css | 16 ++--- packages/vant-css/src/image-preview.css | 3 +- packages/vant-css/src/index.css | 1 + packages/vant-css/src/invalid-goods.css | 15 +++-- packages/vant-css/src/loading.css | 4 +- .../vant-css/src/mixins/border_retina.css | 24 +++++-- packages/vant-css/src/notice-bar.css | 2 +- packages/vant-css/src/order-coupon.css | 28 +++----- packages/vant-css/src/order-goods.css | 47 ++++++------- packages/vant-css/src/panel.css | 24 ++----- packages/vant-css/src/pay-order.css | 12 ++-- packages/vant-css/src/picker.css | 14 +--- packages/vant-css/src/popup.css | 9 +-- packages/vant-css/src/progress.css | 4 +- packages/vant-css/src/quantity.css | 20 +++--- packages/vant-css/src/radio.css | 6 +- packages/vant-css/src/reset.css | 10 ++- packages/vant-css/src/row.css | 3 +- packages/vant-css/src/search.css | 17 ++--- packages/vant-css/src/steps.css | 34 ++++------ packages/vant-css/src/swipe.css | 4 +- packages/vant-css/src/switch-cell.css | 2 + packages/vant-css/src/switch.css | 34 +++++----- packages/vant-css/src/tab.css | 38 +++-------- packages/vant-css/src/tag.css | 24 ++++--- packages/vant-css/src/toast.css | 18 ++--- packages/vant-css/src/uploader.css | 7 +- 63 files changed, 414 insertions(+), 466 deletions(-) create mode 100644 packages/vant-css/src/common/hairline.css create mode 100644 packages/vant-css/src/common/normalize.css diff --git a/build/bin/build-lib.js b/build/bin/build-lib.js index d20e2ba7c..b173bb4dc 100644 --- a/build/bin/build-lib.js +++ b/build/bin/build-lib.js @@ -42,7 +42,7 @@ components.forEach((componentName) => { const dir = path.join(__dirname, '../../lib/', componentName, '/style'); const file = path.join(dir, 'index.js'); const cssPath = path.join(__dirname, '../../lib/vant-css/', `${componentName}.css`); - const content = []; + const content = [`require('../../vant-css/base.css');`]; if (fs.existsSync(cssPath)) { content.push(`require('../../vant-css/${componentName}.css');`); } diff --git a/packages/actionsheet/index.vue b/packages/actionsheet/index.vue index 04f206ba2..0ce765aaa 100644 --- a/packages/actionsheet/index.vue +++ b/packages/actionsheet/index.vue @@ -1,7 +1,7 @@