Skip to content

Commit

Permalink
Add support for Bootstrap 5
Browse files Browse the repository at this point in the history
- Fix border-radius styling for headerrow columns
- Ensure ui-slider maintains correct left margin
- handle changes to .input-group styling within Bootstrap
- Handle input-group inner content height
- Appropriately size pagination (previous version was cutting off the bottom 6 pixels)
- Vertically align the pagination icons
- Ignore .naverc file (used for managing multiple node versions)
  • Loading branch information
gcko committed Jan 3, 2021
1 parent 2e8e245 commit afb79e7
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,6 @@ dist-demo
**/junit.xml
**/test-report.xml
**/testresult.xml

# Node Version Manager files
.naverc
44 changes: 43 additions & 1 deletion src/app/modules/angular-slickgrid/styles/slick-bootstrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,12 @@
border: none;
padding: $header-row-filter-padding;
background: $header-row-background-color;
.flatpickr {
input {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
}
}
.slick-headerrow-column input,
.slick-headerrow-column select,
Expand Down Expand Up @@ -370,7 +376,7 @@
}
.slick-resizable-handle {
width: 7px;
right: 0px;
right: 0;
z-index: 1;
}
.slick-resizable-handle:hover {
Expand Down Expand Up @@ -436,4 +442,40 @@
.slick-viewport-bottom.slick-viewport-right {
overflow-y: $frozen-overflow-right !important;
}
.input-group {
> :not(:first-child):not(.dropdown-menu):not(.valid-tooltip):not(.valid-feedback):not(.invalid-tooltip):not(.invalid-feedback) {
margin-left: 0;
&.ui-slider-horizontal {
margin-left: 10px;
}
}

.input-group-addon {
.input-group-text {
height: 100%;
}
&.input-group-append {
.input-group-text {
margin-left: -1px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
}
&.input-group-prepend {
.input-group-text {
margin-right: -1px;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
}
}
}
}

.slick-pagination {
height: 40px;

.slick-pagination-nav .pagination .page-item a[class*="icon-seek-"] {
line-height: 1rem;
}
}

0 comments on commit afb79e7

Please sign in to comment.