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

Commit d1dbc8c

Browse files
Ghislain BeaulacGhislain Beaulac
authored andcommitted
tweaked pagination styling & cleanup some code
1 parent 8b6bf95 commit d1dbc8c

File tree

7 files changed

+15
-14
lines changed

7 files changed

+15
-14
lines changed

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@ This is a work in progress, but so far here are some of the features that `angul
3131
- Integrated Plugins.
3232
- Column Picker (show/hide any column by doing `right+click` in the header, click [here to see print screen](/screenshots/columnPicker.png)).
3333
- ... more to come
34-
- Server side (backend) services
35-
- Filtering, Sorting, Pagination
36-
- [GraphQL](https://github.com/ghiscoding/Angular-Slickgrid/wiki/GraphQL)
37-
- [OData](https://github.com/ghiscoding/Angular-Slickgrid/wiki/OData)
34+
- Server side (backend) Services (filtering, sorting, pagination)
35+
- [GraphQL](https://github.com/ghiscoding/Angular-Slikgrid/wiki/GraphQL)
36+
- [OData](https://github.com/ghiscoding/Angular-Slickgrid/wiki/OData)
3837
- Some Features of SlickGrid itself which are working out of the gate
3938
- Sort/Multi-Sort (client/server side)
4039
- Header Row with Filters (currently support `Input` and `Select` dropdown, multi-select is planned)

src/app/app.component.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
<li routerLinkActive="active">
2626
<a [routerLink]="['/clientside']">Client Side Sort/Filter</a>
2727
</li>
28-
<li routerLinkActive="active">
29-
<a [routerLink]="['/backend']">Backend Server</a>
30-
</li>
3128
<li routerLinkActive="active">
3229
<a [routerLink]="['/odata']">Backend Server with OData</a>
3330
</li>

src/app/examples/grid-graphql.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ export class GridGraphqlComponent implements OnInit {
6969
preProcess: () => this.displaySpinner(true),
7070
process: (query) => this.getCustomerApiCall(query),
7171
postProcess: (response) => {
72-
console.log(response);
7372
this.displaySpinner(false);
7473
this.getCustomerCallback(response);
7574
},

src/app/modules/angular-slickgrid/components/angular-slickgrid.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ export class AngularSlickgridComponent implements AfterViewInit, OnInit {
163163
// resize the grid inside a slight timeout, in case other DOM element changed prior to the resize (like a filter/pagination changed)
164164
setTimeout(() => {
165165
this.resizer.resizeGrid(this.grid, this._gridOptions);
166-
this.grid.autosizeColumns();
166+
// this.grid.autosizeColumns();
167167
});
168168
}
169169
}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,14 @@ $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: 16px !default; // without this, the header (which doesn't have scrolling) will be wider than the data viewport
53+
$header-scroll-width-to-remove: 18px !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;
6061
$table-background: transparent !default;
6162
$container-border: 0px solid $border-color !default;
6263
$link-color: #08c !default;
@@ -75,8 +76,8 @@ $column-picker-close-border: 1px solid #9c9c9c !default;
7576
$column-picker-close-opacity: 0.9 !default;
7677

7778
/* pagination variables */
78-
$pagination-text-color: #808080 !default;
79-
$pagination-border-color: #bbb !default;
79+
$pagination-button-hover-color: #E6E6E6 !default;
80+
$pagination-border-color: #ddd !default;
8081
$pagination-icon-seek-first: "\f100" !default;
8182
$pagination-icon-seek-end: "\f101" !default;
8283
$pagination-icon-seek-next: "\f105" !default;
@@ -87,3 +88,4 @@ $pagination-border-top: 0 none !default;
8788
$pagination-border-right: 0 none !default;
8889
$pagination-border-bottom: 0 none !default;
8990
$pagination-border-left: 0 none !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
@@ -176,10 +176,11 @@
176176
.slick-sort-indicator {
177177
position: absolute;
178178
display: inline-block;
179+
color: $icon-sort-color;
179180
width: 8px;
180181
height: 5px;
181182
left: auto;
182-
right: 7px;
183+
right: 10px;
183184
top: ((15px * $header-row-count) - 15px);
184185
}
185186

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* pagination/pagination variables */
2-
@import './variables.scss';
2+
@import './variables';
33

44
/* Pagination styling */
55
.slick-pagination {
@@ -61,6 +61,9 @@
6161

6262
border-color: $pagination-button-border;
6363
}
64+
a[class*="icon-seek-"]:hover {
65+
background-color: $pagination-button-hover-color;
66+
}
6467

6568
.icon-seek-first {
6669
&:before {

0 commit comments

Comments
 (0)