Merge branch 'release/0.4.2'

ecomfe · Aug 5, 2014 · cd13de7 · cd13de7
2 parents ab0c1e8 + 2a0160c
commit cd13de7
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 13 deletions.
diff --git a/History.md b/History.md
@@ -1,5 +1,11 @@
 
-0.4.0 / 2014-06-13 
+0.4.2 / 2014-08-05
+==================
+
+ * **增加** `nav` 元素的 `tap-highlight` 修复
+ * 升级开发依赖并测试，其中将 `stylus` 升级至 `0.47.3`
+
+0.4.0 / 2014-06-13
 ==================
 
  * **修复** breakpoint 对切片边界值的处理

diff --git a/demo/server.js b/demo/server.js
@@ -15,7 +15,7 @@ function compile(str, filePath) {
 }
 
 function prefixer(err, css) {
-    return ap('android >= 2.3', 'ios >= 5', 'ie 10').process(css).css;
+    return ap('Android >= 2.3', 'iOS >= 5', 'ExplorerMobile >= 10').process(css).css;
 }
 
 app.set('views', path.join(__dirname, '/views'));
@@ -36,7 +36,7 @@ app.get('/:page?', function (req, res) {
         res.render(page);
     }
     else {
-        res.send(404);
+        res.status(404).end();
     }
 });
 

diff --git a/doc/api.md b/doc/api.md
@@ -177,7 +177,7 @@ normalize-form()
 ```haml
 .box
     margin: _ 5px
-    // => margin-right: 5px; padding-left: 5px;
+    // => margin-right: 5px; margin-left: 5px;
 ```
 
 ### border-color: border-top-color border-right-color border-bottom-color border-left-color

diff --git a/lib/rider/animate.styl b/lib/rider/animate.styl
@@ -7,7 +7,7 @@
 
 animate($name, $duration = 1s, $fill-mode = both)
     /
-        @require(pathjoin('animate', $name))
+        @require pathjoin('animate', $name)
 
     if mixin != 'root'
         $fill-mode = unquote($fill-mode) if typeof($fill-mode) == 'string'

diff --git a/lib/rider/initialize.styl b/lib/rider/initialize.styl
@@ -1,5 +1,5 @@
 // initialize
-// 
+//
 // @author  firede(firede@firede.us)
 
 
@@ -104,7 +104,7 @@ initialize()
     fieldset, form, label, legend,
     table, caption, tbody, tfoot, thead, tr, th, td,
     article, aside, canvas, details, embed,
-    figure, figcaption, footer, header, hgroup, 
+    figure, figcaption, footer, header, hgroup,
     menu, nav, ruby, section, summary,
     time, mark, audio, video
         reset-box-model()
@@ -157,7 +157,8 @@ initialize()
 
     // tap highlight color
     if $-prevent-tap-highlight == true
-        a
+        a,
+        nav
             -webkit-tap-highlight-color: rgba(0, 0, 0, 0)
             -webkit-tap-highlight-color: transparent
 

diff --git a/package.json b/package.json
@@ -1,16 +1,16 @@
 {
     "name": "rider",
-    "version": "0.4.0",
+    "version": "0.4.2",
     "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.2.0",
-        "stylus": "~0.46.3",
-        "express": "~4.4.3",
+        "autoprefixer": "~2.2.0",
+        "stylus": "~0.47.3",
+        "express": "~4.7.4",
         "ejs": "~1.0.0",
-        "mocha": "~1.20.1",
+        "mocha": "~1.21.3",
         "should": "~4.0.4"
     },
     "scripts": {