From 683f8e1233fd4308afe838b0fa5ccb993a7e5c5e Mon Sep 17 00:00:00 2001 From: Alice Harris Date: Tue, 19 Aug 2014 17:19:14 +1000 Subject: [PATCH] adjust layout of images in Community Guidelines Alys TODO: replace paddedImage style and in-page clear:both style attributes with styles that already exist elsewhere --- views/static/community-guidelines.jade | 42 ++++++++++++++------------ 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/views/static/community-guidelines.jade b/views/static/community-guidelines.jade index c514e89b1b..80a96c77e3 100644 --- a/views/static/community-guidelines.jade +++ b/views/static/community-guidelines.jade @@ -13,16 +13,16 @@ block content .page-header h1=env.t('communityGuidelines') p.pagemeta - | Last updated August 16, 2014 + | Last updated August 19, 2014 h2=env.t('commGuideHeadingWelcome') p=env.t('commGuidePara001') p=env.t('commGuidePara002') p=env.t('commGuidePara003') p=env.t('commGuidePara004') h2=env.t('commGuideHeadingBeing') - img(src='/community-guidelines-images/beingHabitican.png', alt='') p=env.t('commGuidePara005') + img(class='pull-right' src='/community-guidelines-images/beingHabitican.png', alt='') ul li strong=env.t('commGuideList01A') @@ -49,12 +49,12 @@ block content strong=env.t('commGuidePara008') p strong=env.t('commGuidePara009') - img(src='/community-guidelines-images/staff.png', alt='') + img(class='pull-left paddedImage' src='/community-guidelines-images/staff.png', alt='') ul(class='peopleList') li strong Lefnire (Tyler Renelle) li - strong redphoenix (caffeinatedvee on Trello) (Vicky Hsu) + strong redphoenix (caffeinatedvee on Trello, veeeeeee on GitHub) (Vicky Hsu) li strong Lemoness (Siena Leslie) li @@ -64,7 +64,7 @@ block content p=env.t('commGuidePara010') p strong=env.t('commGuidePara011') - img(src='/community-guidelines-images/moderators.png', alt='') + img(class='pull-left paddedImage' src='/community-guidelines-images/moderators.png', alt='') ul(class='peopleList') li strong Ryan (deilann on GitHub/Wikia) @@ -84,9 +84,9 @@ block content p=env.t('commGuidePara013') p=env.t('commGuidePara014') |  - em Slappybag, litenull, Shaner, bobbyroberts99, wc8 + em Slappybag, litenull, Shaner, Bobbyroberts99, wc8 h2=env.t('commGuideHeadingPublicSpaces') - img(src='/community-guidelines-images/publicSpaces.png', alt='') + img(class='pull-right' src='/community-guidelines-images/publicSpaces.png', alt='') p=env.t('commGuidePara015') p=env.t('commGuidePara016') p @@ -135,7 +135,7 @@ block content p=env.t('commGuidePara021') h3=env.t('commGuideHeadingTavern') - img(src='/community-guidelines-images/tavern.png', alt='') + img(class='pull-left paddedImage' src='/community-guidelines-images/tavern.png', alt='') p=env.t('commGuidePara022') p strong=env.t('commGuidePara023') @@ -148,8 +148,9 @@ block content strong=env.t('commGuidePara027') |  =env.t('commGuidePara027part2') + div(style='clear:both') h3=env.t('commGuideHeadingPublicGuilds') - img(src='/community-guidelines-images/publicGuilds.png', alt='') + img(class='pull-right' src='/community-guidelines-images/publicGuilds.png', alt='') p strong=env.t('commGuidePara029') |  @@ -175,7 +176,7 @@ block content p strong=env.t('commGuidePara037') h3=env.t('commGuideHeadingBackCorner') - img(src='/community-guidelines-images/backCorner.png', alt='') + img(class='pull-left paddedImage' src='/community-guidelines-images/backCorner.png', alt='') p strong=env.t('commGuidePara038') |  @@ -185,8 +186,9 @@ block content strong=env.t('commGuidePara039part2') |  =env.t('commGuidePara039part3') + div(style='clear:both') h3=env.t('commGuideHeadingTrello') - img(src='/community-guidelines-images/trello.png', alt='') + img(class='pull-right' src='/community-guidelines-images/trello.png', alt='') p strong=env.t('commGuidePara040') |  @@ -231,7 +233,7 @@ block content =env.t('commGuidePara042part2') h3=env.t('commGuideHeadingGitHub') - img(src='/community-guidelines-images/github.gif', alt='') + img(class='pull-left paddedImage' src='/community-guidelines-images/github.gif', alt='') p strong=env.t('commGuidePara043') |  @@ -261,7 +263,7 @@ block content li zakkain h3=env.t('commGuideHeadingWiki') - img(src='/community-guidelines-images/wiki.png', alt='') + img(class='pull-right' src='/community-guidelines-images/wiki.png', alt='') p strong=env.t('commGuidePara045') |  @@ -282,17 +284,18 @@ block content p strong=env.t('commGuidePara049') ul(class='peopleList') - li Bobbyroberts99 (founder and bureaucrat) li Breadstrings (bureaucrat) li JiggerD li LadyAlys li LadyKatFrog li Lefnire (bureaucrat) - li Wc8 (bureaucrat) + p Wiki Administrators Emeritus are: + |  + em Bobbyroberts99 (founder and bureaucrat), wc8 (bureaucrat) h2=env.t('commGuideHeadingInfractionsEtc') h3=env.t('commGuideHeadingInfractions') - img(src='/community-guidelines-images/infractions.png', alt='') + img(class='pull-left paddedImage' src='/community-guidelines-images/infractions.png', alt='') p=env.t('commGuidePara050') p strong=env.t('commGuidePara051') @@ -329,7 +332,7 @@ block content li=env.t('commGuideList07B') h3=env.t('commGuideHeadingConsequences') - img(src='/community-guidelines-images/consequences.png', alt='') + img(class='pull-right' src='/community-guidelines-images/consequences.png', alt='') p=env.t('commGuidePara058') p strong=env.t('commGuidePara059') @@ -366,7 +369,7 @@ block content li=env.t('commGuideList11E') h3=env.t('commGuideHeadingRestoration') - img(src='/community-guidelines-images/restoration.png', alt='') + img(class='pull-left paddedImage' src='/community-guidelines-images/restoration.png', alt='') p=env.t('commGuidePara061') |  strong=env.t('commGuidePara061part2') @@ -378,8 +381,9 @@ block content |  =env.t('commGuidePara063part2') + div(style='clear:both') h2=env.t('commGuideHeadingContributing') - img(src='/community-guidelines-images/contributing.png', alt='') + img(class='pull-right' src='/community-guidelines-images/contributing.png', alt='') p=env.t('commGuidePara064') ol li=env.t('commGuideList12A')