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

Address KModal and KSelect rebrand issues #616

Merged
merged 2 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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 docs/pages/kselect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
export default {
data() {
return {
exampleData: null,
exampleData: {},
options: [
{
label: 'Somebody',
Expand Down
1 change: 1 addition & 0 deletions lib/KModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@
// if modal contains KSelect, special classes & styles will be applied
const kSelectCheck = document.querySelector('div.modal div.ui-select');
this.containsKSelect = !!kSelectCheck;
this.updateContentSectionStyle();
},
updated() {
this.updateContentSectionStyle();
Expand Down
7 changes: 4 additions & 3 deletions lib/KSelect/KeenUiSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,7 @@

&:hover:not(.is-disabled) {
border-bottom-color: $ui-input-border-color--hover;
border-bottom-width: $ui-input-border-width--active;

.ui-select-label-text {
color: $ui-input-label-color--hover;
}
Expand Down Expand Up @@ -941,6 +941,7 @@
}

&.is-floating {
padding-top: rem(9px);
transform: translateY(0) scale(1);
}
}
Expand Down Expand Up @@ -1008,7 +1009,7 @@
position: relative;
display: block;
width: 100%;
padding: 0;
padding: 0 10px;
margin: 0;
outline: none;
}
Expand Down Expand Up @@ -1054,7 +1055,7 @@

.ui-select-display-value {
position: relative;
top: 2px;
top: 1px;
flex-grow: 1;
height: 22px; // height and top help prevent descender clipping
overflow: hidden;
Expand Down
1 change: 0 additions & 1 deletion lib/keen/UiTextbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,6 @@
.ui-textbox-label,
.ui-textbox-textarea {
border-bottom-color: $ui-input-border-color--hover;
border-bottom-width: $ui-input-border-width--active;
}
}

Expand Down
6 changes: 3 additions & 3 deletions lib/keen/styles/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ $ui-input-margin-bottom: rem(16px) !default;

// Input label
$ui-input-label-color: $secondary-text-color !default;
MisRob marked this conversation as resolved.
Show resolved Hide resolved
$ui-input-label-color--hover: rgba(black, 0.75) !default;
$ui-input-label-color--hover: black !default;
$ui-input-label-color--active: $brand-primary-color !default;
$ui-input-label-color--invalid: $md-red-800 !default;
$ui-input-label-font-size: rem(15px) !default;
$ui-input-label-line-height: normal !default;
$ui-input-label-margin-bottom: 0 !default;
$ui-input-label-top--inline: rem(26px) !default;
$ui-input-label-top--inline: rem(23px) !default;

// Input text
$ui-input-text-color: $primary-text-color !default;
Expand All @@ -50,7 +50,7 @@ $ui-input-text-color--invalid: $md-red !default;

// Input border
$ui-input-border-color: $secondary-text-color !default;
$ui-input-border-color--hover: rgba(black, 0.75) !default;
$ui-input-border-color--hover: black !default;
$ui-input-border-color--active: $brand-primary-color !default;
$ui-input-border-color--invalid: $md-red !default;
$ui-input-border-width: 1px !default;
Expand Down
Loading