Merge pull request #6305 from markhowson/fix_narrow_guild_desc

Fixes #6252 - Guild description is too narrow on guild page
This commit is contained in:
Sabe Jones 2015-11-30 13:16:59 -06:00
commit 78890012c1
2 changed files with 10 additions and 9 deletions

View file

@ -14,7 +14,7 @@
display: inline-block
.wide-popover
max-width: 400px
max-width: max-content
// Small alerts
alert-sm-mixin()

View file

@ -132,14 +132,15 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
.col-md-8
div
textarea.form-control(ng-show='group._editing', rows=6, placeholder=env.t('leaderMsg'), ng-model='group.leaderMessage')
table(ng-show='group.leaderMessage')
tr
td
.popover.static-popover.fade.right.in.wide-popover
.arrow
h3.popover-title {{group.leader.profile.name}}
.popover-content
markdown(text='group.leaderMessage')
.slight-vertical-padding
table(ng-show='group.leaderMessage')
tr
td
.popover.static-popover.fade.right.in.wide-popover
.arrow
h3.popover-title {{group.leader.profile.name}}
.popover-content
markdown(text='group.leaderMessage')
div(ng-controller='ChatCtrl')
h3=env.t('chat')
include ./chat-box