summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-07-22 10:43:16 -0800
committerCorey Hulen <corey@hulen.com>2015-07-22 10:43:16 -0800
commit3fca3b93f5bed0f695c098b6c7d751e279b31a34 (patch)
tree3b67b1361ca425fcf43b04e7cbd42c4bd548d83c /web/sass-files/sass
parent36d0e7c8d3bb91bfd2b19be43503aaecc72a392e (diff)
parent06c278328afdb9b8c7bcc5590ebdeb330b93f431 (diff)
downloadchat-3fca3b93f5bed0f695c098b6c7d751e279b31a34.tar.gz
chat-3fca3b93f5bed0f695c098b6c7d751e279b31a34.tar.bz2
chat-3fca3b93f5bed0f695c098b6c7d751e279b31a34.zip
Merge pull request #234 from asaadmahmoodspin/master
Profile pic changes in LHS Header
Diffstat (limited to 'web/sass-files/sass')
-rw-r--r--web/sass-files/sass/partials/_headers.scss15
-rw-r--r--web/sass-files/sass/partials/_responsive.scss3
2 files changed, 15 insertions, 3 deletions
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index adeaa70d7..eab4becac 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -44,14 +44,16 @@
white-space: normal;
}
}
+
}
.channel-intro {
padding-bottom:5px;
margin: 0 1em 35px;
+ max-width: 850px;
border-bottom: 1px solid lightgrey;
.intro-links {
- margin: 0.5em 1.5em 0 0;
+ margin: 0 1.5em 10px 0;
display: inline-block;
.fa {
margin-right: 5px;
@@ -64,8 +66,15 @@
.channel-intro-img {
float:left;
}
- .channel-intro-title {
+ .channel-intro__title {
font-weight:600;
+ font-size: 20px;
+ margin-bottom: 15px;
+ }
+ .channel-intro__content {
+ background: #f7f7f7;
+ padding: 10px 15px;
+ @include border-radius(3px);
}
.channel-intro-text {
margin-top:35px;
@@ -106,9 +115,9 @@
height: 36px;
float: left;
@include border-radius(36px);
+ margin-right: 6px;
}
.header__info {
- padding-left: 42px;
color: #fff;
}
.team__name, .user__name {
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 10e1d6c0f..d8a8fd982 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -89,6 +89,9 @@
max-width: 810px;
}
}
+ .channel-intro {
+ max-width: 810px;
+ }
.date-separator, .new-separator {
&.hovered--comment {
&:before, &:after {