From: Jeremy Thomas <bbxdesign@gmail.com>
Date: Mon, 30 May 2016 18:21:10 +0000 (+0100)
Subject: Fix #206, Fix #220
X-Git-Tag: 0.0.28~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f5319f1f3f2aa9251c7fb571aa11e1c179f5067;p=thirdparty%2Fbulma.git

Fix #206, Fix #220
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3476cc5d..35dce5294 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Bulma Changelog
 
+## 0.0.28
+
+* BREAKING: `.control.is-grouped` now uses `.control` elements as direct children
+* Fix #220
+* Fix #206
+
 ## 0.0.27
 
 * Fix: #217
diff --git a/sass/components/media.sass b/sass/components/media.sass
index 90397ad2d..8735b1b28 100644
--- a/sass/components/media.sass
+++ b/sass/components/media.sass
@@ -35,15 +35,10 @@
     border-top: 1px solid rgba($border, 0.5)
     display: flex
     padding-top: 10px
-    .textarea
-      +control-small
-    .button
-      +button-small
     .content:not(:last-child),
     .control:not(:last-child)
       margin-bottom: 5px
     .media
-      font-size: 12px
       padding-top: 5px
       & + .media
         margin-top: 5px
diff --git a/sass/elements/form.sass b/sass/elements/form.sass
index 5e38db858..84564367f 100644
--- a/sass/elements/form.sass
+++ b/sass/elements/form.sass
@@ -15,20 +15,11 @@
   // Sizes
   &.is-small
     +control-small
-    &.is-flat
-      padding: 4px 6px
   &.is-medium
     +control-medium
-    &.is-flat
-      padding: 4px 10px
   &.is-large
     +control-large
-    &.is-flat
-      padding: 4px 12px
   // Modifiers
-  &.is-flat
-    border: none
-    box-shadow: none
   &.is-fullwidth
     display: block
     width: 100%
@@ -98,6 +89,21 @@
   &:hover
     &:after
       border-color: $link-hover
+  &.is-small
+    height: 24px
+    select
+      +control-small
+      padding-right: 28px
+  &.is-medium
+    height: 40px
+    select
+      +control-medium
+      padding-right: 44px
+  &.is-large
+    height: 48px
+    select
+      +control-large
+      padding-right: 52px
 
 .label
   color: $text-strong
@@ -214,13 +220,12 @@
   &.is-grouped
     display: flex
     justify-content: flex-start
-    & > .button,
-    & > .input,
-    & > .select
+    & > .control
       &:not(:last-child)
+        margin-bottom: 0
         margin-right: 10px
-    & > .input
-      flex: 1
+      &.is-expanded
+        flex: 1
     &.is-grouped-centered
       justify-content: center
     &.is-grouped-right
diff --git a/sass/elements/table.sass b/sass/elements/table.sass
index 60fd54c54..944120659 100644
--- a/sass/elements/table.sass
+++ b/sass/elements/table.sass
@@ -84,8 +84,8 @@
     tbody
       tr
         &:hover
-          background: darken($background, 5%)
+          background: darken($background, 2%)
         &:nth-child(2n)
           background: $background
           &:hover
-            background: darken($background, 5%)
+            background: darken($background, 2%)