1 files changed, 13 insertions, 41 deletions
diff --git a/src/sass/base/bulma/elements/form.sass b/src/sass/base/bulma/elements/form.sass
index 9d717cf..c944b75 100644
--- a/src/sass/base/bulma/elements/form.sass
+++ b/src/sass/base/bulma/elements/form.sass
@@ -3,6 +3,7 @@ $input-background-color: $white !default
 $input-border-color: $grey-lighter !default
 $input-height: $control-height !default
 $input-shadow: inset 0 1px 2px rgba($black, 0.1) !default
+$input-placeholder-color: rgba($input-color, 0.3) !default
 
 $input-hover-color: $grey-darker !default
 $input-hover-border-color: $grey-light !default
@@ -15,6 +16,7 @@ $input-focus-box-shadow-color: rgba($link, 0.25) !default
 $input-disabled-color: $text-light !default
 $input-disabled-background-color: $background !default
 $input-disabled-border-color: $background !default
+$input-disabled-placeholder-color: rgba($input-disabled-color, 0.3) !default
 
 $input-arrow: $link !default
 
@@ -47,7 +49,7 @@ $help-size: $size-small !default
   border-color: $input-border-color
   color: $input-color
   +placeholder
-    color: rgba($input-color, 0.3)
+    color: $input-placeholder-color
   &:hover,
   &.is-hovered
     border-color: $input-hover-border-color
@@ -57,13 +59,14 @@ $help-size: $size-small !default
   &.is-active
     border-color: $input-focus-border-color
     box-shadow: $input-focus-box-shadow-size $input-focus-box-shadow-color
-  &[disabled]
+  &[disabled],
+  fieldset[disabled] &
     background-color: $input-disabled-background-color
     border-color: $input-disabled-border-color
     box-shadow: none
     color: $input-disabled-color
     +placeholder
-      color: rgba($input-disabled-color, 0.3)
+      color: $input-disabled-placeholder-color
 
 .input,
 .textarea
@@ -135,7 +138,8 @@ $help-size: $size-small !default
     cursor: pointer
   &:hover
     color: $input-hover-color
-  &[disabled]
+  &[disabled],
+  fieldset[disabled] &
     color: $input-disabled-color
     cursor: not-allowed
 
@@ -169,7 +173,8 @@ $help-size: $size-small !default
     outline: none
     &::-ms-expand
       display: none
-    &[disabled]:hover
+    &[disabled]:hover,
+    fieldset[disabled] &:hover
       border-color: $input-disabled-border-color
     &:not([multiple])
       padding-right: 2.5em
@@ -437,13 +442,13 @@ $help-size: $size-small !default
         .input,
         .select select
           border-radius: 0
-      &:first-child
+      &:first-child:not(:only-child)
         .button,
         .input,
         .select select
           border-bottom-right-radius: 0
           border-top-right-radius: 0
-      &:last-child
+      &:last-child:not(:only-child)
         .button,
         .input,
         .select select
@@ -498,7 +503,6 @@ $help-size: $size-small !default
         margin-bottom: -0.75rem
       &:not(:last-child)
         margin-bottom: 0
-
   &.is-horizontal
     +tablet
       display: flex
@@ -544,44 +548,12 @@ $help-size: $size-small !default
         margin-right: 0.75rem
 
 .control
+  box-sizing: border-box
   clear: both //fixes the icon floating out of the input when help text is floated right
   font-size: $size-normal
   position: relative
   text-align: left
   // Modifiers
-  // DEPRECATED
-  &.has-icon
-    .icon
-      color: $input-icon-color
-      height: $input-height
-      pointer-events: none
-      position: absolute
-      top: 0
-      width: $input-height
-      z-index: 4
-    .input
-      &:focus
-        & + .icon
-          color: $input-icon-active-color
-      &.is-small
-        & + .icon
-          font-size: $size-small
-      &.is-medium
-        & + .icon
-          font-size: $size-medium
-      &.is-large
-        & + .icon
-          font-size: $size-large
-    &:not(.has-icon-right)
-      .icon
-        left: 0
-      .input
-        padding-left: $input-height
-    &.has-icon-right
-      .icon
-        right: 0
-      .input
-        padding-right: $input-height
   &.has-icons-left,
   &.has-icons-right
     .input,