Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

fix(dialog): Bring button layout in line with design telerik/kendo#6508 #108

Merged
merged 1 commit into from Jan 13, 2017
Merged

fix(dialog): Bring button layout in line with design telerik/kendo#6508 #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions scss/dialog/_layout.scss
View file
Open in desktop
Expand Up @@ -69,13 +69,25 @@ $modal-inner-padding: $modal-title-padding !default;
display: flex;
justify-content: center;
flex: 1;
line-height: 1;
padding: $padding-x * 2;
border-radius: 0;
border-width: 1px 0 0;

&:not(:last-child) {
border-right-width: 1px;
}
}
}
.k-dialog-button-layout-stretched {
flex-direction: row;
align-items: stretch;
}

.k-window-content {
overflow: hidden;
}

}

// TODO: examine old styles for characteristic styling
Expand Down
68 changes: 65 additions & 3 deletions scss/dialog/_theme.scss
View file
Open in desktop
Expand Up @@ -11,6 +11,15 @@
$window-shadow: 0 3px 3px 0 rgba(0, 0, 0, .06) !default;
$window-focused-box-shadow: 1px 1px 7px 1px $window-shadow-color !default;

$dialog-normal-button-bg: $bg-color !default;
$dialog-normal-button-hover-bg: $hover-bg !default;
$dialog-primary-button-focus: rgba( $accent, .3 ) !default;
$dialog-normal-button-focus-box-shadow: inset 0 0 0 2px $button-border !default;
$dialog-primary-button-bg: $accent-contrast !default;
$dialog-primary-button-text: $accent !default;
$dialog-primary-button-focus-box-shadow: inset 0 0 0 2px $dialog-primary-button-focus !default;
$dialog-primary-button-hover-focus-box-shadow: inset 0 0 0 2px $button-border !default;

.k-window {
border-color: $window-border;
box-shadow: $window-shadow;
Expand Down Expand Up @@ -39,8 +48,61 @@
}
}

.k-window-content {
overflow: hidden;
}
.k-dialog-buttongroup {
background-color: $dialog-normal-button-bg;

.k-button {
border-color: $button-border;

&:hover {
border-color: $button-border;
}

&:active {
box-shadow: $button-active-box-shadow;
}

&:not(.k-primary) {
background-color: $dialog-normal-button-bg;
background-image: none;

&:hover,
&.k-state-hover {
background-color: $dialog-normal-button-hover-bg;
}

&:focus,
&.k-state-focused {
box-shadow: $dialog-normal-button-focus-box-shadow;
}
}

&.k-primary {
background-image: none;
background-color: $dialog-primary-button-bg;
color: $dialog-primary-button-text;

&:hover,
&.k-state-hover {
background-color: $dialog-primary-button-text;
color: $dialog-primary-button-bg;

&:focus,
&.k-state-focused {
box-shadow: $dialog-primary-button-hover-focus-box-shadow;
}
}

&:active {
background-color: $dialog-primary-button-text;
color: $dialog-primary-button-bg;
}

&:focus,
&.k-state-focused {
box-shadow: $dialog-primary-button-focus-box-shadow;
}
}
}
}
}