summaryrefslogtreecommitdiffstats
path: root/app/common/styles/base
diff options
context:
space:
mode:
authorIftekharul Islam <iffy.ryan@ibm.com>2017-11-02 13:16:17 -0500
committerIftekharul Islam <iffy.ryan@ibm.com>2017-11-02 13:16:17 -0500
commitdb28a387c218b82ff70766359f4a521c713ab274 (patch)
treef9f29446cb535e1cfd749b01a88224113b8b4f06 /app/common/styles/base
parent3d4ad1eefda699530f565821ec098ff1943b0aeb (diff)
downloadphosphor-webui-db28a387c218b82ff70766359f4a521c713ab274.tar.gz
phosphor-webui-db28a387c218b82ff70766359f4a521c713ab274.zip
Updating images and stles
Updating images and styles after code merge conflicts Change-Id: I96490926caa41d13e4d625ff67f6a463d7819d34 Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>
Diffstat (limited to 'app/common/styles/base')
-rw-r--r--app/common/styles/base/buttons.scss3
-rw-r--r--app/common/styles/base/typography.scss2
2 files changed, 2 insertions, 3 deletions
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 @@ button, .button, .submit {
vertical-align: middle;
display: inline-block;
left: 11px;
- top: 5px;
- line-height: 1;
+ top: 0px;
}
} \ No newline at end of file
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 @@ h5, .h5 {
font-family: "Courier New", Helvetica, arial, sans-serif;
font-weight: 700;
margin-bottom: 0;
-}
+} \ No newline at end of file
OpenPOWER on IntegriCloud