Skip to content

evolved the ui a bit from user feedback #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 24, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js

node_js:
- "7"
- "7.8"

env:
- CXX=g++-4.8
Expand Down
2 changes: 2 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const es2015 = require('babel-preset-es2015');
const postcss = require('gulp-postcss');
const autoprefixer = require('autoprefixer');
const cssnano = require('cssnano');
const svgo = require('gulp-svgo');

function conf() {
const opts = {};
Expand Down Expand Up @@ -94,6 +95,7 @@ jsWatcher.on('change', event => {

gulp.task('img', () => {
return gulp.src('./src/img/*.svg')
.pipe(svgo())
.pipe(gulp.dest('./public/dist/img'));
});

Expand Down
19 changes: 15 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "practice javascript",
"main": "index.js",
"engines": {
"node": "7"
"node": "7.8"
},
"scripts": {
"test": "xo",
Expand All @@ -13,12 +13,22 @@
"precommit": "lint-staged"
},
"xo": {
"env": ["node","browser","es6"],
"env": [
"node",
"browser",
"es6"
],
"space": 2,
"rules": {
"operator-linebreak": [2, "before"]
"operator-linebreak": [
2,
"before"
]
},
"ignore": ["src/js/loadJS.js","public/**/*"]
"ignore": [
"src/js/loadJS.js",
"public/**/*"
]
},
"author": "Jakob Anderson",
"license": "MIT",
Expand Down Expand Up @@ -51,6 +61,7 @@
"babel-preset-latest": "^6.24.1",
"browserify": "^14.1.0",
"chai": "^3.5.0",
"gulp-svgo": "^1.0.3",
"husky": "^0.13.3",
"lint-staged": "^3.4.0",
"watchify": "^3.9.0"
Expand Down
2 changes: 1 addition & 1 deletion public/dist/css/style.css

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

51 changes: 1 addition & 50 deletions public/dist/img/next.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 1 addition & 52 deletions public/dist/img/previous.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/dist/img/programming.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
59 changes: 1 addition & 58 deletions public/dist/img/shuffle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading