Skip to content

Commit

Permalink
Merge pull request HabitRPG#6305 from markhowson/fix_narrow_guild_desc
Browse files Browse the repository at this point in the history
Fixes HabitRPG#6252 - Guild description is too narrow on guild page
  • Loading branch information
SabreCat committed Nov 30, 2015
2 parents 5e105a0 + f67bd38 commit 7889001
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion website/public/css/alerts.styl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
display: inline-block

.wide-popover
max-width: 400px
max-width: max-content

// Small alerts
alert-sm-mixin()
Expand Down
17 changes: 9 additions & 8 deletions website/views/options/social/group.jade
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7889001

Please sign in to comment.