Format assets

This commit is contained in:
Anton Vakhrushev 2018-04-29 11:19:01 +03:00
parent e5573096a7
commit ec24e299a8
4 changed files with 13 additions and 8 deletions

View File

@ -13,6 +13,10 @@ build-prod:
./tools/sculpin generate --clean --env=prod --no-interaction ./tools/sculpin generate --clean --env=prod --no-interaction
./tools/npm run build-prod ./tools/npm run build-prod
format:
./tools/npm run format-js
./tools/npm run format-style
watch: build-assets watch: build-assets
./tools/sculpin generate \ ./tools/sculpin generate \
--env=dev \ --env=dev \

View File

@ -19,7 +19,9 @@
"scripts": { "scripts": {
"watch": "", "watch": "",
"build": "webpack --config webpack.config.js --progress", "build": "webpack --config webpack.config.js --progress",
"build-prod": "webpack --config webpack.config.js --env.production" "build-prod": "webpack --config webpack.config.js --env.production",
"format-js": "prettier --single-quote --trailing-comma es5 --write \"./source/_assets/**/*.js\"",
"format-style": "prettier --single-quote --write \"source/_assets/**/*.scss\""
}, },
"dependencies": {} "dependencies": {}
} }

View File

@ -2,11 +2,9 @@ import $ from 'jquery';
import _ from 'underscore'; import _ from 'underscore';
import Backbone from 'backbone'; import Backbone from 'backbone';
import Metrika from '../common/metrika'; import Metrika from '../common/metrika';
import './style.scss' import './style.scss';
const PageView = Backbone.View.extend({ const PageView = Backbone.View.extend({
notes: [ notes: [
'Люблю фильм "Три идиота".', 'Люблю фильм "Три идиота".',
'Люблю кататься на велосипеде.', 'Люблю кататься на велосипеде.',
@ -60,4 +58,4 @@ const PageView = Backbone.View.extend({
}, },
}); });
new PageView({ el: $('.js-about-me')}); new PageView({ el: $('.js-about-me') });

View File

@ -1,4 +1,5 @@
html, body { html,
body {
font-size: 18px; font-size: 18px;
font-family: 'PT Serif', serif; font-family: 'PT Serif', serif;
padding: 0; padding: 0;
@ -13,7 +14,7 @@ html, body {
left: 15px; left: 15px;
right: 15px; right: 15px;
} }
} }
} }
.content { .content {
@ -34,7 +35,7 @@ html, body {
.hello { .hello {
margin-top: 1em; margin-top: 1em;
font-size: 3.4em; font-size: 3.4em;
margin-bottom: 0.30em; margin-bottom: 0.3em;
font-weight: normal; font-weight: normal;
@media (max-width: 839px) { @media (max-width: 839px) {