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

fix: match form component borders, update foundation #314

Merged
merged 16 commits into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/common/scss/shidoka-flatpickr-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
$date-picker-background: var(--kd-color-date-and-time-picker-background-container);
$icon-fill: var(--kd-color-date-and-time-picker-icon-default);
$current-month-year: var(--kd-color-date-and-time-picker-text-title);
$input-background: var(--kd-color-background-ui-hollow-default);
$input-background: var(--kd-color-background-forms-default);
$range-dates: var(--kd-color-date-and-time-picker-background-pressed);
$selected-date: var(--kd-color-date-and-time-picker-background-default);
$today: var(--kd-color-date-and-time-picker-border-focus);
Expand Down
2 changes: 1 addition & 1 deletion src/components/reusable/checkbox/checkbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ $invalid-checkbox-background: var(--kd-color-status-error-dark);

label {
display: inline-flex;
align-items: center;
gap: 10px;
width: 100%;
position: relative;
Expand Down Expand Up @@ -41,6 +40,7 @@ input {
justify-content: center;
flex-shrink: 0;
margin: 0;
margin-top: 4px;
width: 16px;
height: 16px;
border: 2px solid var(--kd-color-border-forms-default);
Expand Down
2 changes: 1 addition & 1 deletion src/components/reusable/datePicker/datepicker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
input {
display: block;
width: 100%;
border: 1px solid var(--kd-color-border-ui-default);
border: 1px solid var(--kd-color-border-forms-default);
border-radius: 4px;
height: 48px;
padding: 0 40px 0 16px;
Expand Down
19 changes: 8 additions & 11 deletions src/components/reusable/dropdown/dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,23 @@
align-items: center;
-webkit-appearance: none;
appearance: none;
border: 1px solid var(--kd-color-border-ui-default);
border: 1px solid var(--kd-color-border-forms-default);
border-radius: 4px;
height: 48px;
padding: 0 48px 0 16px;
cursor: default;
font-weight: 400;
white-space: nowrap;

background: var(--kd-color-background-container-default);
background: var(--kd-color-background-forms-default);

[searchable] & {
padding-right: 80px;
}

&:not([disabled]):hover {
background-color: var(--kd-color-text-variant-inversed);
.input-custom {
border: none;
background: transparent;
}

&:hover {
border: 1px solid var(--kd-color-border-ui-default);
[searchable] & {
padding-right: 80px;
}

span {
Expand Down Expand Up @@ -113,7 +110,7 @@
max-height: 280px;
overflow-y: auto;
outline: none;
background: var(--kd-color-background-forms-search-bg);
background: var(--kd-color-background-forms-default);
box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.12),
0px 4px 12px 0px rgba(0, 0, 0, 0.08);
outline: 2px solid transparent;
Expand Down
17 changes: 12 additions & 5 deletions src/components/reusable/dropdown/dropdown.ts
Original file line number Diff line number Diff line change
Expand Up @@ -297,13 +297,20 @@ export class Dropdown extends FormMixin(LitElement) {
/>
`
: html`
<span>
${this.multiple
? this.placeholder
<input
type="text"
class="input-custom"
.value=${this.multiple
? ''
: this.value === ''
? this.placeholder
? ''
: this.text}
</span>
placeholder=${this.multiple
? this.placeholder
: this.placeholder}
readonly
tabindex="-1"
/>
`}

<span class="arrow-icon">${unsafeSVG(downIcon)}</span>
Expand Down
4 changes: 2 additions & 2 deletions src/components/reusable/dropdown/dropdownOption.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
}

li {
background-color: var(--kd-color-background-container-default);
background-color: var(--kd-color-background-ui-hollow-default);
cursor: default;
padding: 16px;
transition: background-color 150ms ease-out;
Expand Down Expand Up @@ -36,7 +36,7 @@ li {
}

&:hover {
background-color: transparent;
background-color: var(--kd-color-background-container-default);
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/components/reusable/radioButton/radioButton.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

label {
display: inline-flex;
align-items: center;
gap: 10px;

&[disabled] {
Expand All @@ -28,11 +27,12 @@ input {
align-items: center;
justify-content: center;
margin: 0;
margin-top: 2px;
width: 18px;
height: 18px;
border: 2px solid var(--kd-color-border-ui-default);
border: 2px solid var(--kd-color-border-forms-default);
border-radius: 50%;
background-color: transparent;
background: var(--kd-color-background-ui-hollow-default);
outline: 2px solid transparent;
transition: background-color 150ms ease-out, border-color 150ms ease-out,
outline-color 150ms ease-out;
Expand Down
Loading