summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-07-29 14:55:13 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-07-29 14:55:13 -0400
commit3dee6ebb03981099540386ec1f8df3d0a98d9520 (patch)
treecf8ea21b3dfbed796d91625a225d34825610b7df
parent0f54233f668901fde880f18354f406b981fc4d6d (diff)
parent3866358c0a59b32ced42bce9aaaf3a0091968f07 (diff)
downloadchat-3dee6ebb03981099540386ec1f8df3d0a98d9520.tar.gz
chat-3dee6ebb03981099540386ec1f8df3d0a98d9520.tar.bz2
chat-3dee6ebb03981099540386ec1f8df3d0a98d9520.zip
Merge pull request #279 from asaadmahmoodspin/master
Fixing LHS Header css
-rw-r--r--web/sass-files/sass/partials/_headers.scss5
-rw-r--r--web/sass-files/sass/partials/_navbar.scss14
-rw-r--r--web/sass-files/sass/partials/_responsive.scss2
-rw-r--r--web/sass-files/sass/partials/_search.scss8
4 files changed, 15 insertions, 14 deletions
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index 2c5f845d2..fb37c43eb 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -85,6 +85,7 @@
.sidebar--left, .sidebar--menu {
.team__header {
position: relative;
+ padding: 10px;
@include legacy-pie-clearfix;
&:before {
@include single-transition(all, 0.05s, linear);
@@ -98,7 +99,7 @@
}
&:hover {
&:before {
- background: rgba(black, 0.05);
+ background: rgba(black, 0.1);
}
.user__name {
color: #fff;
@@ -145,7 +146,7 @@
}
.header__info {
color: #fff;
- padding: 10px 10px 10px 14px;
+ padding-left: 4px;
z-index: 1;
position: relative;
}
diff --git a/web/sass-files/sass/partials/_navbar.scss b/web/sass-files/sass/partials/_navbar.scss
index e5e67a9e0..905907d84 100644
--- a/web/sass-files/sass/partials/_navbar.scss
+++ b/web/sass-files/sass/partials/_navbar.scss
@@ -5,15 +5,15 @@
.navbar-default {
position: absolute;
border: none;
- min-height: 50px;
+ min-height: 45px;
background: $primary-color;
.navbar-nav {
> li {
> a {
- height: 50px;
+ height: 45px;
padding: 0 1.3em;
i {
- line-height: 50px;
+ line-height: 45px;
}
}
}
@@ -24,8 +24,8 @@
border-radius: 0;
margin: 0;
padding: 0 10px;
- line-height: 53px;
- height: 50px;
+ line-height: 48px;
+ height: 44px;
z-index: 5;
fill: #fff;
.icon-bar {
@@ -38,8 +38,8 @@
}
.navbar-brand {
padding: 0 0.5em;
- height: 50px;
- line-height: 50px;
+ height: 45px;
+ line-height: 45px;
float: none;
font-size: 16px;
.heading {
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index f3f9cd477..81b94ab5a 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -466,7 +466,7 @@
}
.search__form {
border: none;
- padding: 7px 20px 0 45px;
+ padding: 7px 20px 0 49px;
height: 45px;
position: relative;
@include single-transition(all, 0.2s, linear);
diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss
index 0d005bfe2..e2168ef75 100644
--- a/web/sass-files/sass/partials/_search.scss
+++ b/web/sass-files/sass/partials/_search.scss
@@ -16,13 +16,13 @@
fill: #FFF;
position: absolute;
left: 0;
- font-size: 33px;
- width: 45px;
+ font-size: 35px;
+ width: 49px;
@include single-transition(all, 0.2s, linear);
@include translateX(0px);
text-align: center;
- padding-right: 2px;
- line-height: 42px;
+ padding-left: 1px;
+ line-height: 40px;
display: none;
}
.sidebar__search-icon {