kui-vue 3.2.2-rc4 → 3.2.3-rc3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (75) hide show
  1. package/components/affix/affix.jsx +23 -75
  2. package/components/affix/demo/container.md +14 -7
  3. package/components/alert/styles/index.less +13 -8
  4. package/components/badge/styles/index.less +1 -2
  5. package/components/base/pop.jsx +1 -1
  6. package/components/breadcrumb/styles/index.less +2 -2
  7. package/components/button/demo/hollow.md +1 -1
  8. package/components/button/styles/index.less +5 -5
  9. package/components/card/demo/border.md +1 -1
  10. package/components/card/styles/index.less +4 -3
  11. package/components/checkbox/checkbox.jsx +4 -2
  12. package/components/checkbox/styles/index.less +44 -43
  13. package/components/collapse/styles/index.less +3 -10
  14. package/components/colorPicker/styles/index.less +5 -3
  15. package/components/datePicker/styles/calendar.less +6 -5
  16. package/components/datePicker/styles/datepicker.less +3 -3
  17. package/components/divider/styles/index.less +7 -6
  18. package/components/drawer/styles/index.less +2 -1
  19. package/components/dropdown/demo/rightmenu.md +2 -3
  20. package/components/dropdown/styles/index.less +2 -2
  21. package/components/empty/styles/index.less +1 -1
  22. package/components/form/styles/index.less +1 -0
  23. package/components/grid/demo/align.md +3 -3
  24. package/components/grid/demo/fill.md +3 -3
  25. package/components/grid/demo/flex.md +5 -5
  26. package/components/grid/demo/index.vue +0 -1
  27. package/components/icon/demo/search.vue +2 -2
  28. package/components/image/styles/index.less +7 -5
  29. package/components/index.js +1 -1
  30. package/components/input/styles/index.less +2 -1
  31. package/components/layout/demo/base.md +3 -4
  32. package/components/layout/demo/layout1.md +4 -4
  33. package/components/layout/demo/layout2.md +5 -6
  34. package/components/layout/demo/layout3.md +3 -4
  35. package/components/layout/demo/layout4.md +4 -4
  36. package/components/layout/demo/layout5.md +8 -8
  37. package/components/layout/demo/layout6.md +2 -2
  38. package/components/layout/styles/index.less +2 -3
  39. package/components/loading/styles/index.less +1 -1
  40. package/components/menu/styles/dropmenu.less +7 -6
  41. package/components/menu/styles/index.less +13 -9
  42. package/components/message/styles/index.less +1 -1
  43. package/components/modal/styles/index.less +7 -6
  44. package/components/notice/styles/index.less +1 -1
  45. package/components/page/styles/index.less +1 -1
  46. package/components/popconfirm/styles/index.less +3 -2
  47. package/components/poptip/styles/index.less +4 -3
  48. package/components/progress/styles/index.less +3 -3
  49. package/components/radio/radio.jsx +3 -5
  50. package/components/radio/styles/index.less +55 -53
  51. package/components/rate/styles/index.less +1 -1
  52. package/components/select/styles/index.less +8 -7
  53. package/components/spin/demo/container.md +1 -2
  54. package/components/spin/demo/mode.md +1 -2
  55. package/components/spin/styles/index.less +1 -1
  56. package/components/styles/dark.less +67 -0
  57. package/components/styles/global-dark.less +36 -0
  58. package/components/styles/global.less +22 -12
  59. package/components/styles/index.less +3 -9
  60. package/components/switch/styles/index.less +4 -3
  61. package/components/table/demo/base-render.md +1 -1
  62. package/components/table/demo/base.md +5 -2
  63. package/components/table/styles/index.less +11 -7
  64. package/components/table/table.jsx +10 -7
  65. package/components/tabs/demo/sample.md +1 -1
  66. package/components/tabs/styles/index.less +7 -10
  67. package/components/tag/styles/index.less +40 -39
  68. package/components/timeline/styles/index.less +3 -2
  69. package/components/tooltip/styles/index.less +22 -3
  70. package/components/tree/styles/index.less +8 -8
  71. package/dist/k-ui-dark.css +1 -0
  72. package/dist/k-ui.css +1 -7
  73. package/dist/k-ui.js +2 -2
  74. package/package.json +9 -4
  75. package/components/styles.js +0 -43
