Merge branch 'release/v1.2.0-rc1'

# Conflicts: # src/_Form.sass
2016-07-23 07:00:50 -03:00
parent 672a3e1dba bf0911f813
commit 4b61100f61
16 changed files with 111 additions and 18 deletions
--- a/src/_Divider.sass
+++ b/src/_Divider.sass
@@ -6,4 +6,4 @@ hr
 	border: 0
 	border-top: .1rem solid $color-tertiary
 	margin-bottom: 3.5rem
-	margin-top: 3rem
+	margin-top: 3.0rem
--- a/src/_Grid.sass
+++ b/src/_Grid.sass
@@ -14,7 +14,7 @@
 // http://philipwalton.github.io/solved-by-flexbox/demos/grids/
 // By default each .column within a .row will evenly take up
 // available width, and the height of each .column with take
-// up the height of the tallest .column in the same .row.
+// up the height of the tallest .column in the same .row
 .row
 	display: flex
 	flex-direction: column
--- a/src/_Spacing.sass
+++ b/src/_Spacing.sass
@@ -4,7 +4,7 @@

 .button,
 button
-	margin-bottom: 1rem
+	margin-bottom: 1.0rem

 input,
 textarea,