From 3f28d16478dec0399edeb049095928bc8ecc757d Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Sun, 9 Feb 2014 16:25:10 +0100 Subject: [PATCH] refactor(bs3): add fixed height modals & panels --- public/css/index.styl | 7 ++++--- views/options/social/challenge-box.jade | 2 +- views/shared/modals/new-stuff.jade | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/public/css/index.styl b/public/css/index.styl index 1c889d042d..6d00b3e041 100644 --- a/public/css/index.styl +++ b/public/css/index.styl @@ -104,12 +104,13 @@ html, body //move .new-stuff-modal // a .modal-body - overflow-y: auto - max-height: 400px // Taken from Bootstrap 2.3.2 css, may need to change - h5 font-weight: 700 +.modal-fixed-height + overflow-y: auto + max-height: 400px // Taken from Bootstrap 2.3.2 css, may need to change + // notification-character used only by death modal's figure, move .modal-body diff --git a/views/options/social/challenge-box.jade b/views/options/social/challenge-box.jade index 0c13c672e6..983cd182d2 100644 --- a/views/options/social/challenge-box.jade +++ b/views/options/social/challenge-box.jade @@ -4,7 +4,7 @@ h3.panel-title=env.t('challenges') a.pull-right(target='_blank', href='https://trello.com/card/challenges-individual-party-guild-public/50e5d3684fe3a7266b0036d6/58') span.glyphicon.glyphicon-question-sign - .panel-body(bindonce='group.challenges') + .panel-body.modal-fixed-height(bindonce='group.challenges') div(ng-if='group.challenges.length > 0') table.table.table-striped tr(ng-repeat='challenge in group.challenges') diff --git a/views/shared/modals/new-stuff.jade b/views/shared/modals/new-stuff.jade index 5b33275165..ebdf889759 100644 --- a/views/shared/modals/new-stuff.jade +++ b/views/shared/modals/new-stuff.jade @@ -15,7 +15,7 @@ script(type='text/ng-template', id='modals/mathUpdates.html') script(type='text/ng-template', id='modals/newStuff.html') .modal-header h4 New Stuff! - .modal-body.new-stuff-modal + .modal-body.new-stuff-modal.modal-fixed-height table tr td