@@ -1,22 +1,13 @@
1
1
 
2
2
  import resize from '../_tool/resize'
3
3
 
4
- function getOffset(element, target) {
5
- let { top, height, width } = element.getBoundingClientRect()
6
- if (target === document) target = target.documentElement
7
- let targetRect = (target !== window) ? target.getBoundingClientRect() : { top: 0, let: 0, bottom: 0 }
8
-
9
- let scrollTop = (target !== window) ? target.scrollTop : target.pageYOffset
10
- if (target !== window) {
11
- top = element.offsetTop - element.parentElement.offsetTop
12
- }
13
- return {
14
- top, height, width, scrollTop,
15
- targetTop: targetRect.top,
16
- targetHeight: targetRect.height,
17
- targetInnerHeight: target.innerHeight || target.clientHeight
18
- }
19
- }
4
+ // function getStyle(el, attr) {
5
+ // if (el.currentStyle) {
6
+ // return el.currentStyle[attr];
7
+ // } else {
8
+ // return getComputedStyle(el, false)[attr];
9
+ // }
10
+ // }
20
11
 
21
12
  export default {
22
13
  name: 'Affix',
@@ -31,10 +22,7 @@ export default {
31
22
  fixed: false,
32
23
  width: 0,
33
24
  height: 0,
34
- offsetModeOfTop: false,
35
- offsetModeOfBottom: false,
36
- offsetTopValue: this.offsetTop,
37
- offsetBottomValue: this.offsetBottom
25
+ offsetTopValue: 0,
38
26
  }
39
27
  },
40
28
 
@@ -42,64 +30,29 @@ export default {
42
30
  let target = this.target()
43
31
  if (target) {
44
32
  target.addEventListener('scroll', e => {
45
- // console.log(e)
46
33
  this.updatePosition(e)
47
- // console.log(e)
48
34
  })
49
35
  }
50
- // this.updatePosition(target)
51
36
  },
52
37
  methods: {
53
38
  updatePosition(e) {
54
39
  let { offsetBottom, offsetTop, $refs } = this
55
- if (!$refs.blob) return;
56
-
57
40
  let target = this.target()
41
+ if (!$refs.blob || !target) return;
58
42
 
59
- let { top, height, width, targetInnerHeight, scrollTop, targetTop } = getOffset($refs.blob, target)
60
-
61
- offsetTop = target === window ? offsetTop : scrollTop
62
- if (this.fixed) {
43
+ let rect = $refs.blob.getBoundingClientRect();
44
+ let rect2 = target != window && target != document ? target.getBoundingClientRect() : { top: 0, bottom: document.documentElement.clientHeight }
63
45
 
64
- if (typeof offsetBottom != undefined && offsetBottom >= 0) {
65
- // unfixedBottom
66
- // this.offsetModeOfBottom = false
67
- if (0 >= top + height + offsetBottom - targetInnerHeight) {
68
- this.offsetModeOfBottom = false
69
- this.fixed = false
70
- }
71
- } else if (top >= offsetTop) { // unfixedTop
72
- this.offsetModeOfTop = false
73
- this.fixed = false
74
- }
75
- if (target !== window && top !== targetTop) {
76
- this.offsetTopValue = targetTop
77
- }
78
- if (!this.fixed) {
79
- this.fixed = false
80
- this.$emit('change', false)
81
- }
82
- } else {
83
- if (typeof offsetBottom != undefined && offsetBottom >= 0) {
84
- //fixedBottom
85
- if (0 <= top + height + offsetBottom - targetInnerHeight) {
86
- this.offsetModeOfBottom = true
87
- this.fixed = true
88
- }
89
- } else {
90
- if (top <= offsetTop) { //fixedTop
91
- this.fixed = true
92
- this.offsetModeOfTop = true
93
- if (target !== window) {
94
- this.offsetTopValue = targetTop
95
- }
96
- }
97
- }
98
- if (this.fixed) {
99
- this.$emit('change', true)
100
- this.width = width
101
- this.height = height
102
- }
46
+ let hasbottom = typeof offsetBottom == 'number' && offsetBottom >= 0
47
+ let fx = hasbottom ? rect2.bottom - rect.bottom >= offsetBottom : rect.top - rect2.top <= offsetTop
48
+ if (!fx) {
49
+ this.offsetTopValue = rect.top
50
+ }
51
+ if (this.fixed != fx) {
52
+ this.fixed = fx
53
+ this.$emit('change', this.fixed)
54
+ this.width = rect.width
55
+ this.height = rect.height
103
56
  }
104
57
  }
105
58
  },
@@ -112,13 +65,8 @@ export default {
112
65
  }
113
66
  fixedStyle = {
114
67
  width: `${this.width}px`,
115
- height: `${this.height}px`
116
- }
117
- if (this.offsetModeOfBottom) {
118
- fixedStyle.bottom = `${this.offsetBottom}px`
119
- }
120
- if (this.offsetModeOfTop) {
121
- fixedStyle.top = `${this.offsetTopValue}px`
68
+ height: `${this.height}px`,
69
+ top: `${this.offsetTopValue}px`
122
70
  }
123
71
  classes = { ['k-affix']: this.fixed }
124
72
  }
