From 848a96a9fa9f8c50ce26291984e08b2e32c8ac36 Mon Sep 17 00:00:00 2001 From: Mark Howson Date: Thu, 26 Nov 2015 11:56:32 +0000 Subject: [PATCH 1/3] Fix for #6252 --- website/public/css/alerts.styl | 3 +++ website/views/options/social/group.jade | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/website/public/css/alerts.styl b/website/public/css/alerts.styl index 6525f131ea..d00bf34eab 100644 --- a/website/public/css/alerts.styl +++ b/website/public/css/alerts.styl @@ -16,6 +16,9 @@ .wide-popover max-width: 400px +.fill-popover + max-width: max-content + // Small alerts alert-sm-mixin() padding-top: 8px diff --git a/website/views/options/social/group.jade b/website/views/options/social/group.jade index 37f4027d25..130fa5d86f 100644 --- a/website/views/options/social/group.jade +++ b/website/views/options/social/group.jade @@ -135,7 +135,7 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter table(ng-show='group.leaderMessage') tr td - .popover.static-popover.fade.right.in.wide-popover + .popover.static-popover.fade.right.in.fill-popover .arrow h3.popover-title {{group.leader.profile.name}} .popover-content From fa462a182907ea19da7775c554a5734cdb6a0bfb Mon Sep 17 00:00:00 2001 From: Mark Howson Date: Thu, 26 Nov 2015 12:56:22 +0000 Subject: [PATCH 2/3] Renamed to wide-popover as it's the only remaining use --- website/public/css/alerts.styl | 3 --- website/views/options/social/group.jade | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/website/public/css/alerts.styl b/website/public/css/alerts.styl index d00bf34eab..e5ac4aa042 100644 --- a/website/public/css/alerts.styl +++ b/website/public/css/alerts.styl @@ -14,9 +14,6 @@ display: inline-block .wide-popover - max-width: 400px - -.fill-popover max-width: max-content // Small alerts diff --git a/website/views/options/social/group.jade b/website/views/options/social/group.jade index 130fa5d86f..37f4027d25 100644 --- a/website/views/options/social/group.jade +++ b/website/views/options/social/group.jade @@ -135,7 +135,7 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter table(ng-show='group.leaderMessage') tr td - .popover.static-popover.fade.right.in.fill-popover + .popover.static-popover.fade.right.in.wide-popover .arrow h3.popover-title {{group.leader.profile.name}} .popover-content From f67bd384d4d2f704d1026bfa96d6c8f0406a88c6 Mon Sep 17 00:00:00 2001 From: Mark Howson Date: Thu, 26 Nov 2015 18:47:54 +0000 Subject: [PATCH 3/3] Moved guild leader message down slightly --- website/views/options/social/group.jade | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/website/views/options/social/group.jade b/website/views/options/social/group.jade index 37f4027d25..b442f61e0c 100644 --- a/website/views/options/social/group.jade +++ b/website/views/options/social/group.jade @@ -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