Skip to content

Commit

Permalink
fix: fix missed fixed class prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
Justineo committed Oct 25, 2019
1 parent ba0bd70 commit ff1a509
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 14 deletions.
4 changes: 2 additions & 2 deletions packages/veui-theme-dls/components/button.less
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
background-color: @dls-button-background-color-normal-active;
}

&-loading .veui-icon:not(&-loading-icon) {
&-loading .@{veui-prefix}-icon:not(&-loading-icon) {
display: none;
}

Expand Down Expand Up @@ -255,7 +255,7 @@
}

&.@{veui-prefix}-button-loading {
.veui-icon:not(.@{veui-prefix}-button-loading-icon) {
.@{veui-prefix}-icon:not(.@{veui-prefix}-button-loading-icon) {
display: none;
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/veui-theme-dls/components/fieldset.less
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@
// 3. 最后一个不带field不带tip,error出在fieldset上
& > .@{veui-prefix}-field .@{veui-prefix}-field-error,
&
> .veui-field:not(.@{veui-prefix}-field-no-tip)
> .@{veui-prefix}-field:not(.@{veui-prefix}-field-no-tip)
+ .@{veui-prefix}-field-error {
.veui-field-gap-error();
}

// field自己带label 和 error,这种情况error要缩进
&
> .veui-field:not(.@{veui-prefix}-field-no-label)
> .@{veui-prefix}-field:not(.@{veui-prefix}-field-no-label)
~ .@{veui-prefix}-field-error,
&
> .veui-field:not(.@{veui-prefix}-field-no-tip)
> .@{veui-prefix}-field:not(.@{veui-prefix}-field-no-tip)
+ .@{veui-prefix}-field-error {
margin-left: @veui-form-label-width;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/veui-theme-dls/components/number-input.less
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
}
}

// &.veui-input-invalid:not(.veui-disabled):not(.@{veui-prefix}-readonly) {
// &.@{veui-prefix}-input-invalid:not(.@{veui-prefix}-disabled):not(.@{veui-prefix}-readonly) {
// &:extend(._veui-input-invalid all);

// .@{veui-prefix}-number-input-step-up {
Expand Down
2 changes: 1 addition & 1 deletion packages/veui-theme-dls/components/option-group.less
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}

// 找到有分割线的元素,padding-top 设置分割线下间距, margin-top 设置分割线上间距
& &:not(.veui-option-group-popout):not(:first-child) {
& &:not(.@{veui-prefix}-option-group-popout):not(:first-child) {
margin-top: @dls-option-group-padding-y;
padding-top: @dls-option-group-padding-y;
border-top: 1px solid @dls-option-group-separator-color;
Expand Down
2 changes: 1 addition & 1 deletion packages/veui-theme-dls/components/searchbox.less
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
}
}

&:not(.veui-disabled):not(.@{veui-prefix}-readonly) {
&:not(.@{veui-prefix}-disabled):not(.@{veui-prefix}-readonly) {
.@{veui-prefix}-searchbox-action:hover {
color: @dls-input-font-color;
}
Expand Down
9 changes: 6 additions & 3 deletions packages/veui-theme-dls/components/select.less
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}

&:not(&-empty):not(&-expanded)
.veui-input:not(.@{veui-prefix}-input-focused)
.@{veui-prefix}-input:not(.@{veui-prefix}-input-focused)
.@{veui-prefix}-input-placeholder {
color: @dls-input-font-color;
}
Expand Down Expand Up @@ -160,7 +160,9 @@
}
}

&:not(.veui-readonly):not(.@{veui-prefix}-disabled):hover &-clear + &-toggle,
&:not(.@{veui-prefix}-readonly):not(.@{veui-prefix}-disabled):hover
&-clear
+ &-toggle,
.@{veui-prefix}-input-focused &-clear + &-toggle,
&-clear.focus-visible + &-toggle {
opacity: 0;
Expand All @@ -180,7 +182,8 @@
.dls-icon-size(@dls-input-icon-size);
}

.veui-select:not(.veui-readonly):not(.@{veui-prefix}-disabled):hover &,
.@{veui-prefix}-select:not(.@{veui-prefix}-readonly):not(.@{veui-prefix}-disabled):hover
&,
.@{veui-prefix}-input-focused &,
&.focus-visible {
opacity: 1;
Expand Down
2 changes: 1 addition & 1 deletion packages/veui-theme-dls/components/switch.less
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
}

&.@{veui-prefix}-switch-loading .@{veui-prefix}-switch-button,
&.veui-switch-on:not(.@{veui-prefix}-switch-loading)
&.@{veui-prefix}-switch-on:not(.@{veui-prefix}-switch-loading)
> .@{veui-prefix}-switch-switcher
> .@{veui-prefix}-switch-button {
transform: translateX(
Expand Down
7 changes: 5 additions & 2 deletions packages/veui-theme-dls/components/time-picker.less
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@
}
}

&:not(.veui-readonly):not(.@{veui-prefix}-disabled):hover &-clear + &-clock,
&:not(.@{veui-prefix}-readonly):not(.@{veui-prefix}-disabled):hover
&-clear
+ &-clock,
.@{veui-prefix}-input-focused &-clear + &-clock,
&-clear.focus-visible + &-clock {
opacity: 0;
Expand All @@ -74,7 +76,8 @@
.dls-icon-size(@dls-input-icon-size);
}

.veui-time-picker:not(.veui-readonly):not(.@{veui-prefix}-disabled):hover &,
.@{veui-prefix}-time-picker:not(.@{veui-prefix}-readonly):not(.@{veui-prefix}-disabled):hover
&,
.@{veui-prefix}-input-focused &,
&.focus-visible {
opacity: 1;
Expand Down

0 comments on commit ff1a509

Please sign in to comment.