Merge branch 'release/0.3.4'

ecomfe · May 12, 2014 · 2901fc3 · 2901fc3
2 parents 41774c6 + c666aae
commit 2901fc3
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 5 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -10,7 +10,15 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[**.js,**.css,**.less,**.styl,**.html,**.tpl]
+[**.js]
+indent_style = space
+indent_size = 4
+
+[**.styl]
+indent_style = space
+indent_size = 4
+
+[**.html]
 indent_style = space
 indent_size = 4
 

diff --git a/History.md b/History.md
@@ -1,4 +1,10 @@
 
+0.3.4 / 2014-05-12
+==================
+
+ * **增加** 动画 `slideInUp`，`slideOutDown`
+ * 升级开发依赖并测试，其中将 `stylus` 升级至 `0.45.0`
+
 0.3.3 / 2014-04-28
 ==================
 

diff --git a/lib/rider/animate/slideInUp.styl b/lib/rider/animate/slideInUp.styl
@@ -0,0 +1,7 @@
+@keyframes slideInUp
+    0%
+        opacity: 0
+        transform: translateY(2000px)
+    100%
+        opacity: 1
+        transform: translateX(0)
diff --git a/lib/rider/animate/slideOutDown.styl b/lib/rider/animate/slideOutDown.styl
@@ -0,0 +1,6 @@
+@keyframes slideOutDown
+    0%
+        transform: translateX(0)
+    100%
+        opacity: 0
+        transform: translateY(2000px)
diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
     "name": "rider",
-    "version": "0.3.3",
+    "version": "0.3.4",
     "description": "Rider is a CSS library to focus on Mobile Web, build on top of Stylus.",
     "maintainers": [
         { "name": "Firede", "email": "firede@firede.us" }
     ],
     "devDependencies": {
-        "autoprefixer": "~1.1.20140410",
-        "stylus": "~0.44.0",
-        "express": "~4.1.1",
+        "autoprefixer": "~1.1.20140510",
+        "stylus": "~0.45.0",
+        "express": "~4.2.0",
         "ejs": "~1.0.0",
         "mocha": "~1.18.2",
         "should": "~3.3.1"