@@ -7,25 +7,32 @@
7
7
  <template>
8
8
  <div class="demo-affix-scroll" ref="container">
9
9
  <div class="demo-affix-inner" >
10
- <Affix :target="() => this.$refs.container">
10
+ <div style="padding:50px 0;" />
11
+ <Affix :target="() => this.$refs.container" :offsetTop="50">
11
12
  <Button type="primary" id="tesss">Affix at the top of container</Button>
12
13
  </Affix>
14
+ <div style="padding:200px 0;" />
15
+ <Affix :target="() => this.$refs.container" :offsetBottom="50">
16
+ <Button type="primary" id="tesss">Affix at the bottom of container</Button>
17
+ </Affix>
13
18
  </div>
14
19
  </div>
15
20
  </template>
16
21
 
17
22
  <style scoped>
18
23
  .demo-affix-scroll{
19
- height:100px;
24
+ height:400px;
20
25
  overflow-y:scroll;
26
+ background-image: linear-gradient(-45deg, #cdcdcd 25%, transparent 0), linear-gradient(45deg, #cdcdcd 25%, transparent 0), linear-gradient(-45deg, transparent 75%, #cdcdcd 0), linear-gradient(45deg, transparent 75%, #cdcdcd 0);
27
+ background-size: 20px 20px;
28
+ background-position: 0 0, 0 -10px, -10px 10px, 10px 0;
21
29
  }
22
30
  .demo-affix-inner{
23
- height:300px;
31
+ height:800px;
24
32
  /* background:#efefef; */
25
- padding-top:30px;
26
- background-image: linear-gradient(-45deg, #cdcdcd 25%, transparent 0), linear-gradient(45deg, #cdcdcd 25%, transparent 0), linear-gradient(-45deg, transparent 75%, #cdcdcd 0), linear-gradient(45deg, transparent 75%, #cdcdcd 0);
27
- background-size: 20px 20px;
28
- background-position: 0 0, 0 -10px, -10px 10px, 10px 0;
33
+ /* padding-top:30px; */
34
+
35
+
29
36
  }
30
37
  </style>
31
38
  ```
@@ -9,8 +9,8 @@
9
9
  font-size: 12px;
10
10
  transition: all .3s;
11
11
  overflow: hidden;
12
- background: tint(@warning, 90%);
13
- border: 1px solid tint(@warning, 70%);
12
+ background: fadeout(@warning, 90%);
13
+ border: 1px solid fadeout(@warning, 70%);
14
14
  &-icon {
15
15
  color: @warning;
16
16
  position: absolute;
@@ -18,6 +18,9 @@
18
18
  left: 10px;
19
19
  font-size: 20px;
20
20
  }
21
+ &-message {
22
+ color: @color;
23
+ }
21
24
  &-has-icon {
22
25
  padding-left: 38px;
23
26
  }
@@ -37,9 +40,11 @@
37
40
  font-size: 14px;
38
41
  font-weight: 500;
39
42
  margin-bottom: 5px;
43
+ color: @color;
40
44
  }
41
45
  .k-alert-description {
42
46
  font-size: 14px;
47
+ color: @color;
43
48
  }
44
49
  &.k-alert-has-icon {
45
50
  padding-left: 50px;
@@ -63,22 +68,22 @@
63
68
  }
64
69
  }
65
70
  &-success {
66
- background: tint(@success, 90%);
67
- border-color: tint(@success, 70%);
71
+ background: fadeout(@success, 90%);
72
+ border-color: fadeout(@success, 70%);
68
73
  .k-alert-icon {
69
74
  color: @success;
70
75
  }
71
76
  }
72
77
  &-error {
73
- background: tint(@danger, 90%);
74
- border-color: tint(@danger, 70%);
78
+ background: fadeout(@danger, 90%);
79
+ border-color: fadeout(@danger, 70%);
75
80
  .k-alert-icon {
76
81
  color: @danger;
77
82
  }
78
83
  }
79
84
  &-info {
80
- background: tint(@main, 90%);
81
- border-color: tint(@main, 70%);
85
+ background: fadeout(@main, 90%);
86
+ border-color: fadeout(@main, 70%);
82
87
  .k-alert-icon {
83
88
  color: @main;
84
89
  }
@@ -21,7 +21,7 @@
21
21
  font-size: 12px;
22
22
  white-space: nowrap;
23
23
  z-index: 10;
24
- box-shadow: 0 0 0 1px #fff;
24
+ box-shadow: 0 0 0 1px @back-color;
25
25
  box-sizing: border-box;
26
26
  }
27
27
  &-mark {
@@ -30,7 +30,6 @@
30
30
  min-width: 20px;
31
31
  background: #ed3f14;
32
32
  color: #fff;
33
- color: #fff;
34
33
  height: 20px;
35
34
  line-height: 20px;
36
35
  text-align: center;
@@ -126,7 +126,7 @@ export default {
126
126
  props: {
127
127
  transfer,
128
128
  value: this.opened,
129
- className: [`k-${preCls}-content`, { [`k-${preCls}-${color}`]: color && !/^#/.test(color) }],
129
+ className: [`k-${preCls}-content`, { [`k-${preCls}-${color}`]: color && !/^#/.test(color), [`k-${preCls}-has-color`]: /^#/.test(color) }],
130
130
  width: this.width,
131
131
  selection: this.selection,
132
132
  placement,
@@ -5,7 +5,7 @@
5
5
  margin: 0;
6
6
  padding: 0;
7
7
  list-style: none;
8
- color: rgba(0, 0, 0, .45);
8
+ color: @disable-color;
9
9
  font-size: 14px;
10
10
  &-item {
11
11
  .k-icon {
@@ -20,7 +20,7 @@
20
20
  }
21
21
  >span {
22
22
  &:last-child {
23
- color: rgba(0, 0, 0, .65);
23
+ color: @title-color;
24
24
  .k-breadcrumb-separator {
25
25
  display: none;
26
26
  }
@@ -5,7 +5,7 @@
5
5
 
6
6
  ```vue
7
7
  <template>
8
- <div style="background:#b9c4d0;padding:10px;">
8
+ <div style="padding:10px;" class="demo-back">
9
9
  <Button type="primary" hollow>Primary</Button>
10
10
  <Button type="danger" hollow>Danger</Button>
11
11
  <Button hollow>Default</Button>
@@ -12,7 +12,7 @@
12
12
  user-select: none;
13
13
  outline: none;
14
14
  border: 1px solid @border-color;
15
- background-color: #fff;
15
+ background-color: transparent;
16
16
  transition: all .3s cubic-bezier(.645, .045, .355, 1);
17
17
  z-index: 0;
18
18
  white-space: nowrap;
@@ -106,8 +106,8 @@
106
106
 
107
107
  .k-btn.k-btn-hollow {
108
108
  background: 0 0;
109
- color: #fff;
110
- border-color: #fff;
109
+ color: @color;
110
+ border-color: @border-color;
111
111
  &:focus, &:hover {
112
112
  border-color: @main;
113
113
  color: @main;
@@ -212,8 +212,8 @@
212
212
  opacity: .9;
213
213
  cursor: not-allowed;
214
214
  color: darken(@disable-color, 8%);
215
- background: darken( @disable-back, 8%);
216
- border-color: darken(@disable-border, 8%);
215
+ // background: darken( @disable-back, 8%);
216
+ // border-color: darken(@disable-border, 8%);
217
217
  }
218
218
  }
219
219
 
@@ -19,8 +19,8 @@
19
19
  </template>
20
20
  <style scoped>
21
21
  .demo-card{
22
- background:#efefef;
23
22
  padding:20px;
23
+ background-color:rgba(0,0,0,.1);
24
24
  }
25
25
  </style>
26
26
  ```
@@ -1,11 +1,12 @@
1
1
  @import '../../styles/global.less';
2
2
  .k-card {
3
- background: #fff;
3
+ background: @back-color;
4
4
  position: relative;
5
5
  border-radius: @radius;
6
+ color: @color;
6
7
  .k-card-head {
7
8
  position: relative;
8
- border-bottom: 1px solid #e9eaec;
9
+ border-bottom: 1px solid @border-color;
9
10
  padding: 14px 16px;
10
11
  line-height: 1;
11
12
  .k-icon {
@@ -40,5 +41,5 @@
40
41
  }
41
42
 
42
43
  .k-card-bordered {
43
- border: 1px solid #eee;
44
+ border: 1px solid @border-color;
44
45
  }
@@ -51,12 +51,14 @@ export default {
51
51
  }
52
52
  }
53
53
  // console.log(checked)
54
- const wpclasses = ["k-checkbox-wrapper", { ["k-checkbox-disabled"]: disabled }];
54
+ const wpclasses = ["k-checkbox-wrapper", {
55
+ ["k-checkbox-disabled"]: disabled,
56
+ ["k-checkbox-checked"]: checked && !indeterminate,
57
+ }]
55
58
 
56
59
  const classes = [
57
60
  "k-checkbox",
58
61
  {
59
- ["k-checkbox-checked"]: checked && !indeterminate,
60
62
  ["k-checkbox-indeterminate"]: indeterminate
61
63
  }
62
64
  ];
@@ -5,6 +5,7 @@
5
5
  display: inline-block;
6
6
  user-select: none;
7
7
  line-height: 1;
8
+ color: @color;
8
9
  .k-checkbox {
9
10
  display: inline-block;
10
11
  vertical-align: middle;
@@ -16,52 +17,45 @@
16
17
  margin: 0;
17
18
  box-sizing: content-box;
18
19
  font-size: 0;
19
- .k-checkbox-inner {
20
- box-sizing: content-box;
21
- display: inline-block;
22
- width: 14px;
23
- height: 14px;
24
- position: relative;
25
- top: 0;
26
- left: 0;
27
- border: 1px solid @border-color;
28
- border-radius: 2px;
29
- background-color: #fff;
30
- transition: border-color .2s ease-in-out, background-color .2s ease-in-out;
31
- overflow: hidden;
32
- color: #fff;
33
- .k-icon {
34
- font-size: 18px;
35
- position: absolute;
36
- left: 50%;
37
- top: 50%;
38
- transform: translate3d(-50%, -50%, 0);
39
- }
40
- }
41
- .k-checkbox-input {
42
- width: 100%;
43
- height: 100%;
20
+ }
21
+ .k-checkbox-inner {
22
+ box-sizing: content-box;
23
+ display: inline-block;
24
+ width: 14px;
25
+ height: 14px;
26
+ position: relative;
27
+ top: 0;
28
+ left: 0;
29
+ border: 1px solid @border-color;
30
+ border-radius: 2px;
31
+ background-color: @back-color;
32
+ transition: border-color .2s ease-in-out, background-color .2s ease-in-out;
33
+ overflow: hidden;
34
+ color: @back-color;
35
+ .k-icon {
36
+ font-size: 18px;
44
37
  position: absolute;
45
- top: 0;
46
- bottom: 0;
47
- left: 0;
48
- right: 0;
49
- z-index: 1;
50
- cursor: pointer;
51
- opacity: 0;
52
- &:focus {
53
- +.k-checkbox-inner {
54
- border: 1px solid @main;
55
- box-shadow: 0 0 5px fade(@main, 75%);
56
- }
57
- }
38
+ left: 50%;
39
+ top: 50%;
40
+ transform: translate3d(-50%, -50%, 0);
58
41
  }
59
42
  }
60
- .k-checkbox-checked {
61
- .k-checkbox-inner {
62
- background: @main;
63
- border-color: @main;
64
- position: relative;
43
+ .k-checkbox-input {
44
+ width: 100%;
45
+ height: 100%;
46
+ position: absolute;
47
+ top: 0;
48
+ bottom: 0;
49
+ left: 0;
50
+ right: 0;
51
+ z-index: 1;
52
+ cursor: pointer;
53
+ opacity: 0;
54
+ &:focus {
55
+ +.k-checkbox-inner {
56
+ border: 1px solid @main;
57
+ box-shadow: 0 0 5px fade(@main, 75%);
58
+ }
65
59
  }
66
60
  }
67
61
  .k-checkbox-indeterminate {
@@ -93,6 +87,13 @@
93
87
  }
94
88
  }
95
89
 
90
+ .k-checkbox-checked {
91
+ .k-checkbox-inner {
92
+ background: @main;
93
+ border-color: @main;
94
+ }
95
+ }
96
+
96
97
  .k-checkbox-disabled {
97
98
  cursor: not-allowed;
98
99
  color: @disable-color;
@@ -5,6 +5,7 @@
5
5
  border-radius: @radius;
6
6
  border-bottom: 0;
7
7
  overflow: hidden;
8
+ color: @color;
8
9
  &>.k-collapse-item {
9
10
  border-bottom: 1px solid @border-color;
10
11
  &>.k-collapse-header {
@@ -29,7 +30,7 @@
29
30
  }
30
31
  }
31
32
  .k-collapse-content {
32
- background-color: #fff;
33
+ // background-color: #fff;
33
34
  border-top: 1px solid @border-color;
34
35
  padding: 0 16px;
35
36
  transition: all .3s ease-in-out;
@@ -51,7 +52,7 @@
51
52
  border: none;
52
53
  background: none;
53
54
  .k-collapse-item {
54
- background: @light;
55
+ background: fadeout(@border-color, 60%);
55
56
  border: none;
56
57
  margin-bottom: 10px;
57
58
  border-radius: @radius;
@@ -63,14 +64,6 @@
63
64
  }
64
65
  }
65
66
 
66
- .k-alert-info {
67
- background: tint(@main, 90%);
68
- border-color: tint(@main, 70%);
69
- .k-alert-icon {
70
- color: @main;
71
- }
72
- }
73
-
74
67
  .k-collaplse-slide-enter-active {
75
68
  animation: slideIn 0.3s ease-in-out;
76
69
  animation-fill-mode: both;
@@ -70,13 +70,14 @@
70
70
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
71
71
  position: absolute;
72
72
  border-radius: @radius;
73
- background: #fff;
73
+ background: @back-color;
74
74
  .k-color-picker-paint-dot {
75
75
  width: 15px;
76
76
  height: 15px;
77
77
  display: block;
78
78
  position: absolute;
79
- background: #fff;
79
+ background: @back-color;
80
+ border:1px solid @border-color;
80
81
  box-shadow: 0 0 5px rgba(0, 0, 0, 0.2);
81
82
  border-radius: 50%;
82
83
  top: 10px;
@@ -126,7 +127,8 @@
126
127
  height: 15px;
127
128
  display: block;
128
129
  position: absolute;
129
- background: #fff;
130
+ background: @back-color;
131
+ border:1px solid @border-color;
130
132
  box-shadow: 0 0 5px rgba(0, 0, 0, 0.2);
131
133
  border-radius: 50%;
132
134
  pointer-events: none;
@@ -3,6 +3,7 @@
3
3
  display: inline-block;
4
4
  user-select: none;
5
5
  float: left;
6
+ color: @color;
6
7
  // box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
7
8
  &+.k-calendar {
8
9
  // border-left: solid 1px #eaeaea;
@@ -83,7 +84,7 @@
83
84
  width: 100%;
84
85
  height: 100%;
85
86
  position: absolute;
86
- background: #fff;
87
+ background: @back-color;
87
88
  left: 0;
88
89
  top: 0;
89
90
  font-size: 0;
@@ -183,8 +184,8 @@
183
184
  height: 100%;
184
185
  left: 0;
185
186
  top: 0;
186
- background: #fff;
187
- border-top: 1px solid @border-color;
187
+ background: @back-color;
188
+ border-top: 1px solid darken(@border-color,10%);
188
189
  .k-calendar-time-picker-select {
189
190
  width: 33.333%;
190
191
  font-size: 0;
@@ -214,7 +215,7 @@
214
215
  list-style: none;
215
216
  cursor: pointer;
216
217
  &:hover {
217
- background: @light ;
218
+ background: fadeout(@main, 90%);
218
219
  }
219
220
  &:last-child::after {
220
221
  display: block;
@@ -234,7 +235,7 @@
234
235
  .k-calendar-time-selected {
235
236
  color: @main;
236
237
  font-weight: bold;
237
- background: @light;
238
+ background: darken(@back-color,5%);
238
239
  }
239
240
  }
240
241
  }
@@ -5,8 +5,8 @@
5
5
  max-width: 100%;
6
6
  box-sizing: border-box;
7
7
  vertical-align: middle;
8
- color: #495060;
9
- background: #fff;
8
+ color: @color;
9
+ background: transparent;
10
10
  font-size: 12px;
11
11
  position: relative;
12
12
  border: 1px solid @border-color;
@@ -94,7 +94,7 @@
94
94
  .k-datepicker-dropdown {
95
95
  position: absolute;
96
96
  z-index: 1003;
97
- background: #fff;
97
+ background: @back-color;
98
98
  }
99
99
 
100
100
  .k-datepicker-sm {
@@ -1,4 +1,4 @@
1
- @border: #e8e8e8;
1
+ @import '../../styles/global.less';
2
2
  .k-divider {
3
3
  box-sizing: border-box;
4
4
  margin: 0;
@@ -7,10 +7,10 @@
7
7
  font-size: 14px;
8
8
  line-height: 1.5;
9
9
  list-style: none;
10
- background: @border;
10
+ background: @border-color;
11
11
  &-dashed {
12
12
  background: none;
13
- border: dashed @border;
13
+ border: dashed @border-color;
14
14
  border-width: 1px 0 0
15
15
  }
16
16
  &, &-vertical {
@@ -24,11 +24,12 @@
24
24
  }
25
25
  .k-divider-inner-text {
26
26
  display: inline-block;
27
- padding: 0 10px
27
+ padding: 0 10px;
28
+ color: @color;
28
29
  }
29
30
  &-dashed {
30
31
  background: none;
31
- border: dashed @border;
32
+ border: dashed @border-color;
32
33
  border-width: 1px 0 0;
33
34
  }
34
35
  &-vertical {
@@ -57,7 +58,7 @@
57
58
  top: 50%;
58
59
  display: table-cell;
59
60
  width: 50%;
60
- border-top: 1px solid @border;
61
+ border-top: 1px solid @border-color;
61
62
  transform: translateY(50%);
62
63
  content: ""
63
64
  }
@@ -23,7 +23,7 @@
23
23
  }
24
24
  .k-drawer-content {
25
25
  position: relative;
26
- background-color: #fff;
26
+ background-color: @back-color;
27
27
  border: 0;
28
28
  background-clip: padding-box;
29
29
  height: 100%;
@@ -66,6 +66,7 @@
66
66
  height: calc(100% - 43px);
67
67
  overflow: auto;
68
68
  box-sizing: border-box;
69
+ color:@color;
69
70
  }
70
71
  .k-drawer-footer {
71
72
  border-top: 1px solid @border-color;