diff --git a/client/components/combobox.jsx b/client/components/combobox.jsx index 25c3bca99..8f6f4ead9 100644 --- a/client/components/combobox.jsx +++ b/client/components/combobox.jsx @@ -7,7 +7,7 @@ const Combobox = createReactClass({ displayName : 'Combobox', getDefaultProps : function() { return { - id : '', + id : '', className : '', trigger : 'hover', default : '', diff --git a/shared/naturalcrit/styles/animations.less b/shared/naturalcrit/styles/animations.less index ccec6e6f5..8d34c8870 100644 --- a/shared/naturalcrit/styles/animations.less +++ b/shared/naturalcrit/styles/animations.less @@ -42,7 +42,6 @@ transition-timing-function : @easing; } - .transition (@prop, @duration: @defaultDuration) { -webkit-transition : @prop @duration, -webkit-transform @duration; -moz-transition : @prop @duration, -moz-transform @duration; @@ -58,13 +57,13 @@ transform : @transform; } - .delay(@delay) { -webkit-transition-delay : @delay; transition-delay : @delay; -webkit-animation-delay : @delay; animation-delay : @delay; } + .keep() { -webkit-animation-fill-mode : forwards; -moz-animation-fill-mode : forwards; @@ -73,7 +72,6 @@ animation-fill-mode : forwards; } - .sequentialDelay(@delayInc : 0.2s, @initialDelay : 0s) { &:nth-child(1) {.delay(0*@delayInc + @initialDelay); } &:nth-child(2) {.delay(1*@delayInc + @initialDelay); } @@ -97,14 +95,12 @@ &:nth-child(20) {.delay(19*@delayInc + @initialDelay); } } - - .createFrames(@name, @from, @to) { @frames: { from { @from(); } to { @to(); } }; - @-webkit-keyframes @name {@frames();} + @-webkit-keyframes @name {@frames();} @-moz-keyframes @name {@frames();} @-ms-keyframes @name {@frames();} @-o-keyframes @name {@frames();} @@ -126,8 +122,6 @@ animation-timing-function : @easing; } - - /*************************** Standard Animations ****************************/ @@ -212,9 +206,6 @@ ); } - - - /*************************** Fun Animations ****************************/