commit db28a387c218b82ff70766359f4a521c713ab274
author Iftekharul Islam <iffy.ryan@ibm.com> Thu Nov 02 13:16:17 2017 -0500
committer Iftekharul Islam <iffy.ryan@ibm.com> Thu Nov 02 13:16:17 2017 -0500
tree f9f29446cb535e1cfd749b01a88224113b8b4f06
parent 3d4ad1eefda699530f565821ec098ff1943b0aeb

Updating images and stles

Updating images and styles after code merge conflicts

Change-Id: I96490926caa41d13e4d625ff67f6a463d7819d34
Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>

app/common/styles/base/buttons.scss

diff --git a/app/common/styles/base/buttons.scss b/app/common/styles/base/buttons.scss
index 3793a84..42d0f0d 100644
--- a/app/common/styles/base/buttons.scss
+++ b/app/common/styles/base/buttons.scss
@@ -114,7 +114,6 @@
     vertical-align: middle;
     display: inline-block;
     left: 11px;
-    top: 5px;
-    line-height: 1;
+    top: 0px;
   }
 }
\ No newline at end of file

app/common/styles/base/typography.scss

diff --git a/app/common/styles/base/typography.scss b/app/common/styles/base/typography.scss
index 3135e7a..db5bdd7 100644
--- a/app/common/styles/base/typography.scss
+++ b/app/common/styles/base/typography.scss
@@ -55,4 +55,4 @@
   font-family: "Courier New", Helvetica, arial, sans-serif;
   font-weight: 700;
   margin-bottom: 0;
-}
+}
\ No newline at end of file