Updating images and stles
Updating images and styles after code merge conflicts
Change-Id: I96490926caa41d13e4d625ff67f6a463d7819d34
Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>
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
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
diff --git a/app/common/styles/directives/app-navigation.scss b/app/common/styles/directives/app-navigation.scss
index 1a028d3..997ab7c 100644
--- a/app/common/styles/directives/app-navigation.scss
+++ b/app/common/styles/directives/app-navigation.scss
@@ -51,14 +51,14 @@
.nav-icon {
@include navIcons;
}
- .button, a, .nav__btn {
+ .button, button, a {
background: transparent;
height: auto;
border: 0;
color: $white;
fill: $white;
width: 100%;
- padding: 0 .8em .8em;
+ padding: 1em;
display: block;
text-align: center;
margin-bottom: 0;
@@ -66,7 +66,7 @@
border-radius: 0;
text-decoration: none;
border-top: 1px solid transparent;
- border-bottom: 1px solid darken($darkgrey, 15%);
+ border-bottom: 1px solid $darkgrey;
a {
margin-bottom: 5px;
}
@@ -81,9 +81,9 @@
background: $nav__second-level-color;
fill: $black;
color: $medblue;
+ padding: 1em;
border-radius: 0;
border-bottom: 1px solid $lightgrey;
- cursor: pointer;
.nav__icon-help__outer {
stroke: $black;
}
@@ -175,4 +175,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/app/common/styles/layout/header.scss b/app/common/styles/layout/header.scss
index 1f065f0..e2d5260 100644
--- a/app/common/styles/layout/header.scss
+++ b/app/common/styles/layout/header.scss
@@ -79,6 +79,9 @@
}
.logo__wrapper {
padding-top: .5em;
+ //position: absolute;
+ //top: 50%;
+ //transform: translateY(-50%);
}
.header__logo {
@@ -94,7 +97,7 @@
.header__functions {
position: absolute;
top: 0;
- right: -650px;
+ right: -680px;
bottom: 0;
z-index: 100;
margin: .3em 0;
@@ -116,7 +119,7 @@
float: left;
text-decoration: none;
color: $darkgrey;
- padding: 1.25em 1.3em;
+ padding: 1.250em 1.688em;
height: 100%;
font-size: 0.875em;
font-weight: 400;