瀏覽代碼

Merge branch 'master' of github.com:jgthms/bulma

Conflicts:
	bulma/layout/header.sass
Jeremy Thomas 9 年之前
父節點
當前提交
6b2bb1c642
共有 6 個文件被更改,包括 294 次插入179 次删除
  1. 1 2
      bulma/layout/header.sass
  2. 292 176
      css/bulma.css
  3. 0 0
      css/bulma.css.map
  4. 0 0
      css/bulma.min.css
  5. 0 0
      css/bulma.min.css.map
  6. 1 1
      package.json

+ 1 - 2
bulma/layout/header.sass

@@ -35,7 +35,7 @@
   img
   img
     max-height: 24px
     max-height: 24px
   a
   a
-    flex: 1
+    flex-grow: 1
   .fa
   .fa
     font-size: 21px
     font-size: 21px
     line-height: 24px
     line-height: 24px
@@ -146,4 +146,3 @@ a.header-item
     &:hover,
     &:hover,
     &.is-active
     &.is-active
       border-bottom-width: 2px
       border-bottom-width: 2px
-

File diff suppressed because it is too large
+ 292 - 176
css/bulma.css


File diff suppressed because it is too large
+ 0 - 0
css/bulma.css.map


File diff suppressed because it is too large
+ 0 - 0
css/bulma.min.css


File diff suppressed because it is too large
+ 0 - 0
css/bulma.min.css.map


+ 1 - 1
package.json

@@ -33,7 +33,7 @@
     "build-sass": "node-sass --output-style expanded --source-map true --output css/ bulma.sass --outFile css/bulma.css",
     "build-sass": "node-sass --output-style expanded --source-map true --output css/ bulma.sass --outFile css/bulma.css",
     "build-sass-min": "node-sass --output-style compressed --source-map true --output css/ bulma.sass css/bulma.min.css",
     "build-sass-min": "node-sass --output-style compressed --source-map true --output css/ bulma.sass css/bulma.min.css",
     "clean": "rm -rf css",
     "clean": "rm -rf css",
-    "pre-push": "npm run build",
+    "pre-push": "npm run build && git add css && git commit --amend --no-edit",
     "start": "npm run build-sass -- --watch"
     "start": "npm run build-sass -- --watch"
   }
   }
 }
 }

Some files were not shown because too many files changed in this diff