Skip to content

Commit

Permalink
🚧 Fix stylint warnings, and add a new one for travis-testing purposes
Browse files Browse the repository at this point in the history
  • Loading branch information
CosmoMyzrailGorynych committed Aug 15, 2019
1 parent 957ba7e commit 6e0d7d5
Show file tree
Hide file tree
Showing 15 changed files with 127 additions and 30 deletions.
9 changes: 2 additions & 7 deletions .stylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,13 @@
"placeholders": false,
"prefixVarsWithDollar": "never",
"quotePref": false,
"reporterOptions": {
"columns": ["lineData", "severity", "description", "rule"],
"columnSplitter": " ",
"showHeaders": false,
"truncate": true
},
"reporter": "stylint-stylish",
"semicolons": "never",
"sortOrder": false,
"stackedProperties": "never",
"trailingWhitespace": "never",
"universal": false,
"valid": true,
"valid": false,
"zeroUnits": "never",
"zIndexNormalize": false
}
12 changes: 8 additions & 4 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
'use strict';

/* eslint no-console: 0 */
const path = require('path'),
{spawn} = require('child_process'),

gulp = require('gulp'),
concat = require('gulp-concat'),
sourcemaps = require('gulp-sourcemaps'),
Expand All @@ -13,7 +14,7 @@ const path = require('path'),
gulpif = require('gulp-if'),
eslint = require('gulp-eslint'),
stylint = require('gulp-stylint'),

streamQueue = require('streamqueue'),
notifier = require('node-notifier'),
fs = require('fs-extra'),
Expand Down Expand Up @@ -74,7 +75,7 @@ const compileStylus = () =>
.pipe(sourcemaps.write())
.pipe(gulp.dest('./app/data/'));

