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.

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

feat: Select Reskinning #16173

Merged
merged 56 commits into from
Aug 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
4725129
update checkbox
jsartisan Jul 13, 2022
28efe1f
fix margin in checkbox
jsartisan Jul 13, 2022
0f5d907
fix color bug
jsartisan Jul 13, 2022
3979b6c
fix border radius
jsartisan Jul 13, 2022
3740c94
fixes
jsartisan Jul 14, 2022
6542fac
remove unused imports
jsartisan Jul 15, 2022
7f99249
bug fixes
jsartisan Jul 15, 2022
b73382f
ui fixes
jsartisan Jul 15, 2022
b5641b0
code review feedback fixes
jsartisan Jul 15, 2022
d891505
css updates for toggle
jsartisan Jul 19, 2022
f83c9d0
fix bg bug in checkbox
jsartisan Jul 19, 2022
b73a576
Merge branch 'reskinning/checkbox' of https://github.com/appsmithorg/…
jsartisan Jul 20, 2022
fbf3236
fix disabled checkbox style
jsartisan Jul 20, 2022
41eaecc
Merge branch 'reskinning/checkbox' of https://github.com/appsmithorg/…
jsartisan Jul 20, 2022
1ed11f6
update styles for radio and switch
jsartisan Jul 20, 2022
80c11f7
update label align
jsartisan Jul 20, 2022
a553aa9
add hover interaction for switch
jsartisan Jul 21, 2022
93591ab
Merge branch 'reskinning/checkbox' of github.com:appsmithorg/appsmith…
jsartisan Jul 21, 2022
867af58
add wds css variables
jsartisan Jul 21, 2022
149e122
add error state
jsartisan Jul 21, 2022
85c78f0
add error state
jsartisan Jul 21, 2022
9a9fba9
fix css variable
jsartisan Jul 21, 2022
5a8947f
Merge branch 'reskinning/radio-toggle' of github.com:appsmithorg/apps…
jsartisan Jul 22, 2022
0241956
fix css
jsartisan Jul 22, 2022
a6e6eab
fix checkbox group column height
jsartisan Jul 25, 2022
e5d1617
move checkbox icons to assets
jsartisan Jul 26, 2022
6e4fe7c
update input
jsartisan Jul 27, 2022
fcd70d4
fix input
jsartisan Jul 28, 2022
1017273
fix input
jsartisan Jul 28, 2022
fd8d674
fix input fix
jsartisan Jul 29, 2022
f484e14
fix disalbed icon color
jsartisan Jul 29, 2022
6013018
empty commit to deploy again
jsartisan Jul 29, 2022
8f81c9e
address review feedbacks
jsartisan Aug 2, 2022
6b638ff
fix font in dropdown
jsartisan Aug 3, 2022
3fbad0f
Merge branch 'reskinning/input' of github.com:appsmithorg/appsmith in…
jsartisan Aug 3, 2022
023fffe
fix colors
jsartisan Aug 3, 2022
14e186d
fix search icon alignment
jsartisan Aug 5, 2022
8a2d28f
fix space in right cross icon
jsartisan Aug 5, 2022
6da4d03
fix colors and label alignment
jsartisan Aug 9, 2022
21478fb
fix margin top in tooltip
jsartisan Aug 10, 2022
6957926
fix merge conflicts
jsartisan Aug 10, 2022
0bcb425
replace red color with css variable
jsartisan Aug 10, 2022
4c7cc5c
Merge branch 'release' into reskinning/input
Aishwarya-U-R Aug 10, 2022
ecaea9b
Json form field spec fix
Aishwarya-U-R Aug 10, 2022
68bd119
fix merge conflicts
jsartisan Aug 11, 2022
2b2f389
fix merge conflicts
jsartisan Aug 11, 2022
56819ae
wip
jsartisan Aug 16, 2022
b6e91e5
fix select styles
jsartisan Aug 17, 2022
7329944
fix select styles
jsartisan Aug 17, 2022
453d898
fix select styles
jsartisan Aug 17, 2022
2e27027
updaate styles
jsartisan Aug 21, 2022
cddd320
Merge branch 'release' of github.com:appsmithorg/appsmith into reskin…
jsartisan Aug 21, 2022
9eec174
fix css
jsartisan Aug 23, 2022
321dc03
update focus color
jsartisan Aug 24, 2022
dc20e06
fix error state
jsartisan Aug 24, 2022
9328f97
fix hover state
jsartisan Aug 24, 2022
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
6 changes: 6 additions & 0 deletions app/client/src/theme/wds.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
:root {
--wds-color-border: #E0DEDE;
--wds-color-border-light: #FDDDDD;
--wds-color-border-hover: #B3B3B3;
--wds-color-border-disabled: #E0DEDE;
--wds-color-border-danger: #D91921;
--wds-color-border-danger-hover: #B90707;
--wds-color-border-danger-focus-light: #EDDDDD;

--wds-color-bg: #FFFFFF;
--wds-color-bg-hover: #EBEBEB;
--wds-color-bg-focus: #e3e3e3;
--wds-color-bg-light: #EBEBEB;
--wds-color-bg-strong: #E0DEDE;
--wds-color-bg-strong-hover: #B3B3B3;
--wds-color-bg-disabled: #F3F3F3;
Expand All @@ -22,3 +27,4 @@
--wds-color-text-disabled: #A9A7A7;
--wds-color-text-disabled-light: #CAC7C7;
}

Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
multiSelectInputContainerStyles,
} from "components/ads/LabelWithTooltip";
import { lightenColor } from "widgets/WidgetUtils";
import CheckIcon from "assets/icons/widget/checkbox/check-icon.svg";

