Fix conflicts, update tests

This commit is contained in:
Adam Wathan 2019-04-27 10:42:19 -04:00
commit e9d8d7f45f
3 changed files with 41 additions and 0 deletions

View File

@ -3254,6 +3254,10 @@ video {
cursor: wait !important;
}
.cursor-text {
cursor: text !important;
}
.cursor-move {
cursor: move !important;
}
@ -10067,6 +10071,10 @@ video {
cursor: wait !important;
}
.sm\:cursor-text {
cursor: text !important;
}
.sm\:cursor-move {
cursor: move !important;
}
@ -16865,6 +16873,10 @@ video {
cursor: wait !important;
}
.md\:cursor-text {
cursor: text !important;
}
.md\:cursor-move {
cursor: move !important;
}
@ -23663,6 +23675,10 @@ video {
cursor: wait !important;
}
.lg\:cursor-text {
cursor: text !important;
}
.lg\:cursor-move {
cursor: move !important;
}
@ -30461,6 +30477,10 @@ video {
cursor: wait !important;
}
.xl\:cursor-text {
cursor: text !important;
}
.xl\:cursor-move {
cursor: move !important;
}

View File

@ -3254,6 +3254,10 @@ video {
cursor: wait;
}
.cursor-text {
cursor: text;
}
.cursor-move {
cursor: move;
}
@ -10067,6 +10071,10 @@ video {
cursor: wait;
}
.sm\:cursor-text {
cursor: text;
}
.sm\:cursor-move {
cursor: move;
}
@ -16865,6 +16873,10 @@ video {
cursor: wait;
}
.md\:cursor-text {
cursor: text;
}
.md\:cursor-move {
cursor: move;
}
@ -23663,6 +23675,10 @@ video {
cursor: wait;
}
.lg\:cursor-text {
cursor: text;
}
.lg\:cursor-move {
cursor: move;
}
@ -30461,6 +30477,10 @@ video {
cursor: wait;
}
.xl\:cursor-text {
cursor: text;
}
.xl\:cursor-move {
cursor: move;
}

View File

@ -258,6 +258,7 @@ module.exports = {
default: 'default',
pointer: 'pointer',
wait: 'wait',
text: 'text',
move: 'move',
'not-allowed': 'not-allowed',
},