Merge pull request #43 from xPaw/stylelint

Add stylelint
2016-02-21 15:33:56 +00:00 · 2016-02-21 15:33:56 +00:00 · ac4db3abf6
commit ac4db3abf6
parent b2625aebae ad6b4e8939
7 changed files with 607 additions and 272 deletions
--- a/.stylelintrc
+++ b/.stylelintrc
@ -0,0 +1,73 @@
+{
+	"ignoreFiles": [
+		"client/css/bootstrap.css"
+	],
+	"rules": {
+		"at-rule-empty-line-before": ["always", {
+			"except": ["blockless-group", "first-nested"],
+			"ignore": ["after-comment"]
+		}],
+		"block-closing-brace-newline-after": "always",
+		"block-closing-brace-newline-before": "always-multi-line",
+		"block-closing-brace-space-before": "always-single-line",
+		"block-no-empty": true,
+		"block-opening-brace-newline-after": "always-multi-line",
+		"block-opening-brace-space-after": "always-single-line",
+		"block-opening-brace-space-before": "always",
+		"color-hex-case": "lower",
+		"color-hex-length": "short",
+		"color-no-invalid-hex": true,
+		"comment-empty-line-before": ["always", {
+			"except": ["first-nested"],
+			"ignore": ["stylelint-commands"]
+		}],
+		"comment-whitespace-inside": "always",
+		"declaration-bang-space-after": "never",
+		"declaration-bang-space-before": "always",
+		"declaration-block-semicolon-newline-after": "always-multi-line",
+		"declaration-block-semicolon-space-after": "always-single-line",
+		"declaration-block-semicolon-space-before": "never",
+		"declaration-block-single-line-max-declarations": 1,
+		"declaration-colon-newline-after": "always-multi-line",
+		"declaration-colon-space-after": "always-single-line",
+		"declaration-colon-space-before": "never",
+		"function-calc-no-unspaced-operator": true,
+		"function-comma-newline-after": "always-multi-line",
+		"function-comma-space-after": "always-single-line",
+		"function-comma-space-before": "never",
+		"function-parentheses-newline-inside": "always-multi-line",
+		"function-parentheses-space-inside": "never-single-line",
+		"function-whitespace-after": "always",
+		"function-url-quotes": "double",
+		"indentation": "tab",
+		"max-empty-lines": 1,
+		"media-feature-colon-space-after": "always",
+		"media-feature-colon-space-before": "never",
+		"media-feature-range-operator-space-after": "always",
+		"media-feature-range-operator-space-before": "always",
+		"media-query-list-comma-newline-after": "always-multi-line",
+		"media-query-list-comma-space-after": "always-single-line",
+		"media-query-list-comma-space-before": "never",
+		"media-query-parentheses-space-inside": "never",
+		"no-eol-whitespace": true,
+		"no-missing-eof-newline": true,
+		"number-leading-zero": "never",
+		"number-no-trailing-zeros": true,
+		"number-zero-length-no-unit": true,
+		"rule-no-duplicate-properties": true,
+		"rule-no-shorthand-property-overrides": true,
+		"rule-non-nested-empty-line-before": ["always-multi-line", {
+			"ignore": ["after-comment"]
+		}],
+		"rule-trailing-semicolon": "always",
+		"selector-combinator-space-after": "always",
+		"selector-combinator-space-before": "always",
+		"selector-list-comma-newline-after": "always",
+		"selector-list-comma-space-before": "never",
+		"selector-pseudo-element-colon-notation": "single",
+		"string-quotes": "double",
+		"value-list-comma-newline-after": "always-multi-line",
+		"value-list-comma-space-after": "always-single-line",
+		"value-list-comma-space-before": "never"
+	}
+}
--- a/client/css/style.css
+++ b/client/css/style.css
--- a/client/themes/crypto.css
+++ b/client/themes/crypto.css
@ -18,12 +18,14 @@ body {
 	font: 16px Inconsolata-g, monospace;
 }

