mirror of
https://github.com/wassname/slider.git
synced 2026-09-10 12:38:09 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2c41239d90 |
+12
-8
@@ -11,14 +11,14 @@
|
|||||||
@ease-out-quint : cubic-bezier(0.23, 1, 0.32, 1);
|
@ease-out-quint : cubic-bezier(0.23, 1, 0.32, 1);
|
||||||
@ease-in-quint : cubic-bezier(0.755, 0.05, 0.855, 0.06);
|
@ease-in-quint : cubic-bezier(0.755, 0.05, 0.855, 0.06);
|
||||||
|
|
||||||
* {
|
.borderBox() {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
-webkit-tap-highlight-color: rgba(0, 0, 0, 0); // remove tap highlight color for mobile safari
|
-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} {
|
.@{prefixClass} {
|
||||||
@@ -28,6 +28,8 @@
|
|||||||
border-radius: @border-radius-base;
|
border-radius: @border-radius-base;
|
||||||
background-color: #e9e9e9;
|
background-color: #e9e9e9;
|
||||||
|
|
||||||
|
.borderBox();
|
||||||
|
|
||||||
&-track {
|
&-track {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 0;
|
left: 0;
|
||||||
@@ -138,6 +140,8 @@
|
|||||||
z-index: 4;
|
z-index: 4;
|
||||||
visibility: visible;
|
visibility: visible;
|
||||||
|
|
||||||
|
.borderBox();
|
||||||
|
|
||||||
&-hidden {
|
&-hidden {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
@@ -212,9 +216,9 @@
|
|||||||
animation-timing-function: @ease-in-quint;
|
animation-timing-function: @ease-in-quint;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.zoom-motion(zoom-down, zoomDown);
|
.zoom-motion(rc-slider-tooltip-zoom-down, rcSliderTooltipZoomDownOut);
|
||||||
|
|
||||||
@keyframes zoomDownIn {
|
@keyframes rcSliderTooltipZoomDownOutIn {
|
||||||
0% {
|
0% {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transform-origin: 50% 100%;
|
transform-origin: 50% 100%;
|
||||||
@@ -226,7 +230,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes zoomDownOut {
|
@keyframes rcSliderTooltipZoomDownOutOut {
|
||||||
0% {
|
0% {
|
||||||
transform-origin: 50% 100%;
|
transform-origin: 50% 100%;
|
||||||
transform: scale(1, 1);
|
transform: scale(1, 1);
|
||||||
|
|||||||
+1
-1
@@ -11,4 +11,4 @@ function onChange(v){
|
|||||||
|
|
||||||
// React.render(<div style={{width:400,margin:100}}><Slider marks={["一","二","三","四","五"]} defaultIndex={2} /></div>, document.getElementById('__react-content'));
|
// React.render(<div style={{width:400,margin:100}}><Slider marks={["一","二","三","四","五"]} defaultIndex={2} /></div>, document.getElementById('__react-content'));
|
||||||
// React.render(<div style={{width:400,margin:100}}><Slider className='rc-slider' step={20}/></div>, document.getElementById('__react-content'));
|
// React.render(<div style={{width:400,margin:100}}><Slider className='rc-slider' step={20}/></div>, document.getElementById('__react-content'));
|
||||||
React.render(<div style={{width:400,margin:100}}><Slider onChange={onChange} tipTransitionName='zoom-down'/></div>, document.getElementById('__react-content'));
|
React.render(<div style={{width:400,margin:100}}><Slider onChange={onChange} tipTransitionName='rc-slider-tooltip-zoom-down'/></div>, document.getElementById('__react-content'));
|
||||||
|
|||||||
+5
-6
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "rc-slider",
|
"name": "rc-slider",
|
||||||
"version": "1.4.5",
|
"version": "1.5.0",
|
||||||
"description": "slider ui component for react",
|
"description": "slider ui component for react",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"react",
|
"react",
|
||||||
@@ -29,13 +29,13 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "rc-tools run build",
|
"build": "rc-tools run build",
|
||||||
"gh-pages": "rc-tools run gh-pages",
|
"gh-pages": "rc-tools run gh-pages",
|
||||||
"start": "node --harmony node_modules/.bin/rc-server",
|
"start": "rc-server",
|
||||||
"pub": "rc-tools run pub",
|
"pub": "rc-tools run pub",
|
||||||
"lint": "rc-tools run lint",
|
"lint": "rc-tools run lint",
|
||||||
"karma": "rc-tools run karma",
|
"karma": "rc-tools run karma",
|
||||||
"saucelabs": "node --harmony node_modules/.bin/rc-tools run saucelabs",
|
"saucelabs": "rc-tools run saucelabs",
|
||||||
"browser-test": "node --harmony node_modules/.bin/rc-tools run browser-test",
|
"browser-test": "rc-tools run browser-test",
|
||||||
"browser-test-cover": "node --harmony node_modules/.bin/rc-tools run browser-test-cover"
|
"browser-test-cover": "rc-tools run browser-test-cover"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"expect.js": "0.3.x",
|
"expect.js": "0.3.x",
|
||||||
@@ -43,7 +43,6 @@
|
|||||||
"rc-server": "3.x",
|
"rc-server": "3.x",
|
||||||
"rc-tools": "4.x",
|
"rc-tools": "4.x",
|
||||||
"react": "^0.13.x",
|
"react": "^0.13.x",
|
||||||
"node-dev": "2.x",
|
|
||||||
"jquery": "^1.11.2"
|
"jquery": "^1.11.2"
|
||||||
},
|
},
|
||||||
"precommit": [
|
"precommit": [
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
var expect = require('expect.js');
|
var expect = require('expect.js');
|
||||||
var Slider = require('../index.js');
|
var Slider = require('../index.js');
|
||||||
var React = require('react');
|
var React = require('react/addons');
|
||||||
var TestUtils = React.addons.TestUtils;
|
var TestUtils = React.addons.TestUtils;
|
||||||
var Simulate = TestUtils.Simulate;
|
var Simulate = TestUtils.Simulate;
|
||||||
var $ = require('jquery');
|
var $ = require('jquery');
|
||||||
|
|||||||
Reference in New Issue
Block a user