From ee871ccb016ff0184072490f0aa4d2052b23b721 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Sat, 8 Feb 2014 16:58:41 +0100 Subject: [PATCH] refactor(bs3): fixes --- public/css/alerts.styl | 11 +++++++++-- views/options/social/challenge-box.jade | 3 ++- views/options/social/tavern.jade | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/public/css/alerts.styl b/public/css/alerts.styl index 1893e93389..1520f695f8 100644 --- a/public/css/alerts.styl +++ b/public/css/alerts.styl @@ -16,6 +16,14 @@ .wide-popover max-width: 400px +// Small alerts +alert-sm-mixin() + padding-top: 8px + padding-bottom: 8px + +.alert-sm + alert-sm-mixin() + #notification-area position: fixed top: 0 @@ -23,8 +31,7 @@ z-index: 1061 .alert - padding-top: 8px - padding-bottom: 8px + alert-sm-mixin() // variables diff --git a/views/options/social/challenge-box.jade b/views/options/social/challenge-box.jade index 2dae335b30..a2634b9728 100644 --- a/views/options/social/challenge-box.jade +++ b/views/options/social/challenge-box.jade @@ -12,7 +12,8 @@ a(ui-sref='options.social.challenges.detail({cid:challenge._id})') {{challenge.name}} div(ng-if='group.challenges.length == 0') p=env.t('noChallenges') - a(class='label' ui-sref='options.social.challenges') + a.label.label-default(ui-sref='options.social.challenges') +   span.glyphicon.glyphicon-bullhorn =env.t('challenges') =env.t('toCreate') diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index 503dc52e8a..cadfbcf197 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -119,7 +119,7 @@ .col-md-8.tavern(ng-controller='ChatCtrl') h3=env.t('tavernTalk') include ./chat-box - .alert.alert-info + .alert.alert-info.alert-sm !=env.t('tavernAlert1') + ' ' + env.t('tavernAlert2') + '.' ul.list-unstyled.tavern-chat include ./chat-message