Skip to content

Commit 4435fe7

Browse files
committed
Updates Bulma to 0.0.17
1 parent b325e40 commit 4435fe7

File tree

14 files changed

+296
-126
lines changed

14 files changed

+296
-126
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ A modern CSS framework based on Flexbox.
88

99
Add this line to your application's Gemfile:
1010

11-
gem "bulma-rails", "~> 0.0.14"
11+
gem "bulma-rails", "~> 0.0.17"
1212

1313
And then execute:
1414

app/assets/stylesheets/bulma/base/helpers.sass

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
// Display
22
3-
.is-block
4-
display: block
5-
6-
.is-inline
7-
display: inline
8-
93
.is-flex
104
display: flex
115

app/assets/stylesheets/bulma/components/card.sass

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
.card-header
2+
align-items: stretch
3+
box-shadow: 0 1px 2px rgba(black, 0.1)
4+
display: flex
5+
min-height: 40px
6+
7+
.card-header-title
8+
align-items: flex-start
9+
color: $text-strong
10+
display: flex
11+
flex: 1
12+
font-weight: bold
13+
padding: 10px
14+
15+
.card-header-icon
16+
align-items: center
17+
cursor: pointer
18+
display: flex
19+
justify-content: center
20+
width: 40px
21+
122
.card-image
223
display: block
324
position: relative
@@ -9,8 +30,18 @@
930

1031
.card-footer
1132
background: $background
12-
display: block
33+
border-top: 1px solid $border
34+
align-items: stretch
35+
display: flex
36+
37+
.card-footer-item
38+
align-items: center
39+
display: flex
40+
flex: 1
41+
justify-content: center
1342
padding: 10px
43+
&:not(:last-child)
44+
border-right: 1px solid $border
1445

1546
.card
1647
background: white
@@ -22,3 +53,5 @@
2253
margin-bottom: 10px
2354
&.is-rounded
2455
border-radius: 5px
56+
&.is-fullwidth
57+
width: 100%

app/assets/stylesheets/bulma/components/components.sass

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,13 @@
77
@import "tabs"
88
@import "media"
99
@import "menu"
10+
@import "pagination"
11+
@import "panel"
1012
@import "modal"
13+
14+
.box
15+
@extend .block
16+
background: white
17+
border-radius: 5px
18+
box-shadow: 0 2px 3px rgba(black, 0.1), 0 0 0 1px rgba(black, 0.1)
19+
padding: 20px
Lines changed: 22 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,30 @@
1-
.menu-icon
2-
+fa(14px, 16px)
3-
color: $text-light
4-
float: left
5-
margin: 0 4px 0 -2px
6-
.fa
7-
font-size: inherit
8-
line-height: inherit
9-
10-
.menu-heading
11-
background: $background
12-
border-bottom: 1px solid $border
13-
border-radius: 4px 4px 0 0
14-
color: $text-strong
15-
font-size: $size-medium
16-
font-weight: 300
17-
padding: 10px
1+
.menu-nav
2+
a
3+
display: block
4+
padding: 5px 10px
185

196
.menu-list
207
a
8+
border-radius: 2px
219
color: $text
10+
display: block
11+
padding: 5px 10px
2212
&:hover
13+
background: $background
2314
color: $link
24-
25-
.menu-tabs
26-
display: flex
27-
font-size: $size-small
28-
padding: 5px 10px 0
29-
justify-content: center
30-
&:not(:last-child)
31-
border-bottom: 1px solid $border
32-
a
33-
border-bottom: 1px solid $border
34-
margin-bottom: -1px
35-
padding: 5px
3615
&.is-active
37-
border-bottom-color: $link-active-border
38-
color: $link-active
16+
background: $link
17+
color: $link-invert
18+
li ul
19+
border-left: 1px solid $border
20+
margin: 10px
21+
padding-left: 10px
3922

