diff --git a/src/date-picker.vue b/src/date-picker.vue index 3f8c493..e3049e8 100644 --- a/src/date-picker.vue +++ b/src/date-picker.vue @@ -43,23 +43,23 @@ :append-to-body="appendToBody" @clickoutside="handleClickOutSide" > -
- +
+ +
-
-
- - +
+
+
-
+
-
-
diff --git a/src/popup.js b/src/popup.js index 66cf630..d7558ef 100644 --- a/src/popup.js +++ b/src/popup.js @@ -91,12 +91,15 @@ export default { }, render() { if (this.inline) { - return
{this.$slots.default}
; + return
{this.$slots.default}
; } return ( {this.visible && ( -
+
{this.$slots.default}
)} diff --git a/src/style/index.scss b/src/style/index.scss index be462e8..af530bd 100644 --- a/src/style/index.scss +++ b/src/style/index.scss @@ -8,8 +8,6 @@ position: relative; display: inline-block; width: 210px; - color: $default-color; - font: 14px/1.5 'Helvetica Neue', Helvetica, Arial, 'Microsoft Yahei', sans-serif; svg { width: 1em; height: 1em; @@ -29,8 +27,6 @@ .mx-datepicker-inline { width: auto; - border: 1px solid $border-color; - background-color: #fff; } .mx-input-wrapper { @@ -101,25 +97,20 @@ } } -.mx-datepicker-popup { - color: $default-color; +.mx-datepicker-main { font: 14px/1.5 'Helvetica Neue', Helvetica, Arial, 'Microsoft Yahei', sans-serif; - position: absolute; - margin-top: 1px; - margin-bottom: 1px; - border: 1px solid $border-color; + color: $default-color; background-color: #fff; - box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); - z-index: 1000; -} - -.mx-datepicker-content-wrapper { + border: 1px solid $border-color; display: flex; } -.mx-datepicker-content { - position: relative; - user-select: none; +.mx-datepicker-popup { + position: absolute; + margin-top: 1px; + margin-bottom: 1px; + box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); + z-index: 1000; } .mx-datepicker-sidebar { @@ -130,6 +121,11 @@ border-right: 1px solid $border-color; } +.mx-datepicker-body { + position: relative; + user-select: none; +} + .mx-btn-shortcut { display: block; padding: 0 6px; @@ -152,6 +148,8 @@ } .mx-calendar { + box-sizing: border-box; + width: 248px; padding: 6px 12px; & + & { border-left: 1px solid $border-color; @@ -166,17 +164,13 @@ overflow: hidden; } -.mx-btn-icon-left { +.mx-btn-icon-left, +.mx-btn-icon-double-left { float: left; } -.mx-btn-icon-right { - float: right; -} -.mx-btn-icon-double-left { - @extend .mx-btn-icon-left; -} +.mx-btn-icon-right, .mx-btn-icon-double-right { - @extend .mx-btn-icon-right; + float: right; } .mx-calendar-header-label { @@ -192,7 +186,6 @@ .mx-calendar-content { position: relative; - width: 224px; height: 224px; box-sizing: border-box; .cell { diff --git a/src/style/mixins.scss b/src/style/mixins.scss deleted file mode 100644 index 8e48a08..0000000 --- a/src/style/mixins.scss +++ /dev/null @@ -1,20 +0,0 @@ -@import './var.scss'; - -@mixin state { - cursor: pointer; - &:hover { - background-color: #eaf8fe; - } - &.active { - color: #fff; - background-color: $primary-color; - } - &.in-range { - background-color: #eaf8fe; - } - &.disabled { - cursor: not-allowed; - color: #ccc; - background-color: #f3f3f3; - } -}