Fix #584, Fix #571

sass/elements/button.sass

@@ -26,7 +26,7 @@ $button-shadow-inset: inset 0 1px 2px rgba($black, 0.2) !default
   +control
   +unselectable
   background-color: $button-background
-  border: 1px solid $button-border
+  border-color: $button-border
   color: $button
   cursor: pointer
   justify-content: center

sass/elements/form.sass

@@ -22,7 +22,7 @@ $input-radius:              $radius !default
 =input
   +control
   background-color: $input-background
-  border: 1px solid $input-border
+  border-color: $input-border
   color: $input
   &:hover,
   &.is-hovered
@@ -122,6 +122,8 @@ $input-radius:              $radius !default
       border-color: $input-hover-border
     &::-ms-expand
       display: none
+    &[disabled]:hover
+      border-color: $input-disabled-border
   // States
   &:hover
     &:after
@@ -139,10 +141,21 @@ $input-radius:              $radius !default
   &.is-large
     +control-large
   // Modifiers
+  &.is-disabled
+    &:after
+      border-color: $input-disabled
   &.is-fullwidth
     width: 100%
     select
       width: 100%
+  &.is-loading
+    &:after
+      +loader
+      margin-top: 0
+      position: absolute
+      right: 0.625em
+      top: 0.625em
+      transform: none
 
 .label
   color: $input
@@ -161,9 +174,6 @@ $input-radius:              $radius !default
     &.is-#{$name}
       color: $color
 
-.select select
-  line-height: 1
-
 // Containers
 
 .field