Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
asudoh committed Mar 20, 2019
2 parents bc3fb45 + 497fe4d commit ba3a08f
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/components/pagination/_pagination.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ $css--helpers: true;

.#{$prefix}--pagination__text {
@include typescale('omega');
color: $text-02;
@include type-style('body-short-01');
color: $text-01;
display: none;
padding-right: $spacing-2xs;

Expand Down Expand Up @@ -259,7 +260,7 @@ $css--helpers: true;

.#{$prefix}--pagination .#{$prefix}--select__page-number .#{$prefix}--select__arrow {
@include carbon--breakpoint('md') {
right: 1.6rem;
right: 1.8rem;
}
}

Expand Down Expand Up @@ -300,10 +301,11 @@ $css--helpers: true;

span.#{$prefix}--pagination__text {
margin-left: $carbon--spacing-05;
color: $text-02;
color: $text-01;
}
.#{$prefix}--pagination__text[for='select-id-pagination-page'] {
margin-left: -1rem;

.#{$prefix}--pagination__right span.#{$prefix}--pagination__text {
margin-left: -0.5rem;
}

.#{$prefix}--pagination__button {
Expand Down

0 comments on commit ba3a08f

Please sign in to comment.