-a, #chat a {
-    color: #00FF0E;
+a,
+#chat a {
+	color: #00ff0e;
 }

-a:hover, #chat a:hover {
-    color: #3EFF48;
+a:hover,
+#chat a:hover {
+	color: #3eff48;
 }

 #windows .window h2 {
@ -33,10 +35,10 @@ a:hover, #chat a:hover {
 }

 #main {
-    right: 0px;
-    bottom: 0px;
-    top: 0px;
-    border-radius: 0px;
+	right: 0;
+	bottom: 0;
+	top: 0;
+	border-radius: 0;
 }

 .container {
@ -54,15 +56,17 @@ a:hover, #chat a:hover {
 }

 .btn {
-    border-color: #00FF0E;
-    color: #00FF0E;
+	border-color: #00ff0e;
+	color: #00ff0e;
 }

-.btn:disabled, .btn:hover {
-    background: #00FF0E;
+.btn:disabled,
+.btn:hover {
+	background: #00ff0e;
 }

-#windows .window:before, #windows .chan:before {
+#windows .window:before,
+#windows .chan:before {
 	content: none;
 }

@ -77,7 +81,7 @@ a:hover, #chat a:hover {
 }

 #sidebar .chan:first-child {
-    color: #00FF0E;
+	color: #00ff0e;
 }

 #sidebar button,
@ -104,9 +108,10 @@ a:hover, #chat a:hover {
 	top: 48px;
 }

-#chat.no-colors .from button, #chat.no-colors .sidebar button {
+#chat.no-colors .from button,
+#chat.no-colors .sidebar button {
 	color: #000 !important;
-    font-weight: bold
+	font-weight: bold;
 }

 #form .input {
@ -119,6 +124,6 @@ a:hover, #chat a:hover {

@media (max-width: 768px) {
 	#main {
-        left: 0px;
+		left: 0;
 	}
 }
--- a/client/themes/example.css
+++ b/client/themes/example.css
@ -3,4 +3,5 @@
 */

 body {
+	margin: 0;
 }
--- a/client/themes/morning.css
+++ b/client/themes/morning.css
@ -30,12 +30,14 @@ QUIT #d0907d
 #form .input,
 #chat,
 #windows .header {
-  font-family: 'Open Sans', sans-serif !important;
+	font-family: "Open Sans", sans-serif !important;
 	font-size: 13px;
 }

-#settings, #sign-in, #connect {
-  color: #cccccc;
+#settings,
+#sign-in,
+#connect {
+	color: #ccc;
 }

 #chat .count {
@ -43,25 +45,26 @@ QUIT #d0907d
 }

 #chat .search {
-  color: #cccccc;
+	color: #ccc;
 	padding: 15px 16px;
 }

 #chat .search::-webkit-input-placeholder {
 	color: #99a2b4;
-   opacity: 0.5;
+	opacity: .5;
 }

 /* Borders */
-#chat .from, #windows .header,
+#chat .from,
+#windows .header,
 #chat .user-mode:before,
 #chat .sidebar {
 	border-color: #2a323d;
 }

-
 /* Attach chat to window borders */
-#windows .window:before, #windows .chan:before {
+#windows .window:before,
+#windows .chan:before {
 	display: none;
 }

@ -78,7 +81,8 @@ QUIT #d0907d
 	border-radius: 0;
 }

-#chat .chat, #chat .sidebar {
+#chat .chat,
+#chat .sidebar {
 	top: 48px;
 }

@ -115,12 +119,12 @@ QUIT #d0907d
 #form #input {
 	background-color: #2e3642;
 	border-color: #242a33;
-  color: #cccccc;
+	color: #ccc;
 }

 #form #nick {
 	background: #242a33;
-  color: #CCC;
+	color: #ccc;
 }

 /* Buttons */
@ -129,16 +133,15 @@ QUIT #d0907d
 #windows .header .button {
 	background: #2e3642;
 	border-color: #242a33;
-  color: #CCC;
+	color: #ccc;
 }

 #chat .show-more-button:hover,
 #form #submit:hover,
 #windows .header .button:hover {
