From ec24e299a8b3cae1c1e0e96d695731da1d33a751 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Sun, 29 Apr 2018 11:19:01 +0300
Subject: [PATCH] Format assets

---
 Makefile                                 | 4 ++++
 package.json                             | 4 +++-
 source/_assets/about_me/index.js         | 6 ++----
 source/_assets/layout_default/style.scss | 7 ++++---
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 301d351..c6b9904 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,10 @@ build-prod:
 	./tools/sculpin generate --clean --env=prod --no-interaction
 	./tools/npm run build-prod
 
+format:
+	./tools/npm run format-js
+	./tools/npm run format-style
+
 watch: build-assets
 	./tools/sculpin generate \
 		--env=dev \
diff --git a/package.json b/package.json
index 4274244..5628ce6 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,9 @@
   "scripts": {
     "watch": "",
     "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": {}
 }
diff --git a/source/_assets/about_me/index.js b/source/_assets/about_me/index.js
index f574032..bfef25b 100644
--- a/source/_assets/about_me/index.js
+++ b/source/_assets/about_me/index.js
@@ -2,11 +2,9 @@ import $ from 'jquery';
 import _ from 'underscore';
 import Backbone from 'backbone';
 import Metrika from '../common/metrika';
-import './style.scss'
-
+import './style.scss';
 
 const PageView = Backbone.View.extend({
-
     notes: [
         'Люблю фильм "Три идиота".',
         'Люблю кататься на велосипеде.',
@@ -60,4 +58,4 @@ const PageView = Backbone.View.extend({
     },
 });
 
-new PageView({ el: $('.js-about-me')});
+new PageView({ el: $('.js-about-me') });
diff --git a/source/_assets/layout_default/style.scss b/source/_assets/layout_default/style.scss
index 7b1afd1..308147b 100644
--- a/source/_assets/layout_default/style.scss
+++ b/source/_assets/layout_default/style.scss
@@ -1,4 +1,5 @@
-html, body {
+html,
+body {
     font-size: 18px;
     font-family: 'PT Serif', serif;
     padding: 0;
@@ -13,7 +14,7 @@ html, body {
             left: 15px;
             right: 15px;
         }
-    }    
+    }
 }
 
 .content {
@@ -34,7 +35,7 @@ html, body {
 .hello {
     margin-top: 1em;
     font-size: 3.4em;
-    margin-bottom: 0.30em;
+    margin-bottom: 0.3em;
     font-weight: normal;
 
     @media (max-width: 839px) {