From b7080954727d0507b26a05937efa62efc0488af0 Mon Sep 17 00:00:00 2001 From: Joe Gallo Date: Fri, 10 Jul 2015 00:23:07 -0400 Subject: [PATCH 1/4] make sure hall of heroes table contents fit as table is resized --- website/views/options/social/hall.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/views/options/social/hall.jade b/website/views/options/social/hall.jade index cb7489a8f7..b770d0b104 100644 --- a/website/views/options/social/hall.jade +++ b/website/views/options/social/hall.jade @@ -67,7 +67,7 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html') input.form-control.btn.btn-primary(type='submit')=env.t('save') - table.table.table-striped + table.table.table-striped(style='table-layout:fixed;') thead tr th=env.t('name') @@ -91,7 +91,7 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html') markdown(text='hero.contributor.contributions', target='_blank') script(type='text/ng-template', id='partials/options.social.hall.patrons.html') - table.table.table-striped(infinite-scroll="loadMore()") + table.table.table-striped(infinite-scroll="loadMore()", style='table-layout:fixed;') thead tr th=env.t('name') From 9367ff80b6ff7441bb39c61c34823a88f284a653 Mon Sep 17 00:00:00 2001 From: Joe Gallo Date: Fri, 10 Jul 2015 11:23:33 -0400 Subject: [PATCH 2/4] Use bootstrap table-responsive class instead of inline css. --- website/views/options/social/hall.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/views/options/social/hall.jade b/website/views/options/social/hall.jade index b770d0b104..11f4751f26 100644 --- a/website/views/options/social/hall.jade +++ b/website/views/options/social/hall.jade @@ -67,7 +67,7 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html') input.form-control.btn.btn-primary(type='submit')=env.t('save') - table.table.table-striped(style='table-layout:fixed;') + table.table.table-striped.table-responsive thead tr th=env.t('name') @@ -91,7 +91,7 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html') markdown(text='hero.contributor.contributions', target='_blank') script(type='text/ng-template', id='partials/options.social.hall.patrons.html') - table.table.table-striped(infinite-scroll="loadMore()", style='table-layout:fixed;') + table.table.table-striped.table-responsive(infinite-scroll="loadMore()") thead tr th=env.t('name') From aabc50e992f976a0df8dc3f0e638dff91900f3be Mon Sep 17 00:00:00 2001 From: Joe Gallo Date: Sat, 11 Jul 2015 01:19:47 -0400 Subject: [PATCH 3/4] surround tables in table-responsive class --- website/views/options/social/hall.jade | 71 +++++++++++++------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/website/views/options/social/hall.jade b/website/views/options/social/hall.jade index 11f4751f26..f47ebef63c 100644 --- a/website/views/options/social/hall.jade +++ b/website/views/options/social/hall.jade @@ -66,40 +66,41 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html') .form-group input.form-control.btn.btn-primary(type='submit')=env.t('save') - - table.table.table-striped.table-responsive - thead - tr - th=env.t('name') - th(ng-if='user.contributor.admin')=env.t('UUID') - th=env.t('contribLevel') - th=env.t('title') - th=env.t('contributions') - tbody - tr(ng-repeat='hero in heroes') - td - span(ng-if='hero.contributor.admin',popover=env.t('gamemaster'),popover-trigger='mouseenter',popover-placement='right') - a.label.label-default(ng-class='userLevelStyle(hero)', ng-click='clickMember(hero._id, true)') - | {{hero.profile.name}}  - span(ng-class='userAdminGlyphiconStyle(hero)') - span(ng-if='!hero.contributor.admin') - a.label.label-default(ng-class='userLevelStyle(hero)', ng-click='clickMember(hero._id, true)') {{hero.profile.name}} - td(ng-if='user.contributor.admin', ng-click='populateContributorInput(hero._id)').btn-link {{hero._id}} - td {{hero.contributor.level}} - td {{hero.contributor.text}} - td - markdown(text='hero.contributor.contributions', target='_blank') + .table-responsive + table.table.table-striped + thead + tr + th=env.t('name') + th(ng-if='user.contributor.admin')=env.t('UUID') + th=env.t('contribLevel') + th=env.t('title') + th=env.t('contributions') + tbody + tr(ng-repeat='hero in heroes') + td + span(ng-if='hero.contributor.admin',popover=env.t('gamemaster'),popover-trigger='mouseenter',popover-placement='right') + a.label.label-default(ng-class='userLevelStyle(hero)', ng-click='clickMember(hero._id, true)') + | {{hero.profile.name}}  + span(ng-class='userAdminGlyphiconStyle(hero)') + span(ng-if='!hero.contributor.admin') + a.label.label-default(ng-class='userLevelStyle(hero)', ng-click='clickMember(hero._id, true)') {{hero.profile.name}} + td(ng-if='user.contributor.admin', ng-click='populateContributorInput(hero._id)').btn-link {{hero._id}} + td {{hero.contributor.level}} + td {{hero.contributor.text}} + td + markdown(text='hero.contributor.contributions', target='_blank') script(type='text/ng-template', id='partials/options.social.hall.patrons.html') - table.table.table-striped.table-responsive(infinite-scroll="loadMore()") - thead - tr - th=env.t('name') - th(ng-if='user.contributor.admin')=env.t('UUID') - th=env.t('backerTier') - tbody - tr(ng-repeat='patron in patrons') - td - a.label.label-default(ng-class='userLevelStyle(patron)', ng-click='clickMember(patron._id, true)') {{patron.profile.name}} - td(ng-if='user.contributor.admin') {{patron._id}} - td {{patron.backer.tier}} + .table-responsive + table.table.table-striped.table-responsive(infinite-scroll="loadMore()") + thead + tr + th=env.t('name') + th(ng-if='user.contributor.admin')=env.t('UUID') + th=env.t('backerTier') + tbody + tr(ng-repeat='patron in patrons') + td + a.label.label-default(ng-class='userLevelStyle(patron)', ng-click='clickMember(patron._id, true)') {{patron.profile.name}} + td(ng-if='user.contributor.admin') {{patron._id}} + td {{patron.backer.tier}} From 18ebbdac67c2277921ffcb64599a49fe7563ec8c Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sat, 11 Jul 2015 16:52:55 -0500 Subject: [PATCH 4/4] Remove extra class --- website/views/options/social/hall.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/views/options/social/hall.jade b/website/views/options/social/hall.jade index f47ebef63c..3666f7e446 100644 --- a/website/views/options/social/hall.jade +++ b/website/views/options/social/hall.jade @@ -26,7 +26,7 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html') input.form-control(type='text', ng-model='hero.contributor.text', placeholder=env.t('contribTitle')) .form-group label=env.t('contribLevel') - input.form-control(type='number', ng-model='hero.contributor.level') + input.form-control(type='number', ng-model='hero.contributor.level') small=env.t('contribHallText') |  a(target='_blank', href='https://trello.com/c/wkFzONhE/277-contributor-gear')=env.t('moreDetails') @@ -92,7 +92,7 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html') script(type='text/ng-template', id='partials/options.social.hall.patrons.html') .table-responsive - table.table.table-striped.table-responsive(infinite-scroll="loadMore()") + table.table.table-striped(infinite-scroll="loadMore()") thead tr th=env.t('name')