summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass/partials/_headers.scss
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-07-22 18:05:44 -0800
committer=Corey Hulen <corey@hulen.com>2015-07-22 18:05:44 -0800
commitc277a98b5d88c81df39f8e33ef1286f72ac04014 (patch)
tree0d96238a2ee3ab121ea576db9900311ff5a57ba6 /web/sass-files/sass/partials/_headers.scss
parente0bad6c03784d44210760577550be585daf513b9 (diff)
parentf4c3eaa8c091366a956fa2ab48124190f4f9082b (diff)
downloadchat-c277a98b5d88c81df39f8e33ef1286f72ac04014.tar.gz
chat-c277a98b5d88c81df39f8e33ef1286f72ac04014.tar.bz2
chat-c277a98b5d88c81df39f8e33ef1286f72ac04014.zip
Merge branch 'master' into mm-1420
Diffstat (limited to 'web/sass-files/sass/partials/_headers.scss')
-rw-r--r--web/sass-files/sass/partials/_headers.scss15
1 files changed, 12 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 {