40-
.menu-block
41-
color: $text-strong
42-
display: block
43-
line-height: 16px
44-
padding: 10px
45-
&:not(:last-child)
46-
border-bottom: 1px solid $border
47-
.checkbox
48-
border: 1px solid transparent
49-
border-radius: $radius
50-
display: block
51-
padding: 8px
52-
padding-left: 32px
53-
input
54-
left: 9px
55-
top: 9px
56-
&:hover
57-
border-color: $link
58-
59-
a.menu-block:hover
60-
background: $background
61-
62-
.menu-checkbox
63-
@extend .checkbox
64-
display: block
65-
padding: 9px 10px 9px 30px
66-
&:not(:last-child)
67-
border-bottom: 1px solid $border
68-
input
69-
left: 8px
70-
top: 10px
71-
72-
.menu
73-
border: 1px solid $border
74-
border-radius: 5px
75-
&:not(:last-child)
76-
margin-bottom: 20px
23+
.menu-label
24+
color: $text-light
25+
font-size: $size-small
26+
letter-spacing: 1px
27+
margin-bottom: 5px
28+
text-transform: uppercase
29+
&:not(:first-child)
30+
margin-top: 20px
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
.pagination
2+
align-items: center
3+
display: flex
4+
justify-content: center
5+
text-align: center
6+
a
7+
@extend .button
8+
display: block
9+
min-width: 32px
10+
padding: 3px 8px
11+
&.is-active
12+
background: $link
13+
border-color: $link
14+
color: $link-invert
15+
span
16+
color: $text-light
17+
display: block
18+
margin: 0 4px
19+
li
20+
margin: 0 2px
21+
ul
22+
align-items: center
23+
display: flex
24+
flex: 1
25+
justify-content: center
26+
+mobile
27+
flex-wrap: wrap
28+
& > a
29+
width: calc(50% - 5px)
30+
&:not(:first-child)
31+
margin-left: 10px
32+
li
33+
flex: 1
34+
ul
35+
margin-top: 10px
36+
+tablet
37+
& > a
38+
&:not(:first-child)
39+
order: 1
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
.panel-icon
2+
+fa(14px, 16px)
3+
color: $text-light
4+
float: left
5+
margin: 0 4px 0 -2px
6+
.fa
7+
font-size: inherit
8+
line-height: inherit
9+
10+
.panel-heading
11+
background: $background
12+
border-bottom: 1px solid $border
13+
border-radius: 4px 4px 0 0
14+
color: $text-strong
15+
font-size: $size-medium
16+
font-weight: 300
17+
padding: 10px
18+
19+
.panel-list
20+
a
21+
color: $text
22+
&:hover
23+
color: $link
24+
25+
.panel-tabs
26+
display: flex
27+
font-size: $size-small
28+
padding: 5px 10px 0
29+
justify-content: center
30+
&:not(:last-child)
31+
border-bottom: 1px solid $border
32+
a
33+
border-bottom: 1px solid $border
34+
margin-bottom: -1px
35+
padding: 5px
36+
&.is-active
37+
border-bottom-color: $link-active-border
38+
color: $link-active
39+
40+
.panel-block
41+
color: $text-strong
42+
display: block
43+
line-height: 16px
44+
padding: 10px
45+
&:not(:last-child)
46+
border-bottom: 1px solid $border
47+
.checkbox
48+
border: 1px solid transparent
49+
border-radius: $radius
50+
display: block
51+
padding: 8px
52+
padding-left: 32px
53+
input
54+
left: 9px
55+
top: 9px
56+
&:hover
57+
border-color: $link
58+
59+
a.panel-block:hover
60+
background: $background
61+
62+
.panel-checkbox
63+
@extend .checkbox
64+
display: block
65+
padding: 9px 10px 9px 30px
66+
&:not(:last-child)
67+
border-bottom: 1px solid $border
68+
input
69+
left: 8px
70+
top: 10px
71+
72+
.panel
73+
border: 1px solid $border
74+
border-radius: 5px
75+
&:not(:last-child)
76+
margin-bottom: 20px

app/assets/stylesheets/bulma/elements/buttons.sass

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
.button
1717
+control
1818
+unselectable
19+
justify-content: center
1920
padding: 3px 10px
2021
text-align: center
2122
white-space: nowrap
@@ -26,10 +27,11 @@
2627
font-size: $size-small
2728
line-height: 1
2829
margin-top: 5px
29-
.fa
30-
line-height: 24px
31-
margin: 0 -2px
32-
width: 24px
30+
.icon
31+
&:first-child
32+
margin-right: 4px
33+
&:last-child
34+
margin-left: 4px
3335
&:hover
3436
color: $control-hover
3537
&:active
@@ -69,6 +71,14 @@
6971
background: rgba(black, 0.05)
7072
&.is-loading:after
7173
border-color: transparent transparent $color-invert $color-invert !important
74+
&.is-link
75+
border-color: transparent
76+
color: $text
77+
text-decoration: underline
78+
&:hover,
79+
&:focus
80+
background: $border
81+
color: $text-strong
7282
&.is-small
7383
+button-small
7484
&.is-medium
@@ -91,12 +101,3 @@
91101
&[disabled]
92102
opacity: 0.5
93103
pointer-events: none
94-
+tablet
95-
small
96-
color: $text
97-
left: 0
98-
margin-top: 10px
99-
position: absolute
100-
top: 100%
101-
width: 100%
102-

0 commit comments

Comments
 (0)