const compilePug = () =>
const compilePug = () =>
gulp.src('./src/pug/*.pug')
.pipe(sourcemaps.init())
.pipe(pug({
Expand Down Expand Up @@ -104,6 +105,7 @@ const compileScripts = gulp.series(compileRiot, () =>
.pipe(gulpif(releasing, sourcemaps.init()))
.pipe(concat('bundle.js'))
.pipe(gulpif(releasing, sourcemaps.write()))
/* eslint camelcase: 0 */
.pipe(gulpif(releasing, closureCompiler({
compilation_level: 'SIMPLE',
language_in: 'ECMASCRIPT_NEXT',
Expand Down Expand Up @@ -174,7 +176,9 @@ const build = gulp.parallel([compilePug, compileStylus, compileScripts]);
const lintStylus = () => gulp.src(['./src/styl/**/*.styl', '!./src/styl/3rdParty/**/*.styl'])
.pipe(stylint())
.pipe(stylint.reporter())
.pipe(stylint.reporter('fail'));
.pipe(stylint.reporter('fail', {
failOnWarning: true
}));

const lintJS = () => gulp.src(['./src/js/**/*.js', '!./src/js/3rdparty/**/*.js'])
.pipe(eslint())
Expand Down
91 changes: 91 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"pug-lint-config-clock": "^2.0.0",
"riot": "^3.13.2",
"streamqueue": "^1.1.2",
"stylint-stylish": "^2.0.0",
"stylus": "^0.54.5"
}
}
6 changes: 3 additions & 3 deletions src/styl/buildingBlocks.styl
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
backface-visibility hidden
max-height 90%
overflow auto
box-shadow 0 2px 5px rgba(0,0,0, 0.35)
box-shadow 0 2px 5px rgba(0, 0, 0, 0.35)

.view
overflow auto
Expand Down Expand Up @@ -64,7 +64,7 @@
border-bottom 1px solid bl
if theme == 'Night'
border-bottom 1px solid bd


// Меню выбора - список
.menu
Expand Down Expand Up @@ -172,7 +172,7 @@
background rgba(act, 0.35)
.aStyleIcon
position relative
img
img
max-width 100%
max-height 100%
position absolute
Expand Down
12 changes: 7 additions & 5 deletions src/styl/inputs.styl
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,14 @@ input[type="range"]
width 100%
height 24px
cursor pointer
background #f5f5f5
border-radius 6px
border 1px solid #dcdcdc
background snow
border-radius br
border 1px solid bl
&::-webkit-slider-thumb
border 1px solid #dcdcdc
border 1px solid bd
height 40px
width 19px
border-radius 6px
border-radius br
background white
cursor pointer
-webkit-appearance none
Expand Down Expand Up @@ -323,11 +323,13 @@ input[type="range"]
top 0
bottom 0
background rgba(white, 0.65)
// @stylint off
background-image:
linear-gradient(to right, accent1 0, accent1 35%, transparent 35%, transparent 100%),
linear-gradient(to left, accent1 0, accent1 35%, transparent 35%, transparent 100%),
linear-gradient(to bottom, accent1 0, accent1 35%, transparent 35%, transparent 100%),
linear-gradient(to top, accent1 0, accent1 35%, transparent 35%, transparent 100%)
// @stylint on
background-size 5rem 0.5rem, 5rem 0.5rem, 0.5rem 5rem, 0.5rem 5rem
background-repeat repeat-x, repeat-x, repeat-y, repeat-y
background-position 0 0, 0 bottom, right 0, 0 0
Expand Down
2 changes: 1 addition & 1 deletion src/styl/tags/font-editor.styl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ font-editor
.left
text-align inherit
width 15rem
flex 1 0 auto
flex 1 0 auto
.right
text-align inherit
p
Expand Down
2 changes: 1 addition & 1 deletion src/styl/tags/hello.styl
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
list-style none
display inline-block
position relative
padding 0.35em 0.5em 1em
padding 0.35em .5em 1em
background snow
border 1px solid bd
border-radius br
Expand Down
2 changes: 1 addition & 1 deletion src/styl/tags/method-selector.styl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ method-selector
bottom 5rem
.panel
padding 1rem
box-shadow 0 1rem 2rem rgba(#000, 0.35)
box-shadow 0 1rem 2rem rgba(black, 0.35)
height 100%
.flexfix-header
padding-bottom 1rem
2 changes: 2 additions & 0 deletions src/styl/tags/notepad-panel.styl
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ notepad-panel
width 100%
height 100%
border 0 none
// @stylint off
background #fff
// @stylint on
.aHomeButton
position absolute
right 0.5rem
Expand Down
4 changes: 2 additions & 2 deletions src/styl/tags/preview-screen.styl
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
flex 1 1 280px
img
margin-bottom 0.5rem
display: inline-block !important
display inline-block !important
if theme == 'Night'
border 1rem solid act
margin 0 0 2rem
preview-modal
width 45rem
padding 2rem 2rem 1rem
.toright span
.toright span
cursor pointer
&:hover
color act
2 changes: 2 additions & 0 deletions src/styl/tags/project-selector.styl
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ project-selector
width 100%
text-align center
z-index 100
// @stylint off
color #fff
// @stylint on
*
vertical-align text-bottom
i
Expand Down
8 changes: 4 additions & 4 deletions src/styl/tags/room-editor.styl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ room-editor
.room-editor-TypeSwatches .aSearchWrap
display block
flex 1 1 100%
margin 0 0 3px 0
margin 0 0 3px
input
box-sizing border-box
width 100%
Expand Down Expand Up @@ -97,7 +97,7 @@ room-editor
margin-top 0.85rem
display block
padding-bottom 0.5rem
span
span
display block
text-overflow ellipsis
overflow hidden
Expand All @@ -117,7 +117,7 @@ room-editor
height 64px
width 64px
&.filler
height 0px
height 0
visibility hidden

.room-editor-Backgrounds
Expand Down Expand Up @@ -169,7 +169,7 @@ room-editor
&:hover
color act
{transshort}
.flexfix-footer button
.flexfix-footer button
margin-bottom 0.25rem
select
padding 0.25rem
2 changes: 1 addition & 1 deletion src/styl/themeNight.styl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ white = #08080D
act = #44dbb5
acttext = act
accent1 = #44dbb5
accent2 = #446adb
accent2 = #446adb
error = #d44f57
red = error
success = #58E875
Expand Down
2 changes: 1 addition & 1 deletion src/styl/typography.styl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pre
code
font-family font-mono
&.inline
padding 1.5px .5rem
padding 1.5px 0.5rem
margin 0 0.25rem
border-radius br
background bl
Expand Down

0 comments on commit 6e0d7d5

Please sign in to comment.