From 9228455b09f6a367bf17fcbac9b7713b0213a043 Mon Sep 17 00:00:00 2001
From: Jeremy Thomas <bbxdesign@gmail.com>
Date: Sat, 26 Mar 2016 17:12:13 +0000
Subject: [PATCH] Use inline flex for buttons, Fix progress bars, Remove
 display helpers

---
 CHANGELOG.md                 |  5 +++++
 bulma/base/helpers.sass      |  6 ------
 bulma/elements/buttons.sass  | 20 +++++---------------
 bulma/elements/controls.sass |  3 ++-
 bulma/elements/progress.sass |  7 ++++---
 5 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19a683b3..40203745 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,11 @@
 
 ### Updated
 
+* `.button` uses `display: inline-flex` now
 * `.button` needs an `.icon` now
 * `.control.is-grouped` renamed to `.control.has-addons`
 * `.control.is-inline` renamed to `.control.is-grouped`
+
+### Removed
+
+* **helpers** `.is-inline` and `.is-block`
diff --git a/bulma/base/helpers.sass b/bulma/base/helpers.sass
index b0d6eb14..9a46b6e9 100644
--- a/bulma/base/helpers.sass
+++ b/bulma/base/helpers.sass
@@ -1,11 +1,5 @@
 // Display
 
-.is-block
-  display: block
-
-.is-inline
-  display: inline
-
 .is-flex
   display: flex
 
diff --git a/bulma/elements/buttons.sass b/bulma/elements/buttons.sass
index cf4081dc..76a48d02 100644
--- a/bulma/elements/buttons.sass
+++ b/bulma/elements/buttons.sass
@@ -26,8 +26,11 @@
     font-size: $size-small
     line-height: 1
     margin-top: 5px
-  .icon.is-small
-    margin: 4px 0
+  .icon
+    &:first-child
+      margin-right: 4px
+    &:last-child
+      margin-left: 4px
   &:hover
     color: $control-hover
   &:active
@@ -77,14 +80,10 @@
       color: $text-strong
   &.is-small
     +button-small
-    .icon.is-small
-      margin: 0
   &.is-medium
     +button-medium
   &.is-large
     +button-large
-    .icon.is-medium
-      margin: -4px 0px -4px -4px
   &.is-fullwidth
     display: block
     width: 100%
@@ -101,12 +100,3 @@
   &[disabled]
     opacity: 0.5
     pointer-events: none
-  +tablet
-    small
-      color: $text
-      left: 0
-      margin-top: 10px
-      position: absolute
-      top: 100%
-      width: 100%
-
diff --git a/bulma/elements/controls.sass b/bulma/elements/controls.sass
index 4d341afd..08bf8388 100644
--- a/bulma/elements/controls.sass
+++ b/bulma/elements/controls.sass
@@ -1,11 +1,12 @@
 =control
   -moz-appearance: none
   -webkit-appearance: none
+  align-items: center
   background: $control-background
   border: 1px solid $control-border
   border-radius: $radius
   color: $control
-  display: inline-block
+  display: inline-flex
   font-size: $size-normal
   height: 32px
   line-height: 24px
diff --git a/bulma/elements/progress.sass b/bulma/elements/progress.sass
index 843a744e..e58df2aa 100644
--- a/bulma/elements/progress.sass
+++ b/bulma/elements/progress.sass
@@ -11,7 +11,8 @@
   width: 100%
   &::-webkit-progress-bar
     background: $border
-  &::-webkit-progress-value,
+  &::-webkit-progress-value
+    background: $text
   &::-moz-progress-bar
     background: $text
   &.is-small
@@ -23,7 +24,7 @@
   @each $name, $pair in $colors
     $color: nth($pair, 1)
     &.is-#{$name}
-      &::-webkit-progress-value,
+      &::-webkit-progress-value
+        background: $color
       &::-moz-progress-bar
         background: $color
-