Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat: colorPicker datePicker timePicker size token and fix style bug #1018

Merged
merged 3 commits into from Nov 18, 2022
Merged

Feat: colorPicker datePicker timePicker size token and fix style bug #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1aeb82e
feat: datepicker size token
Wen1kang Nov 17, 2022
6ab5b64
feat: colorpicker datepicker timepicker size toke and fix style bug
Wen1kang Nov 18, 2022
2a4034b
chore: remove deprecated code
uyarn Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
114 changes: 40 additions & 74 deletions style/web/components/color-picker/_index.less
View file
Open in desktop
Expand Up @@ -12,11 +12,7 @@
padding: 0;
width: @color-picker-panel-width;
background: @bg-color-container;
box-shadow: @shadow-1,
@shadow-inset-top,
@shadow-inset-right,
@shadow-inset-bottom,
@shadow-inset-left;
box-shadow: @color-picker-panel-shadow;
border-radius: @border-radius-medium;
user-select: none;
}
Expand All @@ -32,29 +28,23 @@
.reset;

&.t-popup__content {
border-radius: @color-picker-border-radius;
box-shadow: @shadow-1,
@shadow-inset-top,
@shadow-inset-right,
@shadow-inset-bottom,
@shadow-inset-left;
box-shadow: @color-picker-panel-shadow;
}

