diff --git a/assets/index.less b/assets/index.less
index 017301a..08688af 100644
--- a/assets/index.less
+++ b/assets/index.less
@@ -11,14 +11,14 @@
@ease-out-quint : cubic-bezier(0.23, 1, 0.32, 1);
@ease-in-quint : cubic-bezier(0.755, 0.05, 0.855, 0.06);
-* {
+.borderBox() {
box-sizing: border-box;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0); // remove tap highlight color for mobile safari
-}
-*:before,
-*:after {
- box-sizing: border-box;
+ * {
+ box-sizing: border-box;
+ -webkit-tap-highlight-color: rgba(0, 0, 0, 0); // remove tap highlight color for mobile safari
+ }
}
.@{prefixClass} {
@@ -28,6 +28,8 @@
border-radius: @border-radius-base;
background-color: #e9e9e9;
+ .borderBox();
+
&-track {
position: absolute;
left: 0;
@@ -138,6 +140,8 @@
z-index: 4;
visibility: visible;
+ .borderBox();
+
&-hidden {
display: none;
}
@@ -212,9 +216,9 @@
animation-timing-function: @ease-in-quint;
}
}
-.zoom-motion(zoom-down, zoomDown);
+.zoom-motion(rc-slider-tooltip-zoom-down, rcSliderTooltipZoomDownOut);
-@keyframes zoomDownIn {
+@keyframes rcSliderTooltipZoomDownOutIn {
0% {
opacity: 0;
transform-origin: 50% 100%;
@@ -226,7 +230,7 @@
}
}
-@keyframes zoomDownOut {
+@keyframes rcSliderTooltipZoomDownOutOut {
0% {
transform-origin: 50% 100%;
transform: scale(1, 1);
diff --git a/examples/simple.js b/examples/simple.js
index 4b86143..af1c84f 100644
--- a/examples/simple.js
+++ b/examples/simple.js
@@ -11,4 +11,4 @@ function onChange(v){
// React.render(
, document.getElementById('__react-content'));
// React.render(
, document.getElementById('__react-content'));
-React.render(
, document.getElementById('__react-content'));
+React.render(
, document.getElementById('__react-content'));
diff --git a/package.json b/package.json
index 1cba782..c45786c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "rc-slider",
- "version": "1.4.5",
+ "version": "1.5.0",
"description": "slider ui component for react",
"keywords": [
"react",
@@ -29,13 +29,13 @@
"scripts": {
"build": "rc-tools run build",
"gh-pages": "rc-tools run gh-pages",
- "start": "node --harmony node_modules/.bin/rc-server",
+ "start": "rc-server",
"pub": "rc-tools run pub",
"lint": "rc-tools run lint",
"karma": "rc-tools run karma",
- "saucelabs": "node --harmony node_modules/.bin/rc-tools run saucelabs",
- "browser-test": "node --harmony node_modules/.bin/rc-tools run browser-test",
- "browser-test-cover": "node --harmony node_modules/.bin/rc-tools run browser-test-cover"
+ "saucelabs": "rc-tools run saucelabs",
+ "browser-test": "rc-tools run browser-test",
+ "browser-test-cover": "rc-tools run browser-test-cover"
},
"devDependencies": {
"expect.js": "0.3.x",
@@ -43,7 +43,6 @@
"rc-server": "3.x",
"rc-tools": "4.x",
"react": "^0.13.x",
- "node-dev": "2.x",
"jquery": "^1.11.2"
},
"precommit": [
diff --git a/tests/index.spec.js b/tests/index.spec.js
index 96cfe7b..1e44888 100644
--- a/tests/index.spec.js
+++ b/tests/index.spec.js
@@ -1,7 +1,7 @@
var expect = require('expect.js');
var Slider = require('../index.js');
-var React = require('react');
+var React = require('react/addons');
var TestUtils = React.addons.TestUtils;
var Simulate = TestUtils.Simulate;
var $ = require('jquery');