Skip to content

Commit f49f8d6

Browse files
committed
Fix disabled controls, Fix disabled pagination
1 parent 2c6aabc commit f49f8d6

9 files changed

Lines changed: 21 additions & 17 deletions

File tree

docs/css/bulma-docs.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ pre {
195195
}
196196

197197
pre code {
198+
-webkit-overflow-scrolling: touch;
198199
background: none;
199200
color: inherit;
200201
display: block;
@@ -1972,6 +1973,7 @@ input[type="submit"].button {
19721973
.checkbox[disabled],
19731974
.radio[disabled] {
19741975
color: #7a7a7a;
1976+
cursor: not-allowed;
19751977
}
19761978

19771979
.radio + .radio {
@@ -4079,7 +4081,9 @@ a.nav-item.is-tab.is-active {
40794081
.pagination-previous[disabled],
40804082
.pagination-next[disabled],
40814083
.pagination-link[disabled] {
4082-
background: #dbdbdb;
4084+
background-color: #dbdbdb;
4085+
border-color: #dbdbdb;
4086+
box-shadow: none;
40834087
color: #7a7a7a;
40844088
opacity: 0.5;
40854089
}

docs/documentation/components/pagination.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ <h2 class="subtitle">A responsive, usable, and flexible <strong>pagination</stro
8282

8383
{% capture pagination_options_example %}
8484
<nav class="pagination">
85-
<a class="pagination-previous is-disabled">Previous</a>
85+
<a class="pagination-previous" title="This is the first page" disabled>Previous</a>
8686
<a class="pagination-next">Next page</a>
8787
<ul class="pagination-list">
8888
<li>

docs/documentation/elements/form.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -353,19 +353,19 @@ <h4 class="subtitle">Disabled</h4>
353353
</div>
354354
<div class="field">
355355
<p class="control">
356-
<label class="checkbox is-disabled">
356+
<label class="checkbox" disabled>
357357
<input type="checkbox" disabled>
358358
Remember me
359359
</label>
360360
</p>
361361
</div>
362362
<div class="field">
363363
<p class="control">
364-
<label class="radio is-disabled">
364+
<label class="radio" disabled>
365365
<input type="radio" name="question" disabled>
366366
Yes
367367
</label>
368-
<label class="radio is-disabled">
368+
<label class="radio" disabled>
369369
<input type="radio" name="question" disabled>
370370
No
371371
</label>

docs/documentation/modifiers/helpers.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,7 @@ <h2 class="subtitle">You can apply <strong>responsive helper classes</strong> to
5050
<td>Text is right-aligned</td>
5151
</tr>
5252
<tr>
53-
<th rowspan="4">Other</th>
54-
<td><code>is-disabled</code></td>
55-
<td>Removes any <strong>click</strong> event</td>
56-
</tr>
57-
<tr>
53+
<th rowspan="3">Other</th>
5854
<td><code>is-marginless</code></td>
5955
<td>Removes any <strong>margin</strong></td>
6056
</tr>

docs/documentation/modifiers/syntax.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ <h2 class="subtitle">Most Bulma elements have <strong>alternative</strong> style
152152
<ul>
153153
<li><code>is-outlined</code></li>
154154
<li><code>is-loading</code></li>
155-
<li><code>is-disabled</code></li>
155+
<li><code>[disabled]</code></li>
156156
</ul>
157157
</div>
158158
</div>
@@ -164,7 +164,7 @@ <h2 class="subtitle">Most Bulma elements have <strong>alternative</strong> style
164164
<a class="button is-primary is-loading">Button</a>
165165
</p>
166166
<p class="field">
167-
<a class="button is-primary is-disabled">Button</a>
167+
<a class="button is-primary" disabled>Button</a>
168168
</p>
169169
</div>
170170
<div class="column is-half">
@@ -175,7 +175,7 @@ <h2 class="subtitle">Most Bulma elements have <strong>alternative</strong> style
175175
<a class="button is-primary is-loading">
176176
Button
177177
</a>
178-
<a class="button is-primary is-disabled">
178+
<a class="button is-primary" disabled>
179179
Button
180180
</a>
181181
{% endhighlight %}

docs/documentation/overview/modular.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ <h2 class="subtitle">Just import what you <strong>need</strong></h2>
7373
<code>.is-link</code>
7474
</li>
7575
<li>
76-
<code>.is-disabled</code>,
77-
<code>.is-loading</code>
76+
<code>.is-loading</code>,
77+
<code>[disabled]</code>
7878
</li>
7979
</ul>
8080
{% highlight html %}

sass/base/generic.sass

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ html
66
min-width: 300px
77
overflow-x: hidden
88
overflow-y: scroll
9-
text-rendering: $render-mode
9+
text-rendering: $render-mode
1010

1111
article,
1212
aside,
@@ -87,6 +87,7 @@ pre
8787
white-space: pre
8888
word-wrap: normal
8989
code
90+
+overflow-touch
9091
background: none
9192
color: inherit
9293
display: block

sass/components/pagination.sass

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ $pagination-shadow-inset: inset 0 1px 2px rgba($black, 0.2)
6565
&:active
6666
box-shadow: $pagination-shadow-inset
6767
&[disabled]
68-
background: $pagination-disabled-background
68+
background-color: $pagination-disabled-background
69+
border-color: $pagination-border
70+
box-shadow: none
6971
color: $pagination-disabled
7072
opacity: 0.5
7173

sass/elements/form.sass

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ $input-radius: $radius !default
9494
color: $input-hover
9595
&[disabled]
9696
color: $input-disabled
97+
cursor: not-allowed
9798

9899
.radio
99100
& + .radio

0 commit comments

Comments
 (0)