archive-gh-me/tailwindcss
1
0
Fork 0
mirror of https://github.com/tailwindlabs/tailwindcss.git synced 2025-12-08 21:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Adam Wathan 2018-03-13 07:50:33 -04:00
commit cf77601bcf
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
__tests__/fixtures/tailwind-output.css
View File

@ -2219,6 +2219,10 @@ button,
cursor: not-allowed;
}
.cursor-wait {
cursor: wait;
}
.block {
display: block;
}
@ -6106,6 +6110,10 @@ button,
cursor: not-allowed;
}
.sm\:cursor-wait {
cursor: wait;
}
.sm\:block {
display: block;
}
@ -9986,6 +9994,10 @@ button,
cursor: not-allowed;
}
.md\:cursor-wait {
cursor: wait;
}
.md\:block {
display: block;
}
@ -13866,6 +13878,10 @@ button,
cursor: not-allowed;
}
.lg\:cursor-wait {
cursor: wait;
}
.lg\:block {
display: block;
}
@ -17746,6 +17762,10 @@ button,
cursor: not-allowed;
}
.xl\:cursor-wait {
cursor: wait;
}
.xl\:block {
display: block;
}

1
src/generators/cursor.js
View File

@ -6,5 +6,6 @@ export default function() {
'cursor-default': { cursor: 'default' },
'cursor-pointer': { cursor: 'pointer' },
'cursor-not-allowed': { cursor: 'not-allowed' },
'cursor-wait': { cursor: 'wait' },
})
}