mirror of
https://github.com/jgthms/bulma.git
synced 2024-11-28 12:24:23 +00:00
Merge branch 'master' of github.com:jgthms/bulma
Conflicts: bulma/layout/header.sass
This commit is contained in:
commit
6b2bb1c642
@ -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
|
||||||
|
|
||||||
|
961
css/bulma.css
vendored
961
css/bulma.css
vendored
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
2
css/bulma.min.css
vendored
2
css/bulma.min.css
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user