From 7ad2839f055ad2dfaac585e848756ebc63bed5de Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Tue, 14 Jul 2015 08:18:02 -0500 Subject: [PATCH] Adjust look of page blurbs --- website/public/css/options.styl | 14 ++++++++++---- website/views/options/social/challenges.jade | 4 ++-- website/views/options/social/hall.jade | 7 ++++--- website/views/options/social/index.jade | 8 ++++---- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/website/public/css/options.styl b/website/public/css/options.styl index 93cf3b749d..1b4eb3b4a0 100644 --- a/website/public/css/options.styl +++ b/website/public/css/options.styl @@ -3,27 +3,33 @@ @media screen and (min-width:768px) border: 1px solid darken($color-options-menu, 12%) padding-bottom: 1.618em -.options-menu, .options-submenu, .options-blurbmenu +.options-menu, .options-submenu @extend $hrpg-submenu border-bottom: 1px solid darken($color-options-menu, 12%) .options-menu @media screen and (min-width:768px) background-color: $color-options-menu + li @extend $hrpg-button hrpg-button-color-mixin($color-options-menu) + .options-submenu margin-top: -1.618em background-color: $color-options-submenu + li @extend $hrpg-button hrpg-button-color-mixin($color-options-submenu) + .options-blurbmenu - margin-top: -1.618em - background-color: $color-options-blurb + margin: -1.618em 0 1.618em + border-bottom: 1px solid darken($color-options-menu, 12%) + padding: .5em + @media screen and (max-width:768px) padding: 1em 0.618em 0 0.618em border: 1px solid darken($color-options-menu, 12%) border-top: none - \ No newline at end of file + diff --git a/website/views/options/social/challenges.jade b/website/views/options/social/challenges.jade index 6b9b76a00a..af16e3643b 100644 --- a/website/views/options/social/challenges.jade +++ b/website/views/options/social/challenges.jade @@ -65,8 +65,8 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.ht div(ui-view) script(type='text/ng-template', id='partials/options.social.challenges.html') - ul.options-blurbmenu - li=env.t('blurbChallenges') + .options-blurbmenu + small.muted=env.t('blurbChallenges') .container-fluid .row diff --git a/website/views/options/social/hall.jade b/website/views/options/social/hall.jade index bf66b54ff0..a6c8d9beb6 100644 --- a/website/views/options/social/hall.jade +++ b/website/views/options/social/hall.jade @@ -6,9 +6,10 @@ script(type='text/ng-template', id='partials/options.social.hall.html') li(ng-class="{ active: $state.includes('options.social.hall.patrons') }") a(ui-sref='options.social.hall.patrons') =env.t('hallPatrons') - ul.options-blurbmenu - li(ng-if="$state.includes('options.social.hall.heroes')")!=env.t('blurbHallHeroes') - li(ng-if="$state.includes('options.social.hall.patrons')")=env.t('blurbHallPatrons') + + .options-blurbmenu + small.muted(ng-if="$state.includes('options.social.hall.heroes')")!=env.t('blurbHallHeroes') + small.muted(ng-if="$state.includes('options.social.hall.patrons')")=env.t('blurbHallPatrons') .tab-content .tab-pane.active diff --git a/website/views/options/social/index.jade b/website/views/options/social/index.jade index 2c27a2506b..f8df4e4273 100644 --- a/website/views/options/social/index.jade +++ b/website/views/options/social/index.jade @@ -7,8 +7,8 @@ include ./quests/index include ./chat-message script(type='text/ng-template', id='partials/options.social.inbox.html') - ul.options-blurbmenu - li=env.t('blurbInbox') + .options-blurbmenu + small.muted=env.t('blurbInbox') .container-fluid .row @@ -44,8 +44,8 @@ script(type='text/ng-template', id='partials/options.social.party.html') include ./create-group script(type='text/ng-template', id='partials/options.social.guilds.public.html') - ul.options-blurbmenu - li=env.t('blurbGuildsPage') + .options-blurbmenu + small.muted=env.t('blurbGuildsPage') div.col-xs-12(ng-repeat='invitation in user.invitations.guilds' style='margin-bottom: 1.5em') h3=env.t('invitedTo', {name: '{{invitation.name}}'})