From 0d22a8bca71550fb032cdcaab7edbdb0b71d0c93 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 28 Jul 2016 00:09:42 +0100 Subject: [PATCH 1/8] Introduce CSS lint --- package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.json b/package.json index b0446c897a..37b4a7d472 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "browser-test-remote-chrome": "nightwatch --config nightwatch.js --env chrome", "browser-test-remote-safari": "nightwatch --config nightwatch.js --env safari", "build": "mkdir -p build; browserify src/index.js -g yo-yoify -o build/app.js", + "csslint": "csslint assets/css/", "downloadsolc": "rm soljson.js; wget https://ethereum.github.io/solc-bin/soljson.js", "lint": "semistandard", "serve": "http-server ." @@ -17,6 +18,7 @@ "devDependencies": { "brace": "^0.8.0", "browserify": "^13.0.0", + "csslint": "^1.0.2", "es6-shim": "^0.35.1", "ethereumjs-abi": "^0.6.4", "ethereumjs-block": "^1.2.2", From 3c91d8b9566c1d4e67ad88717aef9b38a87abffd Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 28 Jul 2016 00:13:04 +0100 Subject: [PATCH 2/8] Include csslint in Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1e86dfc1c8..35a2d272b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: node_js node_js: - stable script: - - npm run lint && npm run test && npm run downloadsolc && npm run build + - npm run lint && npm run csslint && npm run test && npm run downloadsolc && npm run build - ./ci/browser_tests.sh deploy: provider: script From f639bf6307028f5c336fe38f39d29c20e5f95cb4 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 28 Jul 2016 00:17:36 +0100 Subject: [PATCH 3/8] Disable the alphabetical order requirement for CSS --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 37b4a7d472..c047d30be0 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "browser-test-remote-chrome": "nightwatch --config nightwatch.js --env chrome", "browser-test-remote-safari": "nightwatch --config nightwatch.js --env safari", "build": "mkdir -p build; browserify src/index.js -g yo-yoify -o build/app.js", - "csslint": "csslint assets/css/", + "csslint": "csslint --ignore=order-alphabetical assets/css/", "downloadsolc": "rm soljson.js; wget https://ethereum.github.io/solc-bin/soljson.js", "lint": "semistandard", "serve": "http-server ." From 08b3c227a8a59aca4476bda917df1d4adddb3c42 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 28 Jul 2016 00:22:21 +0100 Subject: [PATCH 4/8] Order entires alphabetically in package.json --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c047d30be0..276ff22233 100644 --- a/package.json +++ b/package.json @@ -3,23 +3,24 @@ "version": "1.0.0", "description": "Minimalistic browser-based Solidity IDE", "scripts": { - "test": "node test/index.js", "browser-test": "nightwatch --config nightwatch.js --env local", + "browser-test-remote-chrome": "nightwatch --config nightwatch.js --env chrome", "browser-test-remote-firefox": "nightwatch --config nightwatch.js --env default", "browser-test-remote-ie": "nightwatch --config nightwatch.js --env ie", - "browser-test-remote-chrome": "nightwatch --config nightwatch.js --env chrome", "browser-test-remote-safari": "nightwatch --config nightwatch.js --env safari", "build": "mkdir -p build; browserify src/index.js -g yo-yoify -o build/app.js", "csslint": "csslint --ignore=order-alphabetical assets/css/", "downloadsolc": "rm soljson.js; wget https://ethereum.github.io/solc-bin/soljson.js", "lint": "semistandard", - "serve": "http-server ." + "serve": "http-server .", + "test": "node test/index.js" }, "devDependencies": { "brace": "^0.8.0", "browserify": "^13.0.0", "csslint": "^1.0.2", "es6-shim": "^0.35.1", + "ethereum-remix": "0.0.2-alpha.0.0.7", "ethereumjs-abi": "^0.6.4", "ethereumjs-block": "^1.2.2", "ethereumjs-tx": "^1.1.1", @@ -36,8 +37,7 @@ "web3": "^0.16.0", "webworkify": "^1.2.1", "yo-yo": "^1.2.2", - "yo-yoify": "^3.3.0", - "ethereum-remix": "0.0.2-alpha.0.0.7" + "yo-yoify": "^3.3.0" }, "repository": { "type": "git", From 53f600234a0769a9c01ea09a83192c6a4da5b2d9 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 28 Jul 2016 21:10:48 +0100 Subject: [PATCH 5/8] Do not run csslint on font-awesome.min.css --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 276ff22233..f92511dd1e 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "browser-test-remote-ie": "nightwatch --config nightwatch.js --env ie", "browser-test-remote-safari": "nightwatch --config nightwatch.js --env safari", "build": "mkdir -p build; browserify src/index.js -g yo-yoify -o build/app.js", - "csslint": "csslint --ignore=order-alphabetical assets/css/", + "csslint": "csslint --ignore=order-alphabetical --exclude-list='assets/css/font-awesome.min.css' assets/css/", "downloadsolc": "rm soljson.js; wget https://ethereum.github.io/solc-bin/soljson.js", "lint": "semistandard", "serve": "http-server .", From c2a03b92a4d9c472a31e41cd440e03128643962c Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 31 Aug 2016 18:36:30 +0100 Subject: [PATCH 6/8] Only fail on serious CSS errors --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f92511dd1e..1d7b6e1e41 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "browser-test-remote-ie": "nightwatch --config nightwatch.js --env ie", "browser-test-remote-safari": "nightwatch --config nightwatch.js --env safari", "build": "mkdir -p build; browserify src/index.js -g yo-yoify -o build/app.js", - "csslint": "csslint --ignore=order-alphabetical --exclude-list='assets/css/font-awesome.min.css' assets/css/", + "csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='assets/css/font-awesome.min.css' assets/css/", "downloadsolc": "rm soljson.js; wget https://ethereum.github.io/solc-bin/soljson.js", "lint": "semistandard", "serve": "http-server .", From 941b9ca2eb5ee822f2c9423c8a79807c697acc2d Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 31 Aug 2016 18:37:25 +0100 Subject: [PATCH 7/8] CSS: remove duplicate properties --- assets/css/browser-solidity.css | 2 -- assets/css/universal-dapp.css | 1 - 2 files changed, 3 deletions(-) diff --git a/assets/css/browser-solidity.css b/assets/css/browser-solidity.css index 1e3f5d4ca0..6be828a0c4 100644 --- a/assets/css/browser-solidity.css +++ b/assets/css/browser-solidity.css @@ -64,7 +64,6 @@ body { } #files .file { - display: inline-block; padding: 0 0.6em; box-sizing: border-box; background-color: #F4F6FF; @@ -345,7 +344,6 @@ body { .sol.error, .sol.warning { - border-radius: 0; word-wrap: break-word; cursor: pointer; position: relative; diff --git a/assets/css/universal-dapp.css b/assets/css/universal-dapp.css index 79c8dfd8b6..d42aa985c3 100644 --- a/assets/css/universal-dapp.css +++ b/assets/css/universal-dapp.css @@ -54,7 +54,6 @@ .udapp .title { margin-bottom: 0.4em; - display: inline-block; padding: 0.2em; background-color: rgba( 255,255,255,0.5 ); display: block; From 7f92fe93497fc5dbd1154086097f49035338a86f Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 31 Aug 2016 18:37:33 +0100 Subject: [PATCH 8/8] CSS: remove empty declaration --- assets/css/styles.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/assets/css/styles.css b/assets/css/styles.css index b86ebc00a1..ce0a1c193e 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -27,9 +27,6 @@ h2 { color:#393939; } -h3, h4, h5, h6 { -} - a { color:#39c; font-weight:400;