@kdcloudjs/kdesign 1.1.1 → 1.1.2

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.
package/CHANGELOG.md CHANGED
@@ -1,3 +1,26 @@
1
+ ## [1.1.1](https://github.com/kdcloudone/kdesign/compare/v1.1.0...v1.1.1) (2022-04-01)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * [base-data] 更正开放token属性及选中项颜色值 ([5cb9c65](https://github.com/kdcloudone/kdesign/commit/5cb9c65b373231b50b83e71f197c3d41fa7c8ce5))
7
+ * [form]检验require未正确添加 ([607b251](https://github.com/kdcloudone/kdesign/commit/607b2511aa2c88f6cedd85af3793a9e09191ffe1))
8
+ * [form]fix token ([8ccf9aa](https://github.com/kdcloudone/kdesign/commit/8ccf9aa99210315f7236967797b310d99d63140d))
9
+ * [icon] 优化图标名称 ([b2b7838](https://github.com/kdcloudone/kdesign/commit/b2b7838461d4a9b8d5ea20aa98babb31774939b3))
10
+ * [menu] 1:删除子菜单title;2:收起class根据collapsed属性添加;3:添加默认宽度,删除demo中的宽度;4:token相关修改 ([#29](https://github.com/kdcloudone/kdesign/issues/29)) ([bb1b8fa](https://github.com/kdcloudone/kdesign/commit/bb1b8faa5bffc6b20f250c452c2af037e2f4e6a7))
11
+ * [message] 更新消息提示视觉稿 ([f416344](https://github.com/kdcloudone/kdesign/commit/f416344ef8de7b36ef3068f67816f1f907d2a26f))
12
+ * [select] 修复选中时字体颜色值 ([c94dcfc](https://github.com/kdcloudone/kdesign/commit/c94dcfcfdc89b0157b8f8dc0b08c7241f3ff55f7))
13
+ * [token] 格式修改 ([e34b377](https://github.com/kdcloudone/kdesign/commit/e34b377c0889b06f84e3ed4ebf3a92740b366dd5))
14
+ * [tree] 更新选中时图标与字体颜色 ([e62f32e](https://github.com/kdcloudone/kdesign/commit/e62f32ef324c783641794e53dbb65c374228a089))
15
+
16
+
17
+ ### Features
18
+
19
+ * [carousel] 更新样式 ([872a1fb](https://github.com/kdcloudone/kdesign/commit/872a1fb3b7cf51b2bd88b97596d69952a352090c))
20
+ * [icon] 新增图标:xingzhuangjiehe ([be6c304](https://github.com/kdcloudone/kdesign/commit/be6c304c60ae86f25f0b4ca245da422fe537c68b))
21
+
22
+
23
+
1
24
  # [1.1.0](https://github.com/kdcloudone/kdesign/compare/v1.0.4...v1.1.0) (2022-03-24)
2
25
 
3
26
 
@@ -2571,7 +2571,7 @@
2571
2571
  bottom: -1px;
2572
2572
  height: 2px;
2573
2573
  margin-left: 11px;
2574
- background: #1890ff;
2574
+ background: @date-bar-color-bg-active;
2575
2575
  opacity: 0;
2576
2576
  transition: all 0.3s ease-out;
2577
2577
  pointer-events: none;
@@ -2699,7 +2699,7 @@
2699
2699
 
2700
2700
  &:not(.@{datePicker-prefix-cls}-year-item-disabled) {
2701
2701
  .@{datePicker-prefix-cls}-year-text-selected {
2702
- background: #104ccc;
2702
+ background: @date-square-item-color-selected;
2703
2703
  }
2704
2704
  }
2705
2705
  }
@@ -2755,7 +2755,7 @@
2755
2755
 
2756
2756
  &:not(.@{datePicker-prefix-cls}-month-item-disabled) {
2757
2757
  .@{datePicker-prefix-cls}-month-text-selected {
2758
- background: #104ccc;
2758
+ background: @date-square-item-color-selected;
2759
2759
  }
2760
2760
  }
2761
2761
  }
@@ -2815,7 +2815,7 @@
2815
2815
 
2816
2816
  &:not(.@{datePicker-prefix-cls}-quarter-item-disabled) {
2817
2817
  .@{datePicker-prefix-cls}-quarter-text-selected {
2818
- background: #104ccc;
2818
+ background: @date-square-item-color-selected;
2819
2819
  }
2820
2820
  }
2821
2821
  }
@@ -2882,7 +2882,7 @@
2882
2882
  }
2883
2883
 
2884
2884
  .@{datePicker-prefix-cls}-calendar-text-selected {
2885
- background: #104ccc !important;
2885
+ background: @date-square-item-color-selected !important;
2886
2886
  }
2887
2887
  }
2888
2888
 
@@ -2945,7 +2945,7 @@
2945
2945
  &:hover {
2946
2946
  & .@{datePicker-prefix-cls}-calendar-item:not(.@{datePicker-prefix-cls}-calendar-item-disabled) {
2947
2947
  .@{datePicker-prefix-cls}-calendar-week-text::before {
2948
- background: #104ccc;
2948
+ background: @date-square-item-color-selected;
2949
2949
  }
2950
2950
  }
2951
2951
  }
@@ -3061,7 +3061,7 @@
3061
3061
  height: 24px;
3062
3062
  width: 100%;
3063
3063
  margin: 0 -4px;
3064
- background: #e6f7ff;
3064
+ background: @date-range-item-color-bg;
3065
3065
  }
3066
3066
  }
3067
3067
 
@@ -3155,7 +3155,7 @@
3155
3155
 
3156
3156
  .@{datePicker-prefix-cls}-time-cell-selected {
3157
3157
  .@{datePicker-prefix-cls}-time-cell-inner {
3158
- background: #e6f7ff;
3158
+ background: @date-range-item-color-bg;
3159
3159
  }
3160
3160
  }
3161
3161
 
@@ -3367,7 +3367,6 @@
3367
3367
 
3368
3368
  @date-picker-custom-prefix: ~'--@{kd-prefix}-c-date-picker';
3369
3369
 
3370
- // shadow
3371
3370
  // color
3372
3371
  @date-color-background-checked: var(~'@{date-picker-custom-prefix}-color-background-checked', @color-theme);
3373
3372
  @date-wrapper-color-background: var(~'@{date-picker-custom-prefix}-wrapper-color-background', @color-background);
@@ -3379,7 +3378,6 @@
3379
3378
  @date-input-color-background: var(~'@{date-picker-custom-prefix}-input-color-background', @color-white);
3380
3379
  @date-input-color-background-disabled: var(~'@{date-picker-custom-prefix}-input-color-background-disabled', @color-background-contain-disabled);
3381
3380
  @date-input-color-focus: var(~'@{date-picker-custom-prefix}-input-color-focused', @color-text-primary);
3382
-
3383
3381
  @date-icon-color: var(~'@{date-picker-custom-prefix}-icon-color', @color-disabled);
3384
3382
  @date-clear-background-color: var(~'@{date-picker-custom-prefix}-clear-color-background', @color-background);
3385
3383
  @date-clear-background-color-hover: var(~'@{date-picker-custom-prefix}-clear-color-background-hover', @color-theme-5);
@@ -3387,8 +3385,10 @@
3387
3385
  @date-container-color: var(~'@{date-picker-custom-prefix}-container-color', @color-text-primary);
3388
3386
  @date-container-color-border: var(~'@{date-picker-custom-prefix}-container-color-border', @color-border-weak);
3389
3387
  @date-container-color-background: var(~'@{date-picker-custom-prefix}-container-color-background', @color-background-2);
3390
-
3391
3388
  @date-footer-color-background: var(~'@{date-picker-custom-prefix}-footer-color-background', @color-background);
3389
+ @date-bar-color-bg-active: var(~'@{date-picker-custom-prefix}-bar-color-bg-active', @color-theme);
3390
+ @date-square-item-color-selected: var(~'@{date-picker-custom-prefix}-square-item-color-selected', @color-theme-hover);
3391
+ @date-range-item-color-bg: var(~'@{date-picker-custom-prefix}-range-item-color-bg', @color-theme-1);
3392
3392
 
3393
3393
  // sizing
3394
3394
  @date-width: var(~'@{date-picker-custom-prefix}-sizing-width', 230px);
@@ -3406,8 +3406,6 @@
3406
3406
  @date-large-padding-horizontal: var(~'@{date-picker-custom-prefix}-large-spacing-padding-horizontal', 9px); // 大号 内间距 横向
3407
3407
  @date-suffix-spacing-margin-left: var(~'@{date-picker-custom-prefix}-suffix-spacing-margin-left', 10px);
3408
3408
 
3409
-
3410
- // motion
3411
3409
  // font
3412
3410
  @date-container-font-size: var(~'@{date-picker-custom-prefix}-container-font-size', @font-size-small);
3413
3411
  @date-panel-font-size: var(~'@{date-picker-custom-prefix}-panel-font-size', @font-size-middle);
@@ -3419,22 +3417,6 @@
3419
3417
  @date-input-border-radius: var(~'@{date-picker-custom-prefix}-input-radius-border', @radius-border);
3420
3418
  @date-panel-border-radius: var(~'@{date-picker-custom-prefix}-panel-radius-border', @radius-border);
3421
3419
 
3422
- // line-height
3423
- // z-index
3424
-
3425
-
3426
-
3427
-
3428
-
3429
-
3430
-
3431
-
3432
-
3433
-
3434
-
3435
-
3436
-
3437
-
3438
3420
 
3439
3421
 
3440
3422
 
@@ -5530,13 +5512,31 @@ textarea {
5530
5512
  .@{submenu-prefix-cls} {
5531
5513
  padding-right: 0;
5532
5514
  }
5515
+
5516
+ .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled):hover {
5517
+ color: @menu-inline-color-active;
5518
+ }
5533
5519
  }
5534
5520
 
5535
5521
  &-vertical {
5522
+ .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled):hover,
5523
+ .@{submenu-prefix-cls}-hover {
5524
+ .hover();
5525
+ }
5526
+
5536
5527
  .@{submenu-prefix-cls} {
5537
5528
  padding-right: 0;
5538
5529
 
5539
5530
  &-sub {
5531
+ background: @menu-sub-color-background;
5532
+
5533
+ .@{menuitem-prefix-cls} {
5534
+ &:hover,
5535
+ &-active {
5536
+ color: @menu-sub-color-active;
5537
+ }
5538
+ }
5539
+
5540
5540
  &-second,
5541
5541
  &-third {
5542
5542
  animation: kdZoomTopLeftIn calc(@menu-motion-duration - 0.1s) cubic-bezier(0, .4, .4, 1) forwards;
@@ -5561,7 +5561,6 @@ textarea {
5561
5561
 
5562
5562
  &-collapsed {
5563
5563
  width: 50px;
5564
- min-width: auto;
5565
5564
  }
5566
5565
 
5567
5566
  &-light {
@@ -5572,6 +5571,20 @@ textarea {
5572
5571
  .light-default;
5573
5572
  }
5574
5573
 
5574
+ .@{submenu-prefix-cls}-title:hover {
5575
+ color: @menu-light-color-hover;
5576
+ }
5577
+
5578
+ .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled):hover {
5579
+ .light-default;
5580
+ }
5581
+
5582
+ .@{menuitem-prefix-cls} {
5583
+ &-active {
5584
+ .light-hover();
5585
+ }
5586
+ }
5587
+
5575
5588
  .@{menuitem-prefix-cls}:not(.@{menuitem-prefix-cls}-disabled):hover {
5576
5589
  .light-hover();
5577
5590
  }
@@ -5579,7 +5592,22 @@ textarea {
5579
5592
 
5580
5593
  &-light&-vertical {
5581
5594
  .@{submenu-prefix-cls}-sub {
5582
- box-shadow: 0 4px 10px 0 #f5f5f5;
5595
+ box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08),
5596
+ 0 9px 28px 8px rgba(0, 0, 0, 0.05);
5597
+ }
5598
+
5599
+ .@{menuitem-prefix-cls} {
5600
+ &:not(.@{menuitem-prefix-cls}-disabled):not(.@{menuitem-prefix-cls}-active):hover {
5601
+ color: @menu-light-color-hover;
5602
+ background: #fff;
5603
+ border: none;
5604
+ }
5605
+
5606
+ &-active {
5607
+ color: @menu-light-color-active;
5608
+ background-color: @menu-light-color-background;
5609
+ border: none !important;
5610
+ }
5583
5611
  }
5584
5612
  }
5585
5613
  }
@@ -5590,6 +5618,10 @@ textarea {
5590
5618
  transition: color, background-color;
5591
5619
  transition-duration: calc(@menu-motion-duration - 0.1s);
5592
5620
  transition-timing-function: cubic-bezier(0.4, 0, 0.6, 1);
5621
+
5622
+ &:not(&-disabled):hover {
5623
+ .hover();
5624
+ }
5593
5625
  }
5594
5626
 
5595
5627
  .@{submenu-prefix-cls} {
@@ -5599,12 +5631,13 @@ textarea {
5599
5631
  transition-duration: calc(@menu-motion-duration - 0.1s);
5600
5632
  transition-timing-function: cubic-bezier(0.4, 0, 0.6, 1);
5601
5633
 
5634
+ &-hover {
5635
+ color: @menu-sub-color-hover;
5636
+ }
5637
+
5602
5638
  &-sub {
5603
5639
  line-height: @menu-item-height;
5604
5640
  color: @menu-sub-color;
5605
- min-width: 130px;
5606
-
5607
-
5608
5641
  }
5609
5642
 
5610
5643
  &-thrid {
@@ -5612,6 +5645,7 @@ textarea {
5612
5645
  max-width: 810px;
5613
5646
  max-height: 492px;
5614
5647
  padding-left: 24px;
5648
+ background: @menu-sub-color-background;
5615
5649
  flex-wrap: wrap;
5616
5650
  overflow-y: auto;
5617
5651
  cursor: default;
@@ -5659,6 +5693,10 @@ textarea {
5659
5693
  cursor: pointer;
5660
5694
  .ellipsis();
5661
5695
 
5696
+ &:hover {
5697
+ color: @menu-sub-color-active;
5698
+ }
5699
+
5662
5700
  & > span {
5663
5701
  .ellipsis();
5664
5702
  }
@@ -5675,157 +5713,12 @@ textarea {
5675
5713
  }
5676
5714
  }
5677
5715
 
5678
- .@{kd-prefix}-menu-dark {
5679
- .@{menu-prefix-cls}-item:not(.@{menu-prefix-cls}-item-disabled) ,
5680
- .@{menu-prefix-cls}-submenu:not(.@{menu-prefix-cls}-submenu-hover) {
5681
- :hover {
5682
- .hover-sub()
5683
- }
5684
- }
5685
-
5686
- &.@{menu-prefix-cls}-inline {
5687
- > ul > li.@{menu-prefix-cls}-submenu {
5688
-
5689
- .@{menu-prefix-cls}-submenu-sub {
5690
- .base-sub();
5691
-
5692
- :hover {
5693
- .hover-third()
5694
- }
5695
- }
5696
- }
5697
- }
5698
-
5699
- .@{menu-prefix-cls}-item.@{menu-prefix-cls}-item-active {
5700
- .hover-sub()
5701
- }
5702
-
5703
- .@{menu-prefix-cls}-submenu {
5704
- &-sub {
5705
- .base-sub();
5706
- }
5707
-
5708
- .@{menu-prefix-cls}-item.@{menu-prefix-cls}-item-active {
5709
- .hover-third()
5710
- }
5711
- }
5712
-
5713
- > .@{menu-prefix-cls}-submenu {
5714
- :hover {
5715
- .hover-sub();
5716
- }
5717
- }
5718
-
5719
- > .@{menu-prefix-cls}-item:not(.@{menu-prefix-cls}-item-disabled), .@{menu-prefix-cls}-submenu-collapsed {
5720
- :hover {
5721
- .hover-sub()
5722
- }
5723
- }
5724
-
5725
- .@{menu-prefix-cls}-submenu-sub-second {
5726
- > li:hover {
5727
- .hover-third()
5728
- }
5729
- }
5730
-
5731
- .@{menu-prefix-cls}-submenu-sub-third {
5732
- .@{menu-prefix-cls}-item:hover {
5733
- .hover-third()
5734
- }
5735
- }
5736
- }
5737
-
5738
- .@{kd-prefix}-menu-light {
5739
-
5740
- &.@{menu-prefix-cls}-inline {
5741
- > ul > li.@{menu-prefix-cls}-submenu {
5742
-
5743
- .@{menu-prefix-cls}-submenu-sub {
5744
- .base-sub-light();
5745
-
5746
- :hover {
5747
- .hover-third-light()
5748
- }
5749
- }
5750
- }
5751
- }
5752
-
5753
- .@{menu-prefix-cls}-item.@{menu-prefix-cls}-item-active {
5754
- .hover-sub-light()
5755
- }
5756
-
5757
- .@{menu-prefix-cls}-submenu {
5758
- &-sub {
5759
- .base-sub-light();
5760
- }
5761
-
5762
- .@{menu-prefix-cls}-item.@{menu-prefix-cls}-item-active {
5763
- .hover-third-light()
5764
- }
5765
- }
5766
-
5767
- > .@{menu-prefix-cls}-submenu {
5768
- :hover {
5769
- .hover-sub-light();
5770
- }
5771
- }
5772
-
5773
- > .@{menu-prefix-cls}-item:not(.@{menu-prefix-cls}-item-disabled), .@{menu-prefix-cls}-submenu-collapsed {
5774
- :hover {
5775
- .hover-sub-light()
5776
- }
5777
- }
5778
-
5779
- .@{menu-prefix-cls}-submenu-sub-second {
5780
- > li:hover {
5781
- .hover-third-light()
5782
- }
5783
- }
5784
-
5785
- .@{menu-prefix-cls}-submenu-sub-third {
5786
- .@{menu-prefix-cls}-item:hover {
5787
- .hover-third-light()
5788
- }
5789
- }
5790
- }
5791
-
5792
- .hover-sub {
5793
- background: @menu-sub-base-color-background-hover;
5794
- color: @menu-sub-color-hover;
5795
- }
5796
-
5797
- .base-sub {
5798
- background: @menu-sub-base-color-background-hover;
5799
- color: @menu-sub-base-color-hover;
5800
- }
5801
-
5802
- .hover-third {
5803
- background: @menu-sub-color-background-hover !important;
5804
- color: @menu-sub-color-hover;
5805
- }
5806
-
5807
- .hover-sub-light {
5808
- background: @menu-light-color-background;
5809
- color: @menu-light-color;
5810
- }
5811
-
5812
- .base-sub-light {
5813
- background: @menu-light-color-background;
5814
- color: @menu-light-color;
5815
- }
5816
-
5817
- .hover-third-light {
5818
- background: @menu-light-color-background-hover;
5819
- color: @menu-light-color;
5820
- }
5821
-
5822
5716
 
5823
5717
 
5824
5718
  // 菜单默认样式
5825
5719
  .menu() {
5826
5720
  position: relative;
5827
5721
  width: 100%;
5828
- min-width: 138px;
5829
5722
  height: 100%;
5830
5723
  background-color: @menu-color-background;
5831
5724
  color: @menu-sub-color;
@@ -5873,6 +5766,10 @@ textarea {
5873
5766
  color: @menu-color-disabled;
5874
5767
  }
5875
5768
 
5769
+ &-active {
5770
+ .hover();
5771
+ }
5772
+
5876
5773
  &-arrow {
5877
5774
  margin-left: auto;
5878
5775
  font-size: 16px;
@@ -5888,9 +5785,15 @@ textarea {
5888
5785
  }
5889
5786
  }
5890
5787
 
5788
+ .hover {
5789
+ background-color: @menu-sub-color-background;
5790
+ color: @menu-sub-color-hover;
5791
+ }
5792
+
5891
5793
  .light-hover {
5892
5794
  background-color: @menu-light-color-background;
5893
5795
  color: @menu-light-color-hover;
5796
+ border-right: 2px solid @menu-light-color-active;
5894
5797
  }
5895
5798
 
5896
5799
  .light-default {
@@ -5912,32 +5815,32 @@ textarea {
5912
5815
 
5913
5816
  @menu-prefix: '--@{kd-prefix}-c-menu';
5914
5817
 
5818
+ // shadow
5915
5819
  // color
5916
5820
  @menu-color-disabled: var(~'@{menu-prefix}-color-disabled', @color-disabled);
5917
5821
  @menu-sub-color: var(~'@{menu-prefix}-sub-color', rgba(255, 255, 255, 0.65));
5918
5822
  @menu-sub-color-hover: var(~'@{menu-prefix}-sub-color-hover', @color-white);
5919
- @menu-sub-color-active: var(~'@{menu-prefix}-sub-color-active', @color-white);
5823
+ @menu-sub-color-active: var(~'@{menu-prefix}-sub-color-active', @color-theme);
5920
5824
  @menu-sub-color-background: var(~'@{menu-prefix}-sub-color-background', #21242d);
5921
- @menu-sub-color-background-hover: var(~'@{menu-prefix}-sub-color-background-hover', #121319);
5922
- @menu-sub-base-color-hover: var(~'@{menu-prefix}-sub-base-color-hover', #b2b3b7);
5923
- @menu-sub-base-color-background-hover: var(~'@{menu-prefix}-sub-base-color-background-hover', #1f212b);
5924
5825
  @menu-inline-color-active: var(~'@{menu-prefix}-inline-color-active', @color-white);
5925
5826
  @menu-color-background: var(~'@{menu-prefix}-color-background', #343848);
5926
- @menu-light-color: var(~'@{menu-prefix}-light-color', @color-text-primary);
5927
- @menu-light-color-hover: var(~'@{menu-prefix}-light-color-hover', @color-text-primary);
5928
- @menu-light-color-active: var(~'@{menu-prefix}-light-color-active', @color-text-primary);
5929
- @menu-light-color-background: var(~'@{menu-prefix}-light-color-background', #f5f5f5);
5930
- @menu-light-color-background-hover: var(~'@{menu-prefix}-light-color-background-hover', #eaeaea);
5931
5827
 
5932
- // font
5933
- @menu-icon-font-size: var(~'@{menu-prefix}-icon-font-size', @font-size-xx-large);
5828
+ @menu-light-color: var(~'@{menu-prefix}-light-color', @color-text-primary);
5829
+ @menu-light-color-hover: var(~'@{menu-prefix}-light-color-hover', @color-ongoing);
5830
+ @menu-light-color-active: var(~'@{menu-prefix}-light-color-active', @color-theme);
5831
+ @menu-light-color-background: var(~'@{menu-prefix}-light-color-background', @color-background-ongoing);
5934
5832
 
5833
+ // sizing
5834
+ @menu-item-height: var(~'@{menu-prefix}-item-sizing-height', 50px);
5835
+ // spacing
5935
5836
  // motion
5936
5837
  @menu-motion-duration: var(~'@{menu-prefix}-motion-duration', @duration-promptly);
5937
5838
 
5938
- // sizing
5939
- @menu-item-height: var(~'@{menu-prefix}-item-sizing-height', 50px);
5839
+ // font
5840
+ @menu-icon-font-size: var(~'@{menu-prefix}-icon-font-size', @font-size-xx-large);
5940
5841
 
5842
+ // radius
5843
+ // line-height
5941
5844
  // z-index
5942
5845
  @menu-z-index: var(~'@{menu-prefix}-z-index', @z-index-dialog);
5943
5846
 
@@ -8944,7 +8847,7 @@ textarea {
8944
8847
  @select-dropdown-bg: var(~'@{select-custom-prefix}-dropdown-color-background', @color-background);
8945
8848
  @select-disabled-option-bg: var(~'@{select-custom-prefix}-item-color-background-disabled', @color-background-contain-disabled);
8946
8849
  @select-item-active-bg: var(~'@{select-custom-prefix}-color-background', @color-hover);
8947
- @select-item-selected-bg: var(~'@{select-custom-prefix}-color-background-selected', #f2f9ff);
8850
+ @select-item-selected-bg: var(~'@{select-custom-prefix}-color-background-selected', @color-theme-3);
8948
8851
  @select-g-color-border: var(~'@{select-custom-prefix}-color-border', @color-input);
8949
8852
  @select-g-color-border-foucs: var(~'@{select-custom-prefix}-color-border-foucs', @color-theme);
8950
8853
  @select-g-color-border-hover: var(~'@{select-custom-prefix}-color-border-hover', @color-theme);