-  color: #FFF;
+	color: #fff;
 }

-
 #chat .header {
 	color: #99a2b4;
 }
@ -147,6 +150,7 @@ QUIT #d0907d
 #chat .msg {
 	color: #f3f3f3;
 }
+
 #chat .message {
 	color: #fefefe;
 }
@ -179,15 +183,17 @@ QUIT #d0907d
 #chat .msg.join .from button {
 	color: #84ce88 !important;
 }
+
 /* Embeds */
 #chat .toggle-content,
 #chat .toggle-button {
 	background: #242a33;
 	color: #f3f3f3;
 }
+
 #chat .toggle-content img {
 	float: left;
-  margin-right: 0.5em;
+	margin-right: .5em;
 }

 #chat .toggle-content .body {
--- a/client/themes/zenburn.css
+++ b/client/themes/zenburn.css
@ -34,19 +34,25 @@ body {
 #form .input,
 #chat,
 #windows .header {
-  font-family: 'Open Sans', sans-serif !important;
+	font-family: "Open Sans", sans-serif !important;
 	font-size: 13px;
 }

-#settings, #sign-in, #connect {
+#settings,
+#sign-in,
+#connect {
 	color: #dcdccc;
 }

-#settings, #sign-in, #connect .title {
+#settings,
+#sign-in,
+#connect .title {
 	color: #88b090;
 }

-#settings, #sign-in, #connect .opt {
+#settings,
+#sign-in,
+#connect .opt {
 	color: #dcdccc;
 }

@ -71,18 +77,20 @@ body {

 #chat .search::-webkit-input-placeholder {
 	color: #d2d39b;
-   opacity: 0.5;
+	opacity: .5;
 }

 /* Borders */
-#chat .from, #windows .header,
+#chat .from,
+#windows .header,
 #chat .user-mode:before,
 #chat .sidebar {
-  border-color: #333333;
+	border-color: #333;
 }

 /* Attach chat to window borders */
-#windows .window:before, #windows .chan:before {
+#windows .window:before,
+#windows .chan:before {
 	display: none;
 }

@ -99,7 +107,8 @@ body {
 	border-radius: 0;
 }

-#chat .chat, #chat .sidebar {
+#chat .chat,
+#chat .sidebar {
 	top: 48px;
 }

@ -129,7 +138,7 @@ body {

 /* Message form */
 #form {
-  background: #333333;
+	background: #333;
 	border-color: #101010;
 }

@ -156,10 +165,9 @@ body {
 #chat .show-more-button:hover,
 #form #submit:hover,
 #windows .header .button:hover {
-  color: #FFF;
+	color: #fff;
 }

-
 #chat .header {
 	color: #d2d39b;
 }
@ -168,6 +176,7 @@ body {
 #chat .msg {
 	color: #ffcfaf;
 }
+
 #chat .message {
 	color: #dcdccc;
 }
@ -196,15 +205,17 @@ body {
 #chat .msg.join .from button {
 	color: #8cd0d3 !important;
 }
+
 /* Embeds */
 #chat .toggle-content,
 #chat .toggle-button {
 	background: #93b3a3;
 	color: #dcdccc;
 }
+
 #chat .toggle-content img {
 	float: left;
-  margin-right: 0.5em;
+	margin-right: .5em;
 }

 #chat .toggle-content .body {
--- a/package.json
+++ b/package.json
@ -14,7 +14,7 @@
    "start": "node index",
    "build": "grunt",
    "test": "HOME=test/fixtures mocha test/**/*.js && npm run lint",
-    "lint": "eslint .",
+    "lint": "eslint . && stylelint \"**/*.css\"",
    "prepublish": "npm run build"
  },
  "keywords": [
@ -41,6 +41,7 @@
    "socket.io": "~1.0.6"
  },
  "devDependencies": {
+    "stylelint": "4.3.3",
    "eslint": "^1.5.1",
    "grunt": "~0.4.5",
    "grunt-cli": "^0.1.13",