diff --git a/.sass-lint.yml b/.sass-lint.yml new file mode 100644 index 00000000..bfefb841 --- /dev/null +++ b/.sass-lint.yml @@ -0,0 +1,17 @@ +# sass-lint config generated by make-sass-lint-config v0.1.2 + +files: + include: lib/gui/scss/**/*.scss +options: + formatter: stylish + merge-default-rules: false +rules: + no-css-comments: 0 + no-important: 0 + no-qualifying-elements: 0 + placeholder-in-extend: 0 + property-sort-order: 0 + quotes: + - 1 + - style: double + diff --git a/.scss-lint.yml b/.scss-lint.yml deleted file mode 100644 index bdd26ad5..00000000 --- a/.scss-lint.yml +++ /dev/null @@ -1,16 +0,0 @@ -scss_files: 'lib/gui/scss/**/*.scss' - -linters: - Comment: - enabled: false - ImportantRule: - enabled: false - PlaceholderInExtend: - enabled: false - PropertySortOrder: - enabled: false - QualifyingElement: - enabled: false - StringQuotes: - enabled: true - style: double_quotes diff --git a/.travis.yml b/.travis.yml index cc741fe4..e47ebf1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ services: env: global: - NODE_VERSION="6.1.0" - - RUBY_VERSION="2.3.1" matrix: - TARGET_ARCH=x64 - TARGET_ARCH=x86 @@ -31,14 +30,11 @@ before_install: node --version; npm --version; npm config set spin=false; - rvm install $RUBY_VERSION; - rvm use $RUBY_VERSION; fi install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip install codespell; - gem install scss_lint; npm install -g bower; brew install afsctool; brew install jq; diff --git a/appveyor.yml b/appveyor.yml index 5f0dd480..d1f3417a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,10 +30,8 @@ install: - choco install jq - set PATH=C:\Program Files (x86)\Windows Kits\8.1\bin\x86;%PATH% - set PATH=C:\Program Files (x86)\NSIS;%PATH% - - set PATH=C:\Ruby22\bin;%PATH% - set PATH=C:\MinGW\bin;%PATH% - set PATH=C:\MinGW\msys\1.0\bin;%PATH% - - gem install scss_lint - pip install codespell - make info - make electron-develop diff --git a/docs/RUNNING-LOCALLY.md b/docs/RUNNING-LOCALLY.md index e326b254..11faa1fe 100644 --- a/docs/RUNNING-LOCALLY.md +++ b/docs/RUNNING-LOCALLY.md @@ -13,7 +13,6 @@ Prerequisites - [Bower](http://bower.io) - [UPX](http://upx.sourceforge.net) - [Python](https://www.python.org) -- [SCSS Lint](https://github.com/brigade/scss-lint/) - [jq](https://stedolan.github.io/jq/) - [Asar](https://github.com/electron/asar) - [Codespell](https://github.com/lucasdemarchi/codespell) diff --git a/package.json b/package.json index 07e9a3e4..17f90a00 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,10 @@ "test": "npm run lint && electron-mocha --recursive --renderer tests/gui -R spec && electron-mocha --recursive tests/cli tests/shared tests/child-writer tests/image-stream -R spec", "sass": "node-sass ./lib/gui/scss/main.scss > ./lib/gui/css/main.css", "jslint": "eslint lib tests scripts bin versionist.conf.js", - "scsslint": "scss-lint lib/gui/scss", + "sasslint": "sass-lint lib/gui/scss", "htmllint": "node scripts/html-lint.js", "codespell": "codespell.py --dictionary=- --dictionary=dictionary lib tests", - "lint": "npm run jslint && npm run scsslint && npm run codespell && npm run htmllint", + "lint": "npm run jslint && npm run sasslint && npm run codespell && npm run htmllint", "changelog": "versionist", "start": "electron lib/start.js", "clean-shrinkwrap": "node ./scripts/clean-shrinkwrap.js" @@ -118,6 +118,7 @@ "jsonfile": "^2.3.1", "mochainon": "^1.0.0", "node-sass": "^3.8.0", + "sass-lint": "^1.10.2", "tmp": "0.0.31", "versionist": "^2.1.0" } diff --git a/scripts/build/docker/Dockerfile-i686 b/scripts/build/docker/Dockerfile-i686 index 80bce2c3..adbfdd14 100644 --- a/scripts/build/docker/Dockerfile-i686 +++ b/scripts/build/docker/Dockerfile-i686 @@ -16,8 +16,6 @@ RUN apt-get update && apt-get install -y \ python \ python-pip \ python-dev \ - python-software-properties \ - software-properties-common \ upx \ unzip \ wget \ @@ -32,9 +30,3 @@ RUN npm install -g bower asar electron-installer-debian # Python RUN pip install codespell - -# Ruby -RUN add-apt-repository ppa:brightbox/ruby-ng -RUN apt-get update -RUN apt-get install -y ruby2.3 -RUN gem install scss_lint diff --git a/scripts/build/docker/Dockerfile-x86_64 b/scripts/build/docker/Dockerfile-x86_64 index 80a4aa43..c4ff35b3 100644 --- a/scripts/build/docker/Dockerfile-x86_64 +++ b/scripts/build/docker/Dockerfile-x86_64 @@ -16,8 +16,6 @@ RUN apt-get update && apt-get install -y \ python \ python-pip \ python-dev \ - python-software-properties \ - software-properties-common \ upx \ unzip \ wget \ @@ -32,9 +30,3 @@ RUN npm install -g bower asar electron-installer-debian # Python RUN pip install codespell - -# Ruby -RUN add-apt-repository ppa:brightbox/ruby-ng -RUN apt-get update -RUN apt-get install -y ruby2.3 -RUN gem install scss_lint diff --git a/scripts/build/docker/Dockerfile.template b/scripts/build/docker/Dockerfile.template index cfca9326..38d51c9d 100644 --- a/scripts/build/docker/Dockerfile.template +++ b/scripts/build/docker/Dockerfile.template @@ -16,8 +16,6 @@ RUN apt-get update && apt-get install -y \ python \ python-pip \ python-dev \ - python-software-properties \ - software-properties-common \ upx \ unzip \ wget \ @@ -32,9 +30,3 @@ RUN npm install -g bower asar electron-installer-debian # Python RUN pip install codespell - -# Ruby -RUN add-apt-repository ppa:brightbox/ruby-ng -RUN apt-get update -RUN apt-get install -y ruby2.3 -RUN gem install scss_lint