Skip to content

Commit

Permalink
feat(grid): add k-grid-toolbar-bottom styles
Browse files Browse the repository at this point in the history
  • Loading branch information
JoomFX authored and joneff committed Jun 1, 2021
1 parent c9efd9b commit 65c18f2
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 21 deletions.
11 changes: 6 additions & 5 deletions packages/bootstrap/scss/grid/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
// Grid
$grid-border-width: 1px !default;
$grid-font-family: $font-family !default;
$grid-font-size: $font-size !default;
$grid-line-height: $line-height !default;

$grid-padding-x: $cell-padding-x !default;
$grid-padding-y: $cell-padding-y !default;

Expand All @@ -18,6 +23,7 @@ $grid-filter-cell-padding-y: $grid-filter-cell-padding-x !default;
$grid-toolbar-padding-x: $toolbar-padding-x !default;
$grid-toolbar-padding-y: $toolbar-padding-y !default;
$grid-toolbar-spacing: $toolbar-spacing !default;
$grid-toolbar-border-width: $grid-border-width !default;

$grid-cell-padding-x: $grid-padding-x !default;
$grid-cell-padding-y: $grid-padding-y !default;
Expand All @@ -26,11 +32,6 @@ $grid-cell-vertical-border-width: 1px !default;

$grid-cell-placeholder-line-width: 80% !default;

$grid-border-width: 1px !default;
$grid-font-family: $font-family !default;
$grid-font-size: $font-size !default;
$grid-line-height: $line-height !default;

/// Background color of the grid component
/// @group grid
$grid-bg: $table-bg !default;
Expand Down
11 changes: 6 additions & 5 deletions packages/classic/scss/grid/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
// Grid
$grid-border-width: 1px !default;
$grid-font-family: $font-family !default;
$grid-font-size: $font-size !default;
$grid-line-height: $line-height !default;

$grid-padding-x: $cell-padding-x !default;
$grid-padding-y: $cell-padding-y !default;

Expand All @@ -18,6 +23,7 @@ $grid-filter-cell-padding-y: $grid-filter-cell-padding-x !default;
$grid-toolbar-padding-x: $toolbar-padding-x !default;
$grid-toolbar-padding-y: $toolbar-padding-y !default;
$grid-toolbar-spacing: $toolbar-spacing !default;
$grid-toolbar-border-width: $grid-border-width !default;

$grid-cell-padding-x: $grid-padding-x !default;
$grid-cell-padding-y: $grid-padding-y !default;
Expand All @@ -26,11 +32,6 @@ $grid-cell-vertical-border-width: 1px !default;

$grid-cell-placeholder-line-width: 80% !default;

$grid-border-width: 1px !default;
$grid-font-family: $font-family !default;
$grid-font-size: $font-size !default;
$grid-line-height: $line-height !default;

/// Background color of the grid component
/// @group grid
$grid-bg: $component-bg !default;
Expand Down
5 changes: 4 additions & 1 deletion packages/default/scss/grid/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -425,9 +425,12 @@

// Toolbar
.k-grid-toolbar {
border-width: 0 0 1px;
border-width: 0 0 $grid-toolbar-border-width;
flex-shrink: 0;
}
.k-grid-toolbar-bottom {
border-width: $grid-toolbar-border-width 0 0;
}


// Grid search
Expand Down
11 changes: 6 additions & 5 deletions packages/default/scss/grid/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
// Grid
$grid-border-width: 1px !default;
$grid-font-family: $font-family !default;
$grid-font-size: $font-size !default;
$grid-line-height: $line-height !default;

$grid-padding-x: $cell-padding-x !default;
$grid-padding-y: $cell-padding-y !default;

Expand All @@ -18,6 +23,7 @@ $grid-filter-cell-padding-y: $grid-filter-cell-padding-x !default;
$grid-toolbar-padding-x: $toolbar-padding-x !default;
$grid-toolbar-padding-y: $toolbar-padding-y !default;
$grid-toolbar-spacing: $toolbar-spacing !default;
$grid-toolbar-border-width: $grid-border-width !default;

$grid-cell-padding-x: $grid-padding-x !default;
$grid-cell-padding-y: $grid-padding-y !default;
Expand All @@ -26,11 +32,6 @@ $grid-cell-vertical-border-width: 1px !default;

$grid-cell-placeholder-line-width: 80% !default;

$grid-border-width: 1px !default;
$grid-font-family: $font-family !default;
$grid-font-size: $font-size !default;
$grid-line-height: $line-height !default;

/// Background color of the grid component
/// @group grid
$grid-bg: $component-bg !default;
Expand Down
11 changes: 6 additions & 5 deletions packages/material/scss/grid/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
// Grid
$grid-border-width: 1px !default;
$grid-font-family: $font-family !default;
$grid-font-size: $font-size !default;
$grid-line-height: $line-height !default;

$grid-padding-x: $cell-padding-x !default;
$grid-padding-y: $cell-padding-y !default;

Expand All @@ -18,6 +23,7 @@ $grid-filter-cell-padding-y: $grid-padding-y !default;
$grid-toolbar-padding-x: $toolbar-padding-x !default;
$grid-toolbar-padding-y: $toolbar-padding-y !default;
$grid-toolbar-spacing: $toolbar-spacing !default;
$grid-toolbar-border-width: $grid-border-width !default;

$grid-cell-padding-x: $grid-padding-x !default;
$grid-cell-padding-y: $grid-padding-y !default;
Expand All @@ -26,11 +32,6 @@ $grid-cell-vertical-border-width: 1px !default;

$grid-cell-placeholder-line-width: 80% !default;

$grid-border-width: 1px !default;
$grid-font-family: $font-family !default;
$grid-font-size: $font-size !default;
$grid-line-height: $line-height !default;

/// Background color of the grid component
/// @group grid
$grid-bg: $component-bg !default;
Expand Down

0 comments on commit 65c18f2

Please sign in to comment.