Skip to content

Commit

Permalink
Merge branch 'ryanscherler-patch-1' into 0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
adamwathan committed Mar 13, 2018
2 parents a2ffc0d + 1b24db9 commit 79b09dc
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 21 deletions.
60 changes: 40 additions & 20 deletions __tests__/fixtures/tailwind-output.css
Original file line number Diff line number Diff line change
Expand Up @@ -2219,14 +2219,18 @@ button,
cursor: pointer;
}

.cursor-not-allowed {
cursor: not-allowed;
}

.cursor-wait {
cursor: wait;
}

.cursor-move {
cursor: move;
}

.cursor-not-allowed {
cursor: not-allowed;
}

.block {
display: block;
}
Expand Down Expand Up @@ -6124,14 +6128,18 @@ button,
cursor: pointer;
}

.sm\:cursor-not-allowed {
cursor: not-allowed;
}

.sm\:cursor-wait {
cursor: wait;
}

.sm\:cursor-move {
cursor: move;
}

.sm\:cursor-not-allowed {
cursor: not-allowed;
}

.sm\:block {
display: block;
}
Expand Down Expand Up @@ -10022,14 +10030,18 @@ button,
cursor: pointer;
}

.md\:cursor-not-allowed {
cursor: not-allowed;
}

.md\:cursor-wait {
cursor: wait;
}

.md\:cursor-move {
cursor: move;
}

.md\:cursor-not-allowed {
cursor: not-allowed;
}

.md\:block {
display: block;
}
Expand Down Expand Up @@ -13920,14 +13932,18 @@ button,
cursor: pointer;
}

.lg\:cursor-not-allowed {
cursor: not-allowed;
}

.lg\:cursor-wait {
cursor: wait;
}

.lg\:cursor-move {
cursor: move;
}

.lg\:cursor-not-allowed {
cursor: not-allowed;
}

.lg\:block {
display: block;
}
Expand Down Expand Up @@ -17818,14 +17834,18 @@ button,
cursor: pointer;
}

.xl\:cursor-not-allowed {
cursor: not-allowed;
}

.xl\:cursor-wait {
cursor: wait;
}

.xl\:cursor-move {
cursor: move;
}

.xl\:cursor-not-allowed {
cursor: not-allowed;
}

.xl\:block {
display: block;
}
Expand Down
3 changes: 2 additions & 1 deletion src/generators/cursor.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ export default function() {
'cursor-auto': { cursor: 'auto' },
'cursor-default': { cursor: 'default' },
'cursor-pointer': { cursor: 'pointer' },
'cursor-not-allowed': { cursor: 'not-allowed' },
'cursor-wait': { cursor: 'wait' },
'cursor-move': { cursor: 'move' },
'cursor-not-allowed': { cursor: 'not-allowed' },
})
}

0 comments on commit 79b09dc

Please sign in to comment.