Merge branch 'release/1.7.6'

LucasMateijsen · Aug 4, 2014 · a3edb85 · a3edb85
2 parents 5ce3a75 + 94981d0
commit a3edb85
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "elessar",
-  "version": "1.7.5",
+  "version": "1.7.6",
   "description": "Draggable multiple range sliders",
   "authors": [
     "Matt Brennan <[email protected]>"

diff --git a/elessar.css b/elessar.css
@@ -45,6 +45,7 @@
 }
 .elessar-range {
   position: absolute;
+  cursor: pointer;
   cursor: -webkit-grab;
   cursor: -moz-grab;
   cursor: grab;
@@ -81,6 +82,12 @@
   height: 30px;
   line-height: 30px;
   background: #ccc;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 .elessar-delete-confirm {
   background: red;
@@ -106,6 +113,7 @@ body.elessar-resizing.elessar-resizing-vertical .handle {
 body.elessar-dragging,
 body.elessar-dragging .bar,
 body.elessar-dragging .handle {
+  cursor: move !important;
   cursor: -webkit-grabbing !important;
   cursor: -moz-grabbing !important;
   cursor: grabbing !important;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "elessar",
-  "version": "1.7.5",
+  "version": "1.7.6",
   "description": "Draggable multiple range sliders",
   "main": "lib/rangebar.js",
   "author": "Matt Brennan <[email protected]>",