From a8d83bd2697e5eb681e779d41037b618a68989db Mon Sep 17 00:00:00 2001 From: mxie <15623530290@163.com> Date: Fri, 17 Nov 2017 22:14:34 +0800 Subject: [PATCH] confireBtn css update --- README.md | 2 +- datepicker/index.vue | 16 +++++++++++----- datepicker/languages.js | 18 +++++++++--------- package.json | 2 +- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 33f83d3..6c85708 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ export default { | first-day-of-week | Number | 7 | set the first day of week (1-7) | | minute-step | Number | 0 | if > 0 don't show the second picker(0 - 60) | | input-class | String | 'input' | the input class name | -| confirm_text | String | 'Ok' | the default text to display on confirm button | +| confirm-text | String | 'OK' | the default text to display on confirm button | ## shortcuts diff --git a/datepicker/index.vue b/datepicker/index.vue index 33398e6..3c6db2e 100644 --- a/datepicker/index.vue +++ b/datepicker/index.vue @@ -41,7 +41,7 @@ :show="showPopup">
@@ -108,9 +108,9 @@ export default { type: String, default: 'input' }, - confirm_text: { + confirmText: { type: String, - default: 'Ok' + default: 'OK' } }, data () { @@ -409,15 +409,21 @@ export default { } .datepicker-btn { font-size: 12px; - line-height: 28px; - padding: 0 5px; + line-height: 1; + padding: 7px 15px; margin: 0 5px; cursor: pointer; background-color: transparent; outline: none; border: none; + border-radius: 3px; } .datepicker-btn-confirm { + border: 1px solid rgba(0, 0, 0, 0.1); + color: #73879c; +} +.datepicker-btn-confirm:hover { color: #1284e7; + border-color: #1284e7; } diff --git a/datepicker/languages.js b/datepicker/languages.js index 84e2df1..eb2c9d2 100644 --- a/datepicker/languages.js +++ b/datepicker/languages.js @@ -6,7 +6,7 @@ export default { 'placeholder': { 'date': '请选择日期', 'dateRange': '请选择日期范围' - }, + } }, 'en': { 'days': ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'], @@ -15,7 +15,7 @@ export default { 'placeholder': { 'date': 'Select Date', 'dateRange': 'Select Date Range' - }, + } }, 'fr': { 'days': ['Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam'], @@ -24,7 +24,7 @@ export default { 'placeholder': { 'date': 'Sélectionnez une date', 'dateRange': 'Sélectionnez une période' - }, + } }, 'es': { 'days': ['Dom', 'Lun', 'mar', 'Mie', 'Jue', 'Vie', 'Sab'], @@ -33,7 +33,7 @@ export default { 'placeholder': { 'date': 'Seleccionar fecha', 'dateRange': 'Seleccionar un rango de fechas' - }, + } }, 'pt-br': { 'days': ['Dom', 'Seg', 'Ter', 'Qua', 'Quin', 'Sex', 'Sáb'], @@ -42,7 +42,7 @@ export default { 'placeholder': { 'date': 'Selecione uma data', 'dateRange': 'Selecione um período' - }, + } }, 'ru': { 'days': ['Вс', 'Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб'], @@ -51,7 +51,7 @@ export default { 'placeholder': { 'date': 'Выберите дату', 'dateRange': 'Выберите период' - }, + } }, 'de': { 'days': ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'], @@ -60,7 +60,7 @@ export default { 'placeholder': { 'date': 'Datum auswählen', 'dateRange': 'Zeitraum auswählen' - }, + } }, 'it': { 'days': ['Dom', 'Lun', 'Mar', 'Mer', 'Gio', 'Ven', 'Sab'], @@ -69,7 +69,7 @@ export default { 'placeholder': { 'date': 'Seleziona una data', 'dateRange': 'Seleziona un intervallo date' - }, + } }, 'cs': { 'days': ['Ned', 'Pon', 'Úte', 'Stř', 'Čtv', 'Pát', 'Sob'], @@ -78,6 +78,6 @@ export default { 'placeholder': { 'date': 'Vyberte datum', 'dateRange': 'Vyberte časové rozmezí' - }, + } } } diff --git a/package.json b/package.json index 3f7d2a5..c1755e7 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vue2-datepicker", "description": "A Datepicker Component For Vue2", "main": "datepicker/index.vue", - "version": "1.6.0", + "version": "1.6.1", "scripts": { "dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot", "build": "cross-env NODE_ENV=production webpack --progress --hide-modules"