&__icon {
width: @color-picker-icon-size;
height: @color-picker-icon-size;
display: flex;
align-items: center;
justify-content: center;
font-size: @color-picker-icon-font-size;
background: @bg-color-container;
transition: color @anim-duration-base @anim-time-fn-easing;
background: transparent;
transition: @anim-duration-base linear;
color: @text-color-secondary;
border-radius: @color-picker-icon-radius;
cursor: pointer;

&:hover {
background: @bg-color-container-hover;
transition: @anim-duration-base linear;
}
&.@{prefix}-is-disabled {
color: @text-color-disabled;
Expand Down Expand Up @@ -82,7 +72,7 @@

.@{prefix}-color-picker__body {
padding: @color-picker-panel-padding;
padding-bottom: 8px;
padding-bottom: calc(@color-picker-panel-padding - 4px);
}

.@{prefix}-color-picker__thumb {
Expand All @@ -93,7 +83,7 @@
width: @color-picker-slider-thumb-size;
height: @color-picker-slider-thumb-size;
border-radius: @border-radius-circle;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 15%);
box-shadow: @color-picker-thumbs-shadow;
background: white;
color: @text-color-brand;
padding: @color-picker-slider-thumb-padding;
Expand Down Expand Up @@ -149,8 +139,8 @@
}

.@{prefix}-color-picker__slider-wrapper {
border-radius: @color-picker-slider-height;
padding: 0 9px;
border-radius: @color-picker-slider-wrapper-radius;
padding: @color-picker-slider-wrapper-padding;
position: relative;

&--hue-type {
Expand All @@ -169,13 +159,13 @@
top: 0;
width: 100%;
height: @color-picker-slider-height;
border-radius: @color-picker-slider-height;
border-radius: @color-picker-slider-wrapper-radius;
}

.@{prefix}-color-picker__slider {
height: @color-picker-slider-height;
position: relative;
border-radius: @color-picker-slider-height;
border-radius: @color-picker-slider-wrapper-radius;
cursor: pointer;
color: transparent;
outline: none;
Expand Down Expand Up @@ -228,7 +218,7 @@
}

.@{prefix}-color-picker__sliders {
width: 186px;
width: 100%;
}

.@{prefix}-color-picker__sliders-preview {
Expand All @@ -238,6 +228,7 @@
height: @color-picker-gradient-preview-height;
border-radius: @color-picker-gradient-preview-radius;
overflow: hidden;
background: #fff;
.transparentBgImage();

&-inner {
Expand Down Expand Up @@ -296,7 +287,7 @@
}
&.@{prefix}-is-active {
z-index: 1;
outline: 2px solid @text-color-brand;
outline: 2px solid @component-border;
}

&-inner {
Expand All @@ -305,8 +296,6 @@
height: 100%;
border-radius: @border-radius-circle;
overflow: hidden;
background-size: 4px 4px;
background-position: 0 0, 2px 2px;

&::before {
content: "";
Expand Down Expand Up @@ -339,25 +328,19 @@
.@{prefix}-input-number .@{prefix}-input {
margin: 0;
}
.@{prefix}-select {
&__single {
margin-left: 4px;
}
}

.input-group {
display: flex;
align-items: center;
justify-content: space-around;
margin-left: 8px;
margin-left: @color-picker-input-format-margin-left;

&__item {
flex: 1;
width: 0;
margin-left: -1px;
.@{prefix}-input {
padding: 0 1px;
font: @color-picker-font;

&:focus,
&:focus-within,
Expand Down Expand Up @@ -394,7 +377,8 @@
}

&-mode-select {
width: 70px;
width: @color-picker-select-format-width;
display: flex;

.t-select,
.t-input {
Expand All @@ -406,13 +390,13 @@
}

.t-select__right-icon {
margin: 0 4px 0 0;
margin-right: @color-picker-select-format-margin-right;
}
}
}

.@{prefix}-color-picker__swatches-wrap {
margin: @color-picker-margin 0 0 0;
margin-top: @color-picker-margin;
position: relative;

.@{prefix}-color-picker__swatches {
Expand All @@ -423,7 +407,6 @@

&--title {
font: @color-picker-font;
margin: 0 0 12px;
padding: 0;
color: @text-color-primary;
display: flex;
Expand All @@ -437,26 +420,9 @@
align-items: center;
font-size: 0;
.@{prefix}-color-picker__icon {
width: 16px;
height: 16px;
margin-left: @color-picker-margin;
}
}

&--remove {
position: relative;
// 不使用popconfirm 组件， 这里绝对定位到正上方
.@{prefix}-popup {
position: absolute;
inset: auto auto 0 0;
margin: 0;
bottom: 30px;
left: 10px;
transform: translateX(-50%);
cursor: default;
}
.@{prefix}-popconfirm__content {
width: 220px;
width: @color-picker-swatch-icon-size;
height: @color-picker-swatch-icon-size;
margin-left: @color-picker-swatch-action-margin-left;
}
}

Expand All @@ -469,19 +435,17 @@
max-height: @color-picker-swatch-rows-max-height;
overflow-x: hidden;
overflow-y: auto;
margin: @color-picker-swatch-wrap-margin;
padding: 4px 10px 4px 4px;
padding: @color-picker-swatch-item-padding;
position: relative;
left: -4px;
left: @color-picker-swatch-item-left-negative-padding;
}

&--item {
display: flex;
width: @color-picker-swatch-width;
height: @color-picker-swatch-height;
border-radius: @border-radius-circle;
border-radius: @border-radius-default;
padding: @color-picker-swatch-padding;
border: @color-picker-swatch-border-size solid transparent;
overflow: hidden;
cursor: pointer;
align-items: center;
Expand All @@ -503,7 +467,7 @@
position: relative;
overflow: hidden;
border: 1px solid @component-border;
border-radius: @border-radius-circle;
border-radius: @border-radius-default;
flex-shrink: 0;
}

Expand All @@ -530,15 +494,16 @@
height: 100%;
position: relative;
overflow: hidden;
border: 1px solid @component-border;
border-radius: @border-radius-circle;
border-radius: @border-radius-default;
box-sizing: border-box;
}

&--inner {
width: 100%;
height: 100%;
display: block;
border-radius: @border-radius-default;
box-shadow: @colot-picker-swatch-item-color-inset-shadow;
}
}
}
Expand All @@ -551,33 +516,35 @@
width: fit-content;
}
.@{prefix}-input {
padding: 0 4px;
padding: @color-picker-trigger-input-padding;
}

&__color {
width: 24px;
height: 24px;
margin-right: 4px;
width: 100%;
height: 100%;
box-sizing: border-box;
display: flex;
align-items: center;

.color-inner {
border: 1px solid @scrollbar-color;
display: block;
width: 22px;
height: 22px;
width: @color-picker-trigger-input-color-inner-size;
height: @color-picker-trigger-input-color-inner-size;
color: transparent;
position: relative;
border-radius: @border-radius-default;
border-radius: @border-radius-small;
}
}
}
}

.@{prefix}-color-picker__gradient-slider {
padding: 0 9px;
border-radius: @color-picker-slider-height;
padding: @color-picker-slider-wrapper-padding;
border-radius: @color-picker-slider-wrapper-radius;

.@{prefix}-color-picker--bg-alpha {
background: #fff;
.transparentBgImage();
}
}
Expand All @@ -603,7 +570,6 @@
// 覆盖select-option 默认样式，使其更紧凑点
.@{prefix}-color-picker__select-options {
> .@{prefix}-popup__content {
border-radius: @color-picker-border-radius;
box-shadow: @shadow-1, @shadow-inset-top, @shadow-inset-right, @shadow-inset-bottom, @shadow-inset-left;
}
}
53 changes: 35 additions & 18 deletions style/web/components/color-picker/_var.less
View file
Open in desktop
Expand Up @@ -11,35 +11,43 @@
// 如：@button-line-bg-color-hover
// 如：@button-line-height-s

@color-picker-border-radius: 6px;
@color-picker-panel-width: 254px;
@color-picker-panel-width: 256px;
@color-picker-panel-padding: @pop-padding-xl;
@color-picker-panel-radius: @border-radius-medium;
@color-picker-saturation-height: 168px;
@color-picker-icon-radius: @border-radius-default;
@color-picker-saturation-height: 160px;
@color-picker-saturation-radius: @border-radius-default;
@color-picker-saturation-thumb-size: 18px;
@color-picker-saturation-thumb-size: calc(@comp-size-xxxs + @size-1);
@color-picker-margin: @comp-margin-m;
@color-picker-slider-height: 8px;
@color-picker-slider-thumb-size: 18px;
@color-picker-slider-thumb-transform-x: @color-picker-slider-thumb-size * -.5;
@color-picker-slider-wrapper-radius: calc(@color-picker-slider-height / 2);
@color-picker-slider-wrapper-padding: 0 calc(@color-picker-saturation-thumb-size / 2);
@color-picker-slider-thumb-size: calc(@comp-size-xxxs + @size-1);
@color-picker-slider-thumb-transform-x: calc(@color-picker-slider-thumb-size * -.5);
@color-picker-slider-thumb-padding: 2px;
@color-picker-input-format-width: 64px;
@color-picker-input-format-margin-left: @comp-margin-s;
@color-picker-select-format-margin-right: @comp-margin-xs;
@color-picker-select-format-width: 72px;
@color-picker-font: @font-body-small;
@color-picker-icon-size: 20px;
@color-picker-icon-radius: @border-radius-default;
@color-picker-icon-font-size: 16px;
@color-picker-degree-width: 42px;
@color-picker-gradient-preview-width: 32px;
@color-picker-gradient-preview-height: 32px;
@color-picker-icon-font-size: @color-picker-swatch-icon-size;
@color-picker-degree-width: @comp-size-xxl;
@color-picker-gradient-preview-width: @comp-size-s;
@color-picker-gradient-preview-height: @comp-size-s;
@color-picker-gradient-preview-radius: @border-radius-default;
@color-picker-swatch-width: 18px;
@color-picker-swatch-height: 18px;
@color-picker-swatch-icon-size: @comp-size-xxxs;
@color-picker-swatch-action-margin-left: @comp-margin-s;
@color-picker-swatch-width: @comp-size-xxxs;
@color-picker-swatch-height: @comp-size-xxxs;
@color-picker-swatch-radius: @border-radius-circle;
@color-picker-swatch-padding: 0;
@color-picker-swatch-border-size: 1px;
@color-picker-swatch-columns: 10;
@color-picker-swatch-row-gap: 5.7px;
@color-picker-swatch-column-gap: 5.7px;
@color-picker-swatch-item-padding: calc(@color-picker-panel-padding - 8px); //make sure swatchItem scale
@color-picker-swatch-item-left-negative-padding: calc(0px - @color-picker-swatch-item-padding);
// columnGap = (panelWidth - (panelPadding * 2) + (swatchColor * columnsItem)) / 9
@color-picker-swatch-row-gap: calc(calc(@color-picker-panel-width - calc(calc(@color-picker-panel-padding * 2) + calc(@color-picker-swatch-height * @color-picker-swatch-columns))) / 9);
@color-picker-swatch-column-gap: calc(calc(@color-picker-panel-width - calc(calc(@color-picker-panel-padding * 2) + calc(@color-picker-swatch-width * @color-picker-swatch-columns))) / 9);
@color-picker-swatch-wrap-margin-left: (@color-picker-swatch-padding + @color-picker-swatch-border-size) * -1;
// 右边往外伸出一点，让滚动条居外侧
@color-picker-swatch-wrap-margin-right: @color-picker-swatch-wrap-margin-left -
Expand All @@ -48,6 +56,15 @@
@color-picker-swatch-wrap-margin-left;
@color-picker-swatch-max-rows: 4; // 最大显示行数

// shadow
@color-picker-panel-shadow: @shadow-2-inset;
@color-picker-thumbs-shadow: @shadow-1;
@colot-picker-swatch-item-color-inset-shadow: @shadow-inset;

// 最大高度 = 行数 * (itemHeight + itemMarginTop)m;
@color-picker-swatch-rows-max-height: @color-picker-swatch-max-rows *
(@color-picker-swatch-height + @color-picker-swatch-row-gap);
@color-picker-swatch-rows-max-height: calc(@color-picker-swatch-max-rows *
calc(@color-picker-swatch-height + @color-picker-swatch-row-gap));

// trigger-input
@color-picker-trigger-input-padding: 0 @comp-paddingLR-s 0 @comp-paddingLR-xs;
@color-picker-trigger-input-color-inner-size: calc(@comp-size-xs - 2px);