diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f2f46f..8887308 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Version 1.1.0 (2018-06-21) + +- Remove cursor files. Support for `grab`, `-webkit-grab`, `grabbing`, and `-webkit-grabbing` is good enough. + ## Version 1.0.0 (2018-06-13) - Migrate to Dart 2. diff --git a/example/basic/example.css b/example/basic/example.css index c9c6f1a..94d4261 100644 --- a/example/basic/example.css +++ b/example/basic/example.css @@ -28,8 +28,9 @@ body { .document { margin-top: 10px; display: block; - cursor: url(packages/dnd/cursor/openhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/openhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: pointer; + cursor: grab; + cursor: -webkit-grab; } .dnd-over { @@ -42,6 +43,7 @@ body { .dnd-dragging, .dnd-drag-occurring { - cursor: url(packages/dnd/cursor/closedhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/closedhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: default; + cursor: grabbing; + cursor: -webkit-grabbing; } diff --git a/example/cancel/example.css b/example/cancel/example.css index aef9e8c..17d20c3 100644 --- a/example/cancel/example.css +++ b/example/cancel/example.css @@ -1,4 +1,5 @@ -html, body { +html, +body { height: 100%; } @@ -23,8 +24,9 @@ body { height: 210px; background: #cddc39; border-radius: 8px; - cursor: url(packages/dnd/cursor/openhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/openhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: pointer; + cursor: grab; + cursor: -webkit-grab; } .no-drag { @@ -48,12 +50,13 @@ button { height: 30px; } - -.dnd-draggable, .dnd-drag-occurring { - cursor: url(packages/dnd/cursor/closedhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/closedhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ +.dnd-draggable, +.dnd-drag-occurring { + cursor: default; + cursor: grabbing; + cursor: -webkit-grabbing; } .dnd-dragging { opacity: 0.5; -} \ No newline at end of file +} diff --git a/example/custom_acceptor/example.css b/example/custom_acceptor/example.css index 4b02868..ac566bd 100644 --- a/example/custom_acceptor/example.css +++ b/example/custom_acceptor/example.css @@ -24,8 +24,9 @@ body { background: #cddc39; border-radius: 8px; text-align: center; - cursor: url(packages/dnd/cursor/openhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/openhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: pointer; + cursor: grab; + cursor: -webkit-grab; } .draggable p { @@ -72,6 +73,7 @@ body { .dnd-dragging, .dnd-drag-occurring { - cursor: url(packages/dnd/cursor/closedhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/closedhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: default; + cursor: grabbing; + cursor: -webkit-grabbing; } diff --git a/example/custom_avatar/example.css b/example/custom_avatar/example.css index fd00344..589187e 100644 --- a/example/custom_avatar/example.css +++ b/example/custom_avatar/example.css @@ -28,8 +28,9 @@ body { .document { margin-top: 10px; display: block; - cursor: url(packages/dnd/cursor/openhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/openhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: pointer; + cursor: grab; + cursor: -webkit-grab; } .dnd-over { @@ -40,7 +41,9 @@ body { opacity: 0.5; } -.dnd-dragging, .dnd-drag-occurring { - cursor: url(packages/dnd/cursor/closedhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/closedhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ +.dnd-dragging, +.dnd-drag-occurring { + cursor: default; + cursor: grabbing; + cursor: -webkit-grabbing; } diff --git a/example/detection_only/example.css b/example/detection_only/example.css index f1f75d0..f7ad2ac 100644 --- a/example/detection_only/example.css +++ b/example/detection_only/example.css @@ -1,4 +1,5 @@ -html, body { +html, +body { height: 100%; } @@ -22,8 +23,9 @@ body { height: 120px; background: #cddc39; border-radius: 8px; - cursor: url(packages/dnd/cursor/openhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/openhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: pointer; + cursor: grab; + cursor: -webkit-grab; } .draggable p { @@ -36,8 +38,9 @@ body { opacity: 0.7; } -.dnd-dragging, .dnd-drag-occurring { - cursor: url(packages/dnd/cursor/closedhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/closedhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ +.dnd-dragging, +.dnd-drag-occurring { + cursor: default; + cursor: grabbing; + cursor: -webkit-grabbing; } - diff --git a/example/free_dragging/example.css b/example/free_dragging/example.css index bf83e8e..dedeb2f 100644 --- a/example/free_dragging/example.css +++ b/example/free_dragging/example.css @@ -1,4 +1,5 @@ -html, body { +html, +body { height: 100%; } @@ -22,8 +23,9 @@ body { height: 120px; background: #cddc39; border-radius: 8px; - cursor: url(packages/dnd/cursor/openhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/openhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: pointer; + cursor: grab; + cursor: -webkit-grab; } .draggable p { @@ -37,8 +39,9 @@ body { opacity: 0.5; } -.dnd-dragging, .dnd-drag-occurring { - cursor: url(packages/dnd/cursor/closedhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/closedhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ +.dnd-dragging, +.dnd-drag-occurring { + cursor: default; + cursor: grabbing; + cursor: -webkit-grabbing; } - diff --git a/example/handle/example.css b/example/handle/example.css index f388403..04a7fce 100644 --- a/example/handle/example.css +++ b/example/handle/example.css @@ -1,4 +1,5 @@ -html, body { +html, +body { height: 100%; } @@ -32,15 +33,18 @@ body { top: 35px; border-radius: 8px; background-color: #afb42b; - cursor: url(packages/dnd/cursor/openhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/openhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: pointer; + cursor: grab; + cursor: -webkit-grab; } -.dnd-draggable, .dnd-drag-occurring { - cursor: url(packages/dnd/cursor/closedhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/closedhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ +.dnd-draggable, +.dnd-drag-occurring { + cursor: default; + cursor: grabbing; + cursor: -webkit-grabbing; } .dnd-dragging { opacity: 0.5; -} \ No newline at end of file +} diff --git a/example/horizontal_only/example.css b/example/horizontal_only/example.css index bf83e8e..dedeb2f 100644 --- a/example/horizontal_only/example.css +++ b/example/horizontal_only/example.css @@ -1,4 +1,5 @@ -html, body { +html, +body { height: 100%; } @@ -22,8 +23,9 @@ body { height: 120px; background: #cddc39; border-radius: 8px; - cursor: url(packages/dnd/cursor/openhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/openhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: pointer; + cursor: grab; + cursor: -webkit-grab; } .draggable p { @@ -37,8 +39,9 @@ body { opacity: 0.5; } -.dnd-dragging, .dnd-drag-occurring { - cursor: url(packages/dnd/cursor/closedhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/closedhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ +.dnd-dragging, +.dnd-drag-occurring { + cursor: default; + cursor: grabbing; + cursor: -webkit-grabbing; } - diff --git a/example/nested_dropzones/example.css b/example/nested_dropzones/example.css index 4d9339e..44dc8f1 100644 --- a/example/nested_dropzones/example.css +++ b/example/nested_dropzones/example.css @@ -25,8 +25,9 @@ body { height: 50px; background: #cddc39; border-radius: 8px; - cursor: url(packages/dnd/cursor/openhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/openhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: pointer; + cursor: grab; + cursor: -webkit-grab; } .draggable p { @@ -55,8 +56,9 @@ body { .dnd-draggable, .dnd-drag-occurring { - cursor: url(packages/dnd/cursor/closedhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/closedhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: default; + cursor: grabbing; + cursor: -webkit-grabbing; } .dnd-dragging { diff --git a/example/nested_elements/example.css b/example/nested_elements/example.css index 7d2e325..879a3d3 100644 --- a/example/nested_elements/example.css +++ b/example/nested_elements/example.css @@ -25,8 +25,9 @@ body { height: 50px; background: #cddc39; border-radius: 8px; - cursor: url(packages/dnd/cursor/openhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/openhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: pointer; + cursor: grab; + cursor: -webkit-grab; } .draggable p { @@ -68,8 +69,9 @@ button { .dnd-draggable, .dnd-drag-occurring { - cursor: url(packages/dnd/cursor/closedhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/closedhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: default; + cursor: grabbing; + cursor: -webkit-grabbing; } .dnd-dragging { diff --git a/example/parent_offset/example.css b/example/parent_offset/example.css index 67ac891..fd5cf19 100644 --- a/example/parent_offset/example.css +++ b/example/parent_offset/example.css @@ -1,4 +1,5 @@ -html, body { +html, +body { height: 100%; } @@ -26,8 +27,9 @@ body { height: 120px; background: #cddc39; border-radius: 8px; - cursor: url(../packages/dnd/cursor/openhand.cur), move; /* Cursor for IE. */ - cursor: url(../packages/dnd/cursor/openhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: pointer; + cursor: grab; + cursor: -webkit-grab; } .draggable p { @@ -41,7 +43,9 @@ body { opacity: 0.5; } -.dnd-dragging, .dnd-drag-occurring { - cursor: url(../packages/dnd/cursor/closedhand.cur), move; /* Cursor for IE. */ - cursor: url(../packages/dnd/cursor/closedhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ -} \ No newline at end of file +.dnd-dragging, +.dnd-drag-occurring { + cursor: default; + cursor: grabbing; + cursor: -webkit-grabbing; +} diff --git a/example/scroll_offset/example.css b/example/scroll_offset/example.css index 5de848a..5ea5f0b 100644 --- a/example/scroll_offset/example.css +++ b/example/scroll_offset/example.css @@ -27,8 +27,9 @@ body { height: 120px; background: #cddc39; border-radius: 8px; - cursor: url(../packages/dnd/cursor/openhand.cur), move; /* Cursor for IE. */ - cursor: url(../packages/dnd/cursor/openhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: pointer; + cursor: grab; + cursor: -webkit-grab; } .draggable p { @@ -53,8 +54,9 @@ body { .dnd-dragging, .dnd-drag-occurring { - cursor: url(../packages/dnd/cursor/closedhand.cur), move; /* Cursor for IE. */ - cursor: url(../packages/dnd/cursor/closedhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: default; + cursor: grabbing; + cursor: -webkit-grabbing; } .dnd-over { diff --git a/example/simple_sortable/example.css b/example/simple_sortable/example.css index 00ac1e5..1113b3b 100644 --- a/example/simple_sortable/example.css +++ b/example/simple_sortable/example.css @@ -23,9 +23,10 @@ body { height: 120px; background: #cddc39; border-radius: 8px; - cursor: url(packages/dnd/cursor/openhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/openhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ box-sizing: border-box; + cursor: pointer; + cursor: grab; + cursor: -webkit-grab; } .sortable p { @@ -41,8 +42,9 @@ body { .dnd-dragging, .dnd-drag-occurring { - cursor: url(packages/dnd/cursor/closedhand.cur), move; /* Cursor for IE. */ - cursor: url(packages/dnd/cursor/closedhand.cur) 7 5, move; /* Cursor for FF and Chrome (setting midpoint). */ + cursor: default; + cursor: grabbing; + cursor: -webkit-grabbing; } .dnd-over { diff --git a/lib/cursor/README.md b/lib/cursor/README.md deleted file mode 100644 index 78a774b..0000000 --- a/lib/cursor/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# Cursor Source - -Cursor files are from Google: - -* https://mail.google.com/mail/u/0/images/2/openhand.cur -* https://mail.google.com/mail/u/0/images/2/closedhand.cur - -or - -* http://maps.google.com/mapfiles/openhand.cur -* http://maps.google.com/mapfiles/closedhand.cur \ No newline at end of file diff --git a/lib/cursor/closedhand.cur b/lib/cursor/closedhand.cur deleted file mode 100644 index 41aaa62..0000000 Binary files a/lib/cursor/closedhand.cur and /dev/null differ diff --git a/lib/cursor/openhand.cur b/lib/cursor/openhand.cur deleted file mode 100644 index fba3ddc..0000000 Binary files a/lib/cursor/openhand.cur and /dev/null differ diff --git a/pubspec.yaml b/pubspec.yaml index 74ea17e..4ee43ad 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,10 +1,10 @@ name: dnd -version: 1.0.0 +version: 1.0.1 author: Marco Jakob description: Drag and Drop for Dart web apps with mouse and touch support. homepage: http://code.makery.ch/library/dart-drag-and-drop/ environment: - sdk: '>=2.0.0-dev.46.0 <2.0.0' + sdk: '>=2.0.0-dev.63.0 <2.0.0' dev_dependencies: build_runner: ^0.8.9 build_web_compilers: ^0.4.0 \ No newline at end of file