Skip to content

Commit

Permalink
Merge 592ccf2 into 650faff
Browse files Browse the repository at this point in the history
  • Loading branch information
anicholls committed Mar 10, 2020
2 parents 650faff + 592ccf2 commit 9985be7
Show file tree
Hide file tree
Showing 44 changed files with 3,152 additions and 3,691 deletions.
2 changes: 1 addition & 1 deletion cypress/integration/Button.spec.ts
Expand Up @@ -7,7 +7,7 @@ describe('Button', () => {

context('given primary buttons are rendered', () => {
beforeEach(() => {
h.stories.load('Components|Buttons/Button/React', 'Primary');
h.stories.load('Components|Buttons/Button/React/Standard', 'Primary');
});

it('should not have any axe errors', () => {
Expand Down
2 changes: 1 addition & 1 deletion eslintrc.js
Expand Up @@ -75,7 +75,7 @@ module.exports = {
'no-param-reassign': 'error',
'no-undef-init': 'error',
'no-unused-labels': 'error',
'no-use-before-define': 'warn', // Decide on this
'no-use-before-define': ['warn', {functions: false, classes: true}],
'no-var': 'error',
'prefer-const': 'error',
'quote-props': 'off',
Expand Down
8 changes: 6 additions & 2 deletions modules/_labs/pagination/react/lib/Pages.tsx
Expand Up @@ -19,17 +19,21 @@ const noPointerEvents = css({
pointerEvents: 'none',
});

const autoWidth = css({
width: 'auto',
});

const ellipsisStyle = css(noPointerEvents, {
width: canvas.spacing.l,
textAlign: 'center',
display: 'inline-block',
});

const noTransitions = css({
const noTransitions = css(autoWidth, {
'&:not(:hover)': {transition: 'none !important'},
});

const activeStyling = css(noPointerEvents, noTransitions, {
const activeStyling = css(noPointerEvents, noTransitions, autoWidth, {
color: canvas.colors.frenchVanilla100,
});

Expand Down

0 comments on commit 9985be7

Please sign in to comment.