Skip to content
This repository was archived by the owner on Jun 1, 2025. It is now read-only.

Commit 13bd025

Browse files
Ghislain BeaulacGhislain Beaulac
authored andcommitted
fix styling issue, sort icon not showing when grid has no scroll
1 parent 75466e1 commit 13bd025

File tree

3 files changed

+27
-21
lines changed

3 files changed

+27
-21
lines changed

.editorconfig

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
# Editor configuration, see http://editorconfig.org
1+
# http://editorconfig.org
22
root = true
33

44
[*]
55
charset = utf-8
6+
end_of_line = lf
67
indent_style = space
7-
indent_size = 2
8+
indent_size = 4
89
insert_final_newline = true
910
trim_trailing_whitespace = true
1011

12+
[*.{js,json,ts}]
13+
indent_style = space
14+
indent_size = 2
15+
1116
[*.md]
12-
max_line_length = off
17+
max_line_length = 0
1318
trim_trailing_whitespace = false

src/app/modules/angular-slickgrid/styles/_variables.scss

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
77
/* SlickGrid Bootstrap variables */
88
/* Used by slick-bootstrap.scss */
9-
$border-color: #dddddd !default;
10-
$font-size-base: 14px !default;
9+
$border-color: #dddddd !default;
10+
$font-size-base: 14px !default;
1111
$font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default;
1212

1313
/* Slickgrid container, including headers but excluding pagination */
@@ -19,8 +19,8 @@ $container-border-left: 0 none !default;
1919
/* grid */
2020
$grid-border-color: fade(black, 3%) !default;
2121
$grid-border-style: solid !default;
22-
$grid-header-background: rgba(255, 255, 255, .6) !default;
23-
$grid-cell-color: rgb(255, 255, 255) !default;
22+
$grid-header-background: rgba(255, 255, 255, .6) !default;
23+
$grid-cell-color: rgb(255, 255, 255) !default;
2424

2525
/* cell */
2626
$cell-border-top: 1px solid $border-color !default;
@@ -30,7 +30,7 @@ $cell-border-left: 0 none !default;
3030
$cell-odd-background-color: darken($grid-cell-color, 2.5%) !default;
3131
$cell-odd-active-background-color: darken($grid-cell-color, 5%) !default;
3232
$cell-padding: 5px 7.5834px !default;
33-
$selected-hover-color: rgb(245, 245, 204) !default;
33+
$selected-hover-color: rgb(245, 245, 204) !default;
3434

3535
/* cell default slickgrid values */
3636
$cell-padding-top: 4px !default;
@@ -42,42 +42,42 @@ $cell-padding-left: 4px !default;
4242
$header-input-height: 27px !default; // height of the filter form element (input, textarea, select)
4343
$header-input-width: 100% !default; // width of the filter form element (input, textarea, select)
4444
$header-input-padding: 0 6px !default; // padding of the filter form element (input, textarea, select)
45-
$header-row-background-color: #ffffff !default;
45+
$header-row-background-color: #ffffff !default;
4646
$header-row-count: 2 !default; // how many rows to display on the header
4747
$header-column-height: (16px * $header-row-count) !default; // header is calculated by rows to show
4848
$header-border-top: 0 none !default;
4949
$header-border-right: 0 none !default;
5050
$header-border-bottom: 0 none !default;
5151
$header-border-left: 0 none !default;
5252
$header-resizable-hover: 1px solid #d0d0d0 !default;
53-
$header-scroll-width-to-remove: 18px !default; // without this, the header (which doesn't have scrolling) will be wider than the data viewport
53+
$header-scroll-width-to-remove: 16px !default; // without this, the header (which doesn't have scrolling) will be wider than the data viewport
5454

5555
/* icon font is using Font-Awesome by default but could be changed to any other icon package like Glyphicons, ... */
5656
$icon-font-family: "FontAwesome" !default; // or Glyphicons Halflings */
5757
$icon-font-size: 14px !default;
5858
$icon-sort-asc: "\f0d8" !default;
5959
$icon-sort-desc: "\f0d7" !default;
60-
$icon-sort-color: rgb(76, 128, 190) !default;
60+
$icon-sort-color: rgb(76, 128, 190) !default;
6161
$table-background: transparent !default;
6262
$container-border: 0px solid $border-color !default;
63-
$link-color: #08c !default;
63+
$link-color: #08c !default;
6464
$link-color-hover: darker($link-color, 15%) !default;
65-
$table-bg-accent: #f9f9f9 !default; // for striping every second row
66-
$gray-dark: #333 !default;
67-
$text-color: $gray-dark !default;
68-
$navbar-default-link-hover-color: $gray-dark !default;
65+
$table-bg-accent: #f9f9f9 !default; // for striping every second row
66+
$gray-dark: #333 !default;
67+
$text-color: $gray-dark !default;
68+
$navbar-default-link-hover-color: $gray-dark !default;
6969

7070
/* Column picker */
71-
$column-picker-background-color: #f8f8f8 !default;
71+
$column-picker-background-color: #f8f8f8 !default;
7272
$column-picker-border: 1px solid #b8b8b8 !default;
7373
$column-picker-border-radius: 3px !default;
7474
$column-picker-close-background-color: 1px solid #9c9c9c !default;
7575
$column-picker-close-border: 1px solid #9c9c9c !default;
7676
$column-picker-close-opacity: 0.9 !default;
7777

7878
/* pagination variables */
79-
$pagination-button-hover-color: #E6E6E6 !default;
80-
$pagination-border-color: #ddd !default;
79+
$pagination-button-hover-color: #E6E6E6 !default;
80+
$pagination-border-color: #ddd !default;
8181
$pagination-icon-seek-first: "\f100" !default;
8282
$pagination-icon-seek-end: "\f101" !default;
8383
$pagination-icon-seek-next: "\f105" !default;
@@ -88,4 +88,4 @@ $pagination-border-top: 0 none !default;
8888
$pagination-border-right: 0 none !default;
8989
$pagination-border-bottom: 0 none !default;
9090
$pagination-border-left: 0 none !default;
91-
$pagination-text-color: #808080 !default;
91+
$pagination-text-color: #808080 !default;

src/app/modules/angular-slickgrid/styles/slick-bootstrap.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
border-right: $header-border-right;
100100
border-bottom: $header-border-bottom;
101101
border-left: $header-border-left;
102-
width: calc(100% - #{$header-scroll-width-to-remove});
102+
width: 100%;
103103
}
104104

105105
.slick-headerrow-columns {
@@ -123,6 +123,7 @@
123123

124124
.slick-header-columns {
125125
background: $table-background;
126+
width: calc(100% - #{$header-scroll-width-to-remove});
126127

127128

128129
.slick-header-sortable {

0 commit comments

Comments
 (0)