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

fix(counter): change width height, font size, bg color to proper style #117

Merged
merged 9 commits into from
Dec 16, 2021
Merged

fix(counter): change width height, font size, bg color to proper style #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ace30ae
fix(counter): change width and height, font size, and bg color to pro…
bualoy-napat Dec 9, 2021
40e0271
style(combo-box): remove extra line
bualoy-napat Dec 9, 2021
2e455e5
fix(tree-select, combo-box): remove js extenstion from demo
bualoy-napat Dec 13, 2021
14b47f3
fix(counter): change text color to Tundora
bualoy-napat Dec 13, 2021
b62d28a
fix(counter): remove var size and apply style base on Figma
bualoy-napat Dec 13, 2021
683e204
fix(counter): var size back to style
bualoy-napat Dec 13, 2021
8a585e2
Merge branch 'develop' into fix/update-style-counter-color
bualoy-napat Dec 14, 2021
78cb93e
Merge branch 'develop' of https://github.com/Refinitiv/refinitiv-ui i…
Sarin-Udompanish Dec 16, 2021
7949c9e
Merge branch 'fix/update-style-counter-color' of https://github.com/R…
Sarin-Udompanish Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions packages/elemental-theme/src/custom-elements/ef-combo-box.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,7 @@
}
});

[part~=selection-badge] {
@size: unit((@button-font-size + 9), px);
height: @size;
min-width: @size;
[part=selection-badge] {
flex-shrink: 0;
}

Expand Down
9 changes: 0 additions & 9 deletions packages/halo-theme/src/custom-elements/ef-combo-box.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,4 @@
[part=list] ::slotted(ef-list) {
display: block;
}

[part~=selection-badge] {
height: 16px;
min-width: 20px;
&:hover {
background-color: @button-hover-background-color;
color: @global-text-selection-color;
}
}
}
12 changes: 10 additions & 2 deletions packages/halo-theme/src/custom-elements/ef-counter.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,17 @@
:host {
@size: unit((@button-font-size + 8), px);
border-radius: round((@size / 2));
min-width: @size;
height: @size;
border: 1px solid @color-silver;
min-width: 14px;
height: 16px;
line-height: @size;
color: @counter-text-color;
background-color: @counter-background-color;
font-size: 10rem;
padding: 0px 3px;
&:hover {
background-color: @button-hover-background-color;
border-color: @button-hover-border-color;
color: @button-hover-text-color;
}
}
2 changes: 1 addition & 1 deletion packages/halo-theme/src/variants/dark/variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,5 +139,5 @@
@dataviz-color-scale-range : @dataviz-color-pink;

// Counter
@counter-background-color : @color-tundora;
@counter-background-color : @color-mine-shaft;
@counter-text-color : @color-white;
4 changes: 2 additions & 2 deletions packages/halo-theme/src/variants/light/variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,5 @@
@dataviz-color-scale-positive : @dataviz-color-darkgreen;

// Counter
@counter-background-color : @color-alto;
@counter-text-color : @color-lights-out;
@counter-background-color : @color-concrete;
@counter-text-color : @color-tundora;