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

This commit is contained in:
Martin Angers
2016-02-13 17:17:11 -05:00
21 changed files with 981 additions and 269 deletions

View File

@@ -8,7 +8,9 @@ Bulma is a modern CSS framework based on [Flexbox](https://developer.mozilla.org
Bulma is in early but active development! Try it out now: Bulma is in early but active development! Try it out now:
```npm install bulma``` ```
npm install bulma
```
Feel free to raise an issue or submit a pull request. In the meantime, check the [documentation](http://bulma.io/documentation/overview/). Feel free to raise an issue or submit a pull request. In the meantime, check the [documentation](http://bulma.io/documentation/overview/).

View File

@@ -1,6 +1,6 @@
{ {
"name": "bulma", "name": "bulma",
"version": "0.0.12", "version": "0.0.13",
"homepage": "http://bulma.io", "homepage": "http://bulma.io",
"authors": [ "authors": [
"jgthms <bbxdesign@gmail.com>" "jgthms <bbxdesign@gmail.com>"

View File

@@ -1,6 +1,6 @@
@charset "utf-8" @charset "utf-8"
@import generic @import "generic"
@import content @import "content"
@import highlight @import "highlight"
@import helpers @import "helpers"

View File

@@ -91,9 +91,14 @@ table
color: $text-strong color: $text-strong
.container .container
margin: 0 auto margin: 0 20px
max-width: 960px
position: relative position: relative
+desktop
margin: 0 auto
max-width: 960px
&.is-fluid
margin: 0 20px
max-width: none
.fa .fa
font-size: 21px font-size: 21px

View File

@@ -1,12 +1,12 @@
@charset "utf-8" @charset "utf-8"
@import grid @import "grid"
@import navbar @import "navbar"
@import card @import "card"
@import table @import "table"
@import tabs @import "tabs"
@import media @import "media"
@import menu @import "menu"
.block:not(:last-child) .block:not(:last-child)
margin-bottom: 20px margin-bottom: 20px

View File

@@ -10,10 +10,18 @@
.columns.is-mobile > &.is-quarter .columns.is-mobile > &.is-quarter
flex: none flex: none
width: 25% width: 25%
.columns.is-mobile > &.is-offset-half
margin-left: 50%
.columns.is-mobile > &.is-offset-third
margin-left: 33.3333%
.columns.is-mobile > &.is-offset-quarter
margin-left: 25%
@for $i from 1 through 11 @for $i from 1 through 11
.columns.is-mobile > &.is-#{$i}-mobile .columns.is-mobile > &.is-#{$i}
flex: none flex: none
width: ($i / 12) * 100% width: ($i / 12) * 100%
.columns.is-mobile > &.is-offset-#{$i}
margin-left: ($i / 12) * 100%
+mobile +mobile
&.is-half-mobile &.is-half-mobile
flex: none flex: none
@@ -24,10 +32,18 @@
&.is-quarter-mobile &.is-quarter-mobile
flex: none flex: none
width: 25% width: 25%
&.is-offset-half-mobile
margin-left: 50%
&.is-offset-third-mobile
margin-left: 33.3333%
&.is-offset-quarter-mobile
margin-left: 25%
@for $i from 1 through 11 @for $i from 1 through 11
&.is-#{$i}-mobile &.is-#{$i}-mobile
flex: none flex: none
width: ($i / 12) * 100% width: ($i / 12) * 100%
&.is-offset-#{$i}-mobile
margin-left: ($i / 12) * 100%
+tablet +tablet
&.is-half, &.is-half,
&.is-half-tablet &.is-half-tablet
@@ -41,11 +57,23 @@
&.is-quarter-tablet &.is-quarter-tablet
flex: none flex: none
width: 25% width: 25%
&.is-offset-half,
&.is-offset-half-tablet
margin-left: 50%
&.is-offset-third,
&.is-offset-third-tablet
margin-left: 33.3333%
&.is-offset-quarter,
&.is-offset-quarter-tablet
margin-left: 25%
@for $i from 1 through 11 @for $i from 1 through 11
&.is-#{$i}, &.is-#{$i},
&.is-#{$i}-tablet &.is-#{$i}-tablet
flex: none flex: none
width: ($i / 12) * 100% width: ($i / 12) * 100%
&.is-offset-#{$i},
&.is-offset-#{$i}-tablet
margin-left: ($i / 12) * 100%
+desktop +desktop
&.is-half-desktop &.is-half-desktop
flex: none flex: none
@@ -56,10 +84,18 @@
&.is-quarter-desktop &.is-quarter-desktop
flex: none flex: none
width: 25% width: 25%
&.is-offset-half-desktop
margin-left: 50%
&.is-offset-third-desktop
margin-left: 33.3333%
&.is-offset-quarter-desktop
margin-left: 25%
@for $i from 1 through 11 @for $i from 1 through 11
&.is-#{$i}-desktop &.is-#{$i}-desktop
flex: none flex: none
width: ($i / 12) * 100% width: ($i / 12) * 100%
&.is-offset-#{$i}-desktop
margin-left: ($i / 12) * 100%
.columns .columns
margin-left: -10px margin-left: -10px
@@ -71,15 +107,11 @@
margin-bottom: 10px margin-bottom: 10px
&.is-mobile &.is-mobile
display: flex display: flex
+tablet
&:not(.is-desktop)
display: flex
+desktop
&.is-desktop
display: flex
&.is-gapless &.is-gapless
margin-left: 0
margin-right: 0
&:not(:last-child) &:not(:last-child)
margin: 0 0 20px margin-bottom: 20px
& > .column & > .column
margin: 0 margin: 0
padding: 0 padding: 0
@@ -97,3 +129,9 @@
width: 33.3333% width: 33.3333%
& + .column & + .column
margin-left: 0 margin-left: 0
+tablet
&:not(.is-desktop)
display: flex
+desktop
&.is-desktop
display: flex

View File

@@ -9,6 +9,9 @@
border-width: 0 0 1px border-width: 0 0 1px
padding: 8px 10px padding: 8px 10px
vertical-align: top vertical-align: top
&.table-narrow
white-space: nowrap
width: 1%
&.table-link &.table-link
padding: 0 padding: 0
& > a & > a

View File

@@ -4,7 +4,6 @@ $grey-darker: #222324
$grey-dark: #69707a $grey-dark: #69707a
$grey: #aeb1b5 $grey: #aeb1b5
$grey-light: #d3d6db $grey-light: #d3d6db
$grey-lighter: #ebeff5
$grey-lighter: #f5f7fa $grey-lighter: #f5f7fa
$blue: #42afe3 $blue: #42afe3

View File

@@ -1,10 +1,11 @@
@charset "utf-8" @charset "utf-8"
@import controls @import "controls"
@import buttons @import "buttons"
@import titles @import "titles"
@import messages @import "images"
@import notifications @import "messages"
@import "notifications"
.delete .delete
+unselectable +unselectable

View File

@@ -0,0 +1,32 @@
$dimensions: 16 24 32 48 64 96 128
.image
display: block
position: relative
img
display: block
&.is-square,
&.is-1by1,
&.is-4by3,
&.is-3by2,
&.is-16by9,
&.is-2by1
img
+overlay
height: 100%
width: 100%
&.is-square,
&.is-1by1
padding-top: 100%
&.is-4by3
padding-top: 75%
&.is-3by2
padding-top: 66.6666%
&.is-16by9
padding-top: 56.25%
&.is-2by1
padding-top: 50%
@each $dimension in $dimensions
&.is-#{$dimension}x#{$dimension}
height: $dimension * 1px
width: $dimension * 1px

View File

@@ -3,6 +3,10 @@
font-weight: 300 font-weight: 300
&:not(:last-child) &:not(:last-child)
margin-bottom: 20px margin-bottom: 20px
a
&:hover
border-bottom: 1px solid
// text-decoration: underline
.title .title
color: $text-strong color: $text-strong

View File

@@ -42,6 +42,9 @@
border: none border: none
ul ul
border-bottom: none border-bottom: none
&.is-boxed
a
padding: 8px 15px
&.is-alt &.is-alt
background: $background background: $background
color: $text-light color: $text-light

View File

@@ -1,6 +1,6 @@
@charset "utf-8" @charset "utf-8"
@import header @import "header"
@import hero @import "hero"
@import section @import "section"
@import footer @import "footer"

View File

@@ -1,10 +1,9 @@
.section .section
background: white background: white
padding: 40px 20px padding: 40px 0
& + .section & + .section
border-top: 1px solid rgba($border, 0.5) border-top: 1px solid rgba($border, 0.5)
+desktop +desktop
padding: 40px 0
&.is-medium &.is-medium
padding: 120px 0 padding: 120px 0
&.is-large &.is-large

View File

@@ -64,6 +64,7 @@
$tablet: 769px $tablet: 769px
$desktop: 980px $desktop: 980px
$widescreen: 1180px
=from($device) =from($device)
@media screen and (min-width: $device) @media screen and (min-width: $device)
@@ -88,3 +89,7 @@ $desktop: 980px
=desktop =desktop
@media screen and (min-width: $desktop) @media screen and (min-width: $desktop)
@content @content
=widescreen
@media screen and (min-width: $widescreen)
@content

View File

@@ -1,6 +1,6 @@
@charset "utf-8" @charset "utf-8"
@import reset @import "reset"
@import functions @import "functions"
@import mixins @import "mixins"
@import animations @import "animations"

987
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

3
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

View File

@@ -1,6 +1,6 @@
{ {
"name": "bulma", "name": "bulma",
"version": "0.0.12", "version": "0.0.13",
"homepage": "http://bulma.io", "homepage": "http://bulma.io",
"author": "jgthms <bbxdesign@gmail.com>", "author": "jgthms <bbxdesign@gmail.com>",
"description": "Modern CSS framework based on Flexbox", "description": "Modern CSS framework based on Flexbox",
@@ -21,11 +21,14 @@
"url": "https://github.com/jgthms/bulma/issues" "url": "https://github.com/jgthms/bulma/issues"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.3.3",
"captain-git-hook": "~1.0.5", "captain-git-hook": "~1.0.5",
"node-sass": "~3.4.2" "node-sass": "^3.4.2"
}, },
"scripts": { "scripts": {
"build": "npm run clean && npm run build-sass && npm run build-sass-min", "autoprefix": "postcss --use autoprefixer --output css/bulma.css css/bulma.css",
"autoprefix-min": "postcss --use autoprefixer --output css/bulma.min.css css/bulma.min.css",
"build": "npm run clean && npm run build-sass && npm run build-sass-min && npm run autoprefix && npm run autoprefix-min",
"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",