Merge branch 'develop'

sable-virt · Nov 14, 2016 · b95b999 · b95b999
2 parents 25cc68f 5a82395
commit b95b999
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/js/app.js b/src/js/app.js
@@ -1,4 1,4 @@
-import 'sub/sub';
 import {Sub} from 'sub/sub';
 /**
  * @constructor
  */
@@ -12,3 12,5 @@ let m = new App('main');
 if (process.env.NODE_ENV === 'development') {
  console.debug('main value:', m.val);
 }
 
 console.log(new Sub('aaaa'));
diff --git a/src/sass/layout/_layout.scss b/src/sass/layout/_layout.scss
@@ -1,5 1,5 @@
 .clearfix {
- *zoom: 1;
  zoom: 1;
  &:before, &:after {
  content: " ";
  display: table;

diff --git a/src/view/parts/_header.ejs b/src/view/parts/_header.ejs
@@ -1 1,2 @@
-<link rel="stylesheet" href="assets/css/style.css">
 <script> document.documentElement.className = document.documentElement.className.replace("no-js","js");</script>
 <link rel="stylesheet" href="assets/css/style.css">