Skip to content

Commit bb088f0

Browse files
committed
Merge branch 'master' of github.com:jgthms/bulma
2 parents 70a8dd8 + decfd85 commit bb088f0

21 files changed

Lines changed: 980 additions & 268 deletions

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ Bulma is a modern CSS framework based on [Flexbox](https://developer.mozilla.org
88

99
Bulma is in early but active development! Try it out now:
1010

11-
```npm install bulma```
11+
```
12+
npm install bulma
13+
```
1214

1315
Feel free to raise an issue or submit a pull request. In the meantime, check the [documentation](http://bulma.io/documentation/overview/).
1416

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bulma",
3-
"version": "0.0.12",
3+
"version": "0.0.13",
44
"homepage": "http://bulma.io",
55
"authors": [
66
"jgthms <bbxdesign@gmail.com>"

bulma/base/base.sass

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@charset "utf-8"
22

3-
@import generic
4-
@import content
5-
@import highlight
6-
@import helpers
3+
@import "generic"
4+
@import "content"
5+
@import "highlight"
6+
@import "helpers"

bulma/base/generic.sass

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,14 @@ table
9191
color: $text-strong
9292

9393
.container
94-
margin: 0 auto
95-
max-width: 960px
94+
margin: 0 20px
9695
position: relative
96+
+desktop
97+
margin: 0 auto
98+
max-width: 960px
99+
&.is-fluid
100+
margin: 0 20px
101+
max-width: none
97102

98103
.fa
99104
font-size: 21px

bulma/components/components.sass

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
@charset "utf-8"
22

3-
@import grid
4-
@import navbar
5-
@import card
6-
@import table
7-
@import tabs
8-
@import media
9-
@import menu
3+
@import "grid"
4+
@import "navbar"
5+
@import "card"
6+
@import "table"
7+
@import "tabs"
8+
@import "media"
9+
@import "menu"
1010

1111
.block:not(:last-child)
1212
margin-bottom: 20px

bulma/components/grid.sass

Lines changed: 46 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,18 @@
1010
.columns.is-mobile > &.is-quarter
1111
flex: none
1212
width: 25%
13+
.columns.is-mobile > &.is-offset-half
14+
margin-left: 50%
15+
.columns.is-mobile > &.is-offset-third
16+
margin-left: 33.3333%
17+
.columns.is-mobile > &.is-offset-quarter
18+
margin-left: 25%
1319
@for $i from 1 through 11
14-
.columns.is-mobile > &.is-#{$i}-mobile
20+
.columns.is-mobile > &.is-#{$i}
1521
flex: none
1622
width: ($i / 12) * 100%
23+
.columns.is-mobile > &.is-offset-#{$i}
24+
margin-left: ($i / 12) * 100%
1725
+mobile
1826
&.is-half-mobile
1927
flex: none
@@ -24,10 +32,18 @@
2432
&.is-quarter-mobile
2533
flex: none
2634
width: 25%
35+
&.is-offset-half-mobile
36+
margin-left: 50%
37+
&.is-offset-third-mobile
38+
margin-left: 33.3333%
39+
&.is-offset-quarter-mobile
40+
margin-left: 25%
2741
@for $i from 1 through 11
2842
&.is-#{$i}-mobile
2943
flex: none
3044
width: ($i / 12) * 100%
45+
&.is-offset-#{$i}-mobile
46+
margin-left: ($i / 12) * 100%
3147
+tablet
3248
&.is-half,
3349
&.is-half-tablet
@@ -41,11 +57,23 @@
4157
&.is-quarter-tablet
4258
flex: none
4359
width: 25%
60+
&.is-offset-half,
61+
&.is-offset-half-tablet
62+
margin-left: 50%
63+
&.is-offset-third,
64+
&.is-offset-third-tablet
65+
margin-left: 33.3333%
66+
&.is-offset-quarter,
67+
&.is-offset-quarter-tablet
68+
margin-left: 25%
4469
@for $i from 1 through 11
4570
&.is-#{$i},
4671
&.is-#{$i}-tablet
4772
flex: none
4873
width: ($i / 12) * 100%
74+
&.is-offset-#{$i},
75+
&.is-offset-#{$i}-tablet
76+
margin-left: ($i / 12) * 100%
4977
+desktop
5078
&.is-half-desktop
5179
flex: none
@@ -56,10 +84,18 @@
5684
&.is-quarter-desktop
5785
flex: none
5886
width: 25%
87+
&.is-offset-half-desktop
88+
margin-left: 50%
89+
&.is-offset-third-desktop
90+
margin-left: 33.3333%
91+
&.is-offset-quarter-desktop
92+
margin-left: 25%
5993
@for $i from 1 through 11
6094
&.is-#{$i}-desktop
6195
flex: none
6296
width: ($i / 12) * 100%
97+
&.is-offset-#{$i}-desktop
98+
margin-left: ($i / 12) * 100%
6399

64100
.columns
65101
margin-left: -10px
@@ -71,15 +107,11 @@
71107
margin-bottom: 10px
72108
&.is-mobile
73109
display: flex
74-
+tablet
75-
&:not(.is-desktop)
76-
display: flex
77-
+desktop
78-
&.is-desktop
79-
display: flex
80110
&.is-gapless
111+
margin-left: 0
112+
margin-right: 0
81113
&:not(:last-child)
82-
margin: 0 0 20px
114+
margin-bottom: 20px
83115
& > .column
84116
margin: 0
85117
padding: 0
@@ -97,3 +129,9 @@
97129
width: 33.3333%
98130
& + .column
99131
margin-left: 0
132+
+tablet
133+
&:not(.is-desktop)
134+
display: flex
135+
+desktop
136+
&.is-desktop
137+
display: flex

bulma/components/table.sass

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
border-width: 0 0 1px
1010
padding: 8px 10px
1111
vertical-align: top
12+
&.table-narrow
13+
white-space: nowrap
14+
width: 1%
1215
&.table-link
1316
padding: 0
1417
& > a

bulma/config/variables.sass

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ $grey-darker: #222324
44
$grey-dark: #69707a
55
$grey: #aeb1b5
66
$grey-light: #d3d6db
7-
$grey-lighter: #ebeff5
87
$grey-lighter: #f5f7fa
98

109
$blue: #42afe3

bulma/elements/elements.sass

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
@charset "utf-8"
22

3-
@import controls
4-
@import buttons
5-
@import titles
6-
@import messages
7-
@import notifications
3+
@import "controls"
4+
@import "buttons"
5+
@import "titles"
6+
@import "images"
7+
@import "messages"
8+
@import "notifications"
89

910
.delete
1011
+unselectable

bulma/elements/images.sass

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
$dimensions: 16 24 32 48 64 96 128
2+
3+
.image
4+
display: block
5+
position: relative
6+
img
7+
display: block
8+
&.is-square,
9+
&.is-1by1,
10+
&.is-4by3,
11+
&.is-3by2,
12+
&.is-16by9,
13+
&.is-2by1
14+
img
15+
+overlay
16+
height: 100%
17+
width: 100%
18+
&.is-square,
19+
&.is-1by1
20+
padding-top: 100%
21+
&.is-4by3
22+
padding-top: 75%
23+
&.is-3by2
24+
padding-top: 66.6666%
25+
&.is-16by9
26+
padding-top: 56.25%
27+
&.is-2by1
28+
padding-top: 50%
29+
@each $dimension in $dimensions
30+
&.is-#{$dimension}x#{$dimension}
31+
height: $dimension * 1px
32+
width: $dimension * 1px

0 commit comments

Comments
 (0)