From 4720e67225bfa52cda6116d2359cff560c9b1e07 Mon Sep 17 00:00:00 2001 From: RafiBomb Date: Fri, 10 Jun 2016 14:50:07 -0700 Subject: [PATCH] adds button spacer and adds test content --- package.json | 2 +- scss/components/_button.scss | 11 ++++++++--- test/visual/pages/button-inky.html | 24 ++++++++++++++++++++---- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 722bdf00..0d380f32 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "gulp-sourcemaps": "^1.6.0", "gulp-wrap": "^0.11.0", "gulp-zip": "^3.2.0", - "inky": "zurb/inky#brandonbarringer-hr", + "inky": "zurb/inky#button-margin", "lazypipe": "^1.0.1", "motion-ui": "^1.1.1", "multiline": "^1.0.2", diff --git a/scss/components/_button.scss b/scss/components/_button.scss index 563a248e..303d4aa1 100755 --- a/scss/components/_button.scss +++ b/scss/components/_button.scss @@ -38,7 +38,7 @@ $button-font-weight: bold !default; /// Margin around buttons. /// @type List -$button-margin: 0 0 $global-margin 0 !default; +$button-margin-bottom: $global-margin !default; /// Background color of buttons. /// @type Color @@ -58,8 +58,6 @@ $button-rounded: $global-rounded !default; table.button { width: auto; - margin: $button-margin; - Margin: $button-margin; table { @@ -94,6 +92,13 @@ table.button { } } +// creates spacing below buttons +td.button-spacer { + height: $button-margin-bottom; + font-size: $button-margin-bottom; + line-height: $button-margin-bottom; +} + table.button:hover table tr td a, table.button:active table tr td a, table.button table tr td a:visited, diff --git a/test/visual/pages/button-inky.html b/test/visual/pages/button-inky.html index 1a317721..08231858 100644 --- a/test/visual/pages/button-inky.html +++ b/test/visual/pages/button-inky.html @@ -8,48 +8,57 @@
- +
+

This text should be spaced away from bottom of button

- + +

This text should be spaced away from bottom of button

- + +

This text should be spaced away from bottom of button

+

This text should be spaced away from bottom of button

+

This text should be spaced away from bottom of button

+

This text should be spaced away from bottom of button

+

This text should be spaced away from bottom of button

+

This text should be spaced away from bottom of button

+

This text should be spaced away from bottom of button

@@ -58,6 +67,7 @@
+

This text should be spaced away from bottom of button

@@ -66,22 +76,26 @@
+

This text should be spaced away from bottom of button

- + +

This text should be spaced away from bottom of button

+

This text should be spaced away from bottom of button

+

This text should be spaced away from bottom of button

@@ -89,6 +103,7 @@
+

This text should be spaced away from bottom of button

@@ -96,6 +111,7 @@
+

This text should be spaced away from bottom of button

-- 2.47.2