Merge lp:~jonas-drange/ulysses/fix-watch into lp:ulysses

[Jonas G. Drange]

fix watch task, saner csslint

the watch task watched the wrong dir and executed the wrong tasks AFAICS. I've updated it to watch src/*.css, run rework and not fail during lint.

[lp:~jonas-drange/ulysses/fix-watch]

15. By Jonas G. Drange on 2014-01-07

per discussion with beowulf, removing exception for duplicate properties

[Stephen Stewart (stephen-stewart)]

review: Approve

[lp:~jonas-drange/ulysses/fix-watch]

16. By Jonas G. Drange on 2014-01-07

after discussion, let rework worry about vendor prefixes

=== modified file '.csslintrc'
--- .csslintrc	2013-12-14 07:28:45 +0000
+++ .csslintrc	2014-01-07 10:48:16 +0000
@@ -1,9 +1,26 @@
 {
+    "adjoining-classes": false,
+    "box-model": false,
+    "box-sizing": false,
+    "bulletproof-font-face": false,
+    "display-property-grouping": false,
+    "duplicate-background-images": false,
+    "empty-rules": false,
+    "floats": false,
+    "font-faces": false,
+    "font-sizes": false,
+    "gradients": false,
+    "import": false,
+    "non-link-hover": false,
+    "outline-none": false,
+    "overqualified-elements": false,
+    "qualified-headings": false,
     "regex-selectors": false,
+    "shorthand": false,
+    "text-indent": false,
+    "unique-headings": false,
+    "universal-selector": false,
     "unqualified-attributes": false,
-    "universal-selector": false,
-    "box-sizing": false,
-    "unique-headings": false,
-    "qualified-headings": false,
+    "vendor-prefix": false,
     "zero-units": false
 }

=== modified file 'Gruntfile.js'
--- Gruntfile.js	2013-12-14 07:06:03 +0000
+++ Gruntfile.js	2014-01-07 10:48:16 +0000
@@ -65,8 +65,8 @@
 
         watch: {
             css: {
-                files: '**/*.scss',
-                tasks: ['sass', 'concat', 'test'],
+                files: 'src/*.css',
+                tasks: ['rework', 'concat', 'test'],
                 options: {
                     spawn: false
                 }

=== modified file 'src/navigation.css'
--- src/navigation.css	2014-01-01 16:10:32 +0000
+++ src/navigation.css	2014-01-07 10:48:16 +0000
@@ -255,6 +255,7 @@
     background-color:#f75216;
 }
 
+/*csslint important: false*/
 .ues-menu.user li a {
   width:40px;
   text-indent:-9000px;
@@ -262,6 +263,7 @@
   border:none !important;
 }
 
+/*csslint important: true*/
 /** ?use a icon font for this **/
 .ues-menu.user li a.account {
 }