Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

Non-visible paging component padding #1935

Merged
merged 15 commits into from
Sep 12, 2018
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
acd45a3
Fixed issue with padding on paging component when it was removed via …
Blackbaud-TrevorBurch Aug 23, 2018
91267df
Merge branch 'master' into 1923-extra-paging-padding-when-empty
Blackbaud-TrevorBurch Aug 28, 2018
ab1f053
Change styles to remove extra divs
Blackbaud-TrevorBurch Aug 29, 2018
a654988
Merge branch 'master' into 1923-extra-paging-padding-when-empty
Blackbaud-TrevorBurch Aug 29, 2018
81e6f26
Merge branch 'master' into 1923-extra-paging-padding-when-empty
Blackbaud-TrevorBurch Aug 29, 2018
ad99533
Merge branch 'master' into 1923-extra-paging-padding-when-empty
Blackbaud-TrevorBurch Aug 31, 2018
b4e7564
Fixed typo
Blackbaud-TrevorBurch Aug 31, 2018
966ddd4
Merge branch 'master' into 1923-extra-paging-padding-when-empty
Blackbaud-TrevorBurch Sep 5, 2018
f79ceb8
Merge branch 'master' into 1923-extra-paging-padding-when-empty
Blackbaud-TrevorBurch Sep 6, 2018
7e59d15
Merge branch 'master' into 1923-extra-paging-padding-when-empty
Blackbaud-TrevorBurch Sep 7, 2018
e56a43d
Merge branch 'master' into 1923-extra-paging-padding-when-empty
Blackbaud-TrevorBurch Sep 7, 2018
3813b1c
Merge branch 'master' of https://github.com/blackbaud/skyux2 into 192…
Blackbaud-TrevorBurch Sep 11, 2018
0cc3e20
Removed old visual test screenshots
Blackbaud-TrevorBurch Sep 12, 2018
266d8dc
Merge branch 'master' into 1923-extra-paging-padding-when-empty
Blackbaud-TrevorBurch Sep 12, 2018
d921bc7
Merge branch 'master' into 1923-extra-paging-padding-when-empty
Blackbaud-TrevorBurch Sep 12, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions src/modules/list-paging/list-paging.component.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<div>
<sky-paging
[pageSize]="itemsPerPage | async"
[maxPages]="maxDisplayedPages | async"
[currentPage]="currentPageNumber | async"
[itemCount]="itemCount | async"
(currentPageChange)="pageChange($event)"
>
</sky-paging>
</div>
<sky-paging
[pageSize]="itemsPerPage | async"
[maxPages]="maxDisplayedPages | async"
[currentPage]="currentPageNumber | async"
[itemCount]="itemCount | async"
(currentPageChange)="pageChange($event)"
>
</sky-paging>
3 changes: 1 addition & 2 deletions src/modules/paging/paging.component.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<ul
<ul *ngIf="pageCount > 10"
role="navigation"
*ngIf="pageCount > 1"
[attr.aria-label]="pagingLabel || 'paging_label' | skyResources"
>
<li>
Expand Down
81 changes: 40 additions & 41 deletions src/modules/paging/paging.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,48 @@

:host {
display: block;
margin-top: $sky-margin-plus-half;
}

ul {
margin: 0;
display: inline-block;
padding-left: 0;
border-radius: 4px;
}
ul {
margin: $sky-margin-plus-half 0 0 0;
display: inline-block;
padding-left: 0;
border-radius: 4px;
}

li {
display: inline;

a {
background-color: $sky-color-white;
color: inherit;
@include sky-border(light, top, right, bottom, left);
float: left;
margin-left: -1px;
padding: 4px 10px;
text-decoration: none;
line-height: 1.42857;
font-size: $sky-font-size-base;
cursor: pointer;

&.sky-paging-caret {
padding-left: 8.5px;
padding-right: 8.5px;
transform: none;
}

&.sky-paging-current {
background-color: $sky-background-color-neutral-light;
}

&:hover {
background-color: darken($sky-background-color-neutral-light, 10%);
}

li {
display: inline;

a {
background-color: $sky-color-white;
color: inherit;
@include sky-border(light, top, right, bottom, left);
float: left;
margin-left: -1px;
padding: 4px 10px;
text-decoration: none;
line-height: 1.42857;
font-size: $sky-font-size-base;
cursor: pointer;

&.sky-paging-caret {
padding-left: 8.5px;
padding-right: 8.5px;
transform: none;
}

&.sky-paging-current {
background-color: $sky-background-color-neutral-light;
}

&:hover {
background-color: darken($sky-background-color-neutral-light, 10%);
}

&.sky-paging-disabled {
color: $sky-text-color-deemphasized;
cursor: not-allowed;
pointer-events: none;
}
&.sky-paging-disabled {
color: $sky-text-color-deemphasized;
cursor: not-allowed;
pointer-events: none;
}
}
}