export const StyledIcon = styled(Icon)<{ expanded: boolean }>`
transform: rotate(${({ expanded }) => (expanded ? 0 : 270)}deg);
Expand Down Expand Up @@ -392,7 +393,7 @@ border: 1px solid #E8E8E8;

.rc-tree-select-tree-checkbox {
box-sizing: border-box;
margin: 0 2px 0 9px;
margin: 0 0px 0 9px;
white-space: nowrap;
outline: none;
cursor: pointer;
Expand All @@ -405,7 +406,9 @@ border: 1px solid #E8E8E8;
.rc-tree-select-tree-checkbox-checked .rc-tree-select-tree-checkbox-inner {
border: none !important;
background-color: ${({ accentColor }) => accentColor};
background-image: url("data:image/svg+xml,%3Csvg width='14' height='14' viewBox='0 0 14 14' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Crect width='14' height='14' fill='transparent' /%3E%3Cpath d='M10.1039 3.5L11 4.40822L5.48269 10L2.5 6.97705L3.39613 6.06883L5.48269 8.18305L10.1039 3.5Z' fill='white'/%3E%3C/svg%3E%0A");
background-image: url(${CheckIcon}) !important;
background-repeat: no-repeat !important;
background-position: center !important;
}

.rc-tree-select-tree-checkbox-inner {
Expand All @@ -419,7 +422,7 @@ border: 1px solid #E8E8E8;
border: 1px solid ${Colors.GREY_3};
border-radius: 0px;
border-collapse: separate;
transition: all .1s;
transition: none;
border-radius: ${({ borderRadius }) => borderRadius};
}
.rc-tree-select-tree
Expand All @@ -443,7 +446,7 @@ border: 1px solid #E8E8E8;
display: inline-block;
width: 0px;
height: 16px;
margin-right: 2px;
margin-right: 0px;
line-height: 16px;
vertical-align: -0.125em;
background-color: transparent;
Expand All @@ -468,7 +471,7 @@ border: 1px solid #E8E8E8;
.rc-tree-select-tree
.rc-tree-select-tree-treenode
span.rc-tree-select-tree-icon_loading {
margin-right: 2px;
margin-right: 0px;
vertical-align: top;
background: none;
}
Expand Down Expand Up @@ -526,34 +529,43 @@ border: 1px solid #E8E8E8;
cursor: not-allowed;
}
.rc-tree-select-tree-treenode-active {
background: ${({ accentColor }) => lightenColor(accentColor)};
background: var(--wds-color-bg-focus) !important;

:not(.rc-tree-select-tree-treenode-checkbox-checked) .rc-tree-select-tree-checkbox-inner {
background: transparent;
border-color: var(--wds-color-border-hover);
}
}
.rc-tree-select-tree-treenode:hover {
background: ${({ accentColor }) => lightenColor(accentColor)};
&.rc-tree-select-tree-treenode-checkbox-checked {
background: ${({ accentColor }) =>
lightenColor(accentColor, "0.90")} !important;
}
background: var(--wds-color-bg-hover);
.rc-tree-select-tree-title {
color: ${Colors.GREY_9};
color: var(--wds-color-text);
}
.rc-tree-select-tree-checkbox-indeterminate .rc-tree-select-tree-checkbox-inner {
background-color: ${({ accentColor }) => accentColor} !important;
}
:not(.rc-tree-select-tree-treenode-checkbox-checked) .rc-tree-select-tree-checkbox-inner {
background-color: ${({ accentColor }) => lightenColor(accentColor)};
border-color: ${({ accentColor }) => accentColor};
background: transparent;
border-color: var(--wds-color-border-hover);
}
}
.rc-tree-select-tree-treenode-checkbox-checked {
background: ${({ accentColor }) => lightenColor(accentColor)};
.rc-tree-select-tree-title {
color: ${Colors.GREY_10};
color: var(--wds-color-text);
}
}
.rc-tree-select-tree-icon__open {
margin-right: 2px;
margin-right: 0px;
vertical-align: top;
background-position: -110px -16px;
}
.rc-tree-select-tree-icon__close {
margin-right: 2px;
margin-right: 0px;
vertical-align: top;
background-position: -110px 0;
}
Expand All @@ -563,14 +575,14 @@ border: 1px solid #E8E8E8;
background-position: -110px -32px;
}
.rc-tree-select-tree-icon__customize {
margin-right: 2px;
margin-right: 0px;
vertical-align: top;
}
.rc-tree-select-tree-title {
display: inline-block;
margin-left: 10px;
font-size: 14px !important;
color: ${Colors.GREY_8};
color: var(--wds-color-text);
overflow: hidden;
text-overflow: ellipsis;
}
Expand Down Expand Up @@ -627,11 +639,12 @@ export const TreeSelectContainer = styled.div<{
transition: all 0.3s;
flex: 1;
overflow: hidden;
color: ${Colors.GREY_6};
color: var(--wds-color-text-light);
white-space: nowrap;
text-overflow: ellipsis;
pointer-events: none;
font-size: 14px;
margin-left: -8px;
}
.rc-tree-select-selection-search-input {
appearance: none;
Expand All @@ -649,13 +662,23 @@ export const TreeSelectContainer = styled.div<{
cursor: not-allowed;
input {
cursor: not-allowed;
background-color: ${Colors.GREY_1} !important;
background-color: var(--wds-color-bg-disabled) !important;
}
.rc-tree-select-selector {
border: 1.2px solid ${Colors.GREY_3} !important;
background-color: ${Colors.GREY_1} !important;
border: 1px solid var(--wds-color-border-disabled) !important;
background-color: var(--wds-color-bg-disabled) !important;
.rc-tree-select-selection-item-content {
color: ${Colors.GREY_7};
color: var(--wds-color-text-disabled);
}
}
.rc-tree-select-selection-placeholder {
color: var(--wds-color-text-disabled-light);
}
.rc-tree-select-arrow .dropdown-icon
svg {
path {
fill: var(--wds-color-icon-disabled);
}
}
}
}
Expand All @@ -678,7 +701,7 @@ export const TreeSelectContainer = styled.div<{
.rc-tree-select-single {
&:hover {
.rc-tree-select-selector {
border: 1.2px solid ${Colors.GREY_5};
border: 1px solid var(--wds-color-border-hover);
}
}
}
Expand All @@ -689,12 +712,11 @@ export const TreeSelectContainer = styled.div<{
background: ${Colors.WHITE};
border-radius: ${({ borderRadius }) => borderRadius};
box-shadow: ${({ boxShadow }) => `${boxShadow}`} !important;
border: 1px solid rgb(231, 231, 231);
border: 1px solid ${Colors.GREY_3};
border: 1px solid var(--wds-color-border);
box-sizing: border-box;
width: 100%;
transition: none;
background-color: white;
background-color: var(--wds-color-bg);
height: 100%;
.rc-tree-select-selection-search {
width: 100%;
Expand Down Expand Up @@ -733,18 +755,18 @@ export const TreeSelectContainer = styled.div<{
.rc-tree-select-selector {
display: flex;
flex-wrap: wrap;
background: ${Colors.WHITE};
background: var(--wds-color-bg);
border-radius: ${({ borderRadius }) => borderRadius};
box-shadow: ${({ boxShadow }) => `${boxShadow}`} !important;
width: 100%;
transition: none;
.rc-tree-select-selection-item {
background: none;
border: 1px solid ${Colors.GREY_3};
border-radius: 360px;
border: 1px solid var(--wds-color-border);
border-radius:${({ borderRadius }) => borderRadius};
max-width: 273.926px;
height: 20px;
color: ${Colors.GREY_10};
color: var(--wds-color-text);
overflow-wrap: break-word;
display: inline-flex;
flex-direction: row;
Expand Down Expand Up @@ -842,26 +864,34 @@ export const TreeSelectContainer = styled.div<{
.rc-tree-select-clear-icon {
font-size: 18px;
font-weight: bold;


}
}
}

.rc-tree-select-show-arrow.rc-tree-select-multiple {
.rc-tree-select-selector {
padding-right: ${({ allowClear }) => (allowClear ? "40px" : "20px")};
padding-left: 10px;
background: ${Colors.WHITE};
background: var(--wds-color-bg);
border-radius: ${({ borderRadius }) => borderRadius};
box-shadow: ${({ boxShadow }) => `${boxShadow}`} !important;
height: inherit;
width: 100%;
line-height: 30px;
transition: none;
border: 1px solid
${(props) => (props.isValid ? Colors.GREY_3 : Colors.DANGER_SOLID)};
${(props) =>
props.isValid
? "var(--wds-color-border)"
: "var(--wds-color-border-danger)"};
&:hover {
border: 1px solid
${(props) => (props.isValid ? Colors.GREY_5 : Colors.DANGER_SOLID)};
${(props) =>
props.isValid
? "var(--wds-color-border-hover)"
: "var(--wds-color-border-danger-hover)"};
}
}
}
Expand All @@ -884,9 +914,16 @@ export const TreeSelectContainer = styled.div<{

& .clear-icon {
width: 16px;
margin-right: 8px;

svg {
width: 16px;
height: 16px;
fill: var(--wds-color-icon);

path {
fill: var(--wds-color-icon);
}
}
}
}
Expand All @@ -905,8 +942,11 @@ export const TreeSelectContainer = styled.div<{
svg {
width: 20px;
height: 20px;

path {
fill: var(--wds-color-icon);
}
}
fill: ${Colors.SLATE_GRAY};
}
.rc-tree-select-arrow-icon {
&::after {
Expand Down
Loading