From 93f683dba169dba42be1f77f94380f9d2586fd10 Mon Sep 17 00:00:00 2001
From: Craig Dennis <craigmdennis@gmail.com>
Date: Thu, 21 May 2015 16:22:12 -0700
Subject: [PATCH] Update to 1.5.1

### Changed
- Fix padding multiplier warning being incorrectly triggered.
- Update Readme
---
 CHANGELOG.md              | 4 ++++
 README.md                 | 4 ++--
 bower.json                | 4 ++--
 mixins/_mixin_height.scss | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 185b227..f8e3af0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.5.1] - 2015-05-21
+### Changed
+- Fix padding multiplier warning being incorrectly triggered.
+
 ## [1.5.0] - 2015-05-10
 ### Added
 - Allow heights to be smaller than the specified font size. The value is still rounded to the nearest baseline multiple.
diff --git a/README.md b/README.md
index 4e88d3b..95876d6 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# SASS Height Mixins
-Mixins to help calculate heights, line-heights and padding.
+# SASS Height
+Mixin to help calculate heights, line-heights and padding.
 
 ## Installation
 
diff --git a/bower.json b/bower.json
index 175c688..451bc50 100644
--- a/bower.json
+++ b/bower.json
@@ -1,11 +1,11 @@
 {
   "name": "equal-height-sass",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "homepage": "https://github.com/craigmdennis/height",
   "authors": [
     "Craig Dennis <craigmdennis@gmail.com>"
   ],
-  "description": "Mixins to help calculate heights, line-heights and padding",
+  "description": "Mixin to help calculate heights, line-heights and padding",
   "main": "application.scss",
   "keywords": [
     "sass",
diff --git a/mixins/_mixin_height.scss b/mixins/_mixin_height.scss
index 5cc9b1b..87bcdca 100644
--- a/mixins/_mixin_height.scss
+++ b/mixins/_mixin_height.scss
@@ -138,7 +138,7 @@
       }
 
       // Deprecated
-      @if $sh-paddingmultiplier == 'all' {
+      @else if $sh-paddingmultiplier == 'all' {
         @warn 'Using \'all\' for padding is deprecated. Use a multiplier number instead.';
         padding-left: $vpadding;
         padding-right: $vpadding;