Merge branch 'master' of github.com:twitter/recess

haolitao · Apr 26, 2012 · 5148ea9 · 5148ea9
2 parents dce752a + 48a7ee6
commit 5148ea9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/lib/core.js b/lib/core.js
@@ -128,7 +128,7 @@ RECESS.prototype = {
 
       // log a message trying to explain why
       that.log(
-          "Parse errror".red
+          "Parse error".red
         + ": "
         + err.message
         + " on line "

diff --git a/lib/lint/no-overqualifying.js b/lib/lint/no-overqualifying.js
@@ -1,11 +1,11 @@
-// ==========================================================
+// ===================================================
 // RECESS
-// RULE: Underscores should not be used when naming selectors
-// ==========================================================
+// RULE: Element selectors should not be overqualified
+// ===================================================
 // Copyright 2012 Twitter, Inc
 // Licensed under the Apache License v2.0
 // http://www.apache.org/licenses/LICENSE-2.0
-// ==========================================================
+// ===================================================
 
 'use strict'
 

diff --git a/lib/lint/strict-property-order.js b/lib/lint/strict-property-order.js
@@ -92,6 +92,9 @@ var _ = require('underscore')
     , 'white-space'
     , 'vertical-align'
     , 'list-style'
+    , 'list-style-type'
+    , 'list-style-position'
+    , 'list-style-image'
     , 'cursor'
     , 'background'
     , 'background-attachment'
@@ -271,4 +274,4 @@ module.exports = function (def, data) {
 
   // return valid state
   return isValid
-}
+}