From: Jeremy Thomas
Date: Fri, 31 Mar 2017 21:36:47 +0000 (+0100)
Subject: Fix disabled controls, Fix disabled pagination
X-Git-Tag: 0.4.1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f49f8d6a22c3472d4838db7f206a576ba57bef99;p=thirdparty%2Fbulma.git
Fix disabled controls, Fix disabled pagination
---
diff --git a/docs/css/bulma-docs.css b/docs/css/bulma-docs.css
index 8f0cc471f..740a826b7 100644
--- a/docs/css/bulma-docs.css
+++ b/docs/css/bulma-docs.css
@@ -195,6 +195,7 @@ pre {
}
pre code {
+ -webkit-overflow-scrolling: touch;
background: none;
color: inherit;
display: block;
@@ -1972,6 +1973,7 @@ input[type="submit"].button {
.checkbox[disabled],
.radio[disabled] {
color: #7a7a7a;
+ cursor: not-allowed;
}
.radio + .radio {
@@ -4079,7 +4081,9 @@ a.nav-item.is-tab.is-active {
.pagination-previous[disabled],
.pagination-next[disabled],
.pagination-link[disabled] {
- background: #dbdbdb;
+ background-color: #dbdbdb;
+ border-color: #dbdbdb;
+ box-shadow: none;
color: #7a7a7a;
opacity: 0.5;
}
diff --git a/docs/documentation/components/pagination.html b/docs/documentation/components/pagination.html
index b1d4d823a..42fe497fd 100644
--- a/docs/documentation/components/pagination.html
+++ b/docs/documentation/components/pagination.html
@@ -82,7 +82,7 @@ doc-subtab: pagination
{% capture pagination_options_example %}
- Button
+ Button
@@ -175,7 +175,7 @@ doc-subtab: syntax
Button
-
+
Button
{% endhighlight %}
diff --git a/docs/documentation/overview/modular.html b/docs/documentation/overview/modular.html
index 7669bf69d..ddb651840 100644
--- a/docs/documentation/overview/modular.html
+++ b/docs/documentation/overview/modular.html
@@ -73,8 +73,8 @@ doc-subtab: modular
.is-link
- .is-disabled,
- .is-loading
+ .is-loading,
+ [disabled]
{% highlight html %}
diff --git a/sass/base/generic.sass b/sass/base/generic.sass
index 2806d9f7c..2972f02fa 100644
--- a/sass/base/generic.sass
+++ b/sass/base/generic.sass
@@ -6,7 +6,7 @@ html
min-width: 300px
overflow-x: hidden
overflow-y: scroll
- text-rendering: $render-mode
+ text-rendering: $render-mode
article,
aside,
@@ -87,6 +87,7 @@ pre
white-space: pre
word-wrap: normal
code
+ +overflow-touch
background: none
color: inherit
display: block
diff --git a/sass/components/pagination.sass b/sass/components/pagination.sass
index c863a9037..457d5bd7c 100644
--- a/sass/components/pagination.sass
+++ b/sass/components/pagination.sass
@@ -65,7 +65,9 @@ $pagination-shadow-inset: inset 0 1px 2px rgba($black, 0.2)
&:active
box-shadow: $pagination-shadow-inset
&[disabled]
- background: $pagination-disabled-background
+ background-color: $pagination-disabled-background
+ border-color: $pagination-border
+ box-shadow: none
color: $pagination-disabled
opacity: 0.5
diff --git a/sass/elements/form.sass b/sass/elements/form.sass
index b8b74c1e0..a98ec057d 100644
--- a/sass/elements/form.sass
+++ b/sass/elements/form.sass
@@ -94,6 +94,7 @@ $input-radius: $radius !default
color: $input-hover
&[disabled]
color: $input-disabled
+ cursor: not-allowed
.radio
& + .radio