Merge branch 'master' of github.com:gitcoinco/web

gitcoinco · Apr 4, 2018 · 94e65f0 · 94e65f0
2 parents fe3ed0c + 477e80c
commit 94e65f0
Show file tree

Hide file tree

Showing 56 changed files with 6,587 additions and 4,979 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -9,7 +9,6 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-
 # 4 space indentation
-[*.{css,scss,py}]
+[*.{py}]
 indent_size = 4
diff --git a/.stylelintignore b/.stylelintignore
@@ -0,0 +1,2 @@
+app/assets/v2/css/jquery.select2.min.css
+app/assets/v2/css/bootstrap.min.css
diff --git a/.stylelintrc b/.stylelintrc
@@ -9,14 +9,21 @@
         ]
       }
     ],
-    "indentation": "tab",
+    "indentation": 2,
     "number-leading-zero": null,
+    "selector-combinator-space-after": "always",
+    "selector-combinator-space-before": "always",
     "unit-whitelist": [
       "px",
       "em",
       "rem",
       "s",
-      "%"
+      "%",
+      "deg",
+      "vw",
+      "vh",
+      "pt",
+      "vmin"
     ]
   }
 }
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,7 @@ install:
   - pip install -r requirements/test.txt
 script:
   - npm run eslint
+  - npm run stylelint
   - pytest -p no:ethereum
 after_success:
   - pip install codecov
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		app/assets/v2/css/jquery.select2.min.css
		app/assets/v2/css/bootstrap.min.css