From 49591ef5273bae33c26758ab54b4aaad8b085fc8 Mon Sep 17 00:00:00 2001 From: TheSisb Date: Sat, 1 Mar 2014 10:00:32 -0800 Subject: [PATCH 1/3] Fix alignment of buttons Simple fix --- views/options/social/group.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/options/social/group.jade b/views/options/social/group.jade index 6bc92d1ac6..c7d9cb089c 100644 --- a/views/options/social/group.jade +++ b/views/options/social/group.jade @@ -83,8 +83,8 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild h3.panel-title | {{group.name}} span(ng-if='group.leader == user.id') - button.btn.btn-primary.pull-right(ng-click='save(group)', ng-show='group._editing')=env.t('save') - button.btn.btn-default.pull-right(ng-click='group._editing = true', ng-hide='group._editing')=env.t('editGroup') + button.btn.btn-primary.pull-right(ng-click='save(group)', ng-show='group._editing', style="margin-top:-8px;")=env.t('save') + button.btn.btn-default.pull-right(ng-click='group._editing = true', ng-hide='group._editing', style="margin-top:-8px;")=env.t('editGroup') .panel-body form(ng-show='group._editing') From 42b6a5bc7c9faf7edf2a5b76458c3bd1de618cc0 Mon Sep 17 00:00:00 2001 From: TheSisb Date: Sat, 1 Mar 2014 10:16:51 -0800 Subject: [PATCH 2/3] undoing inline style fix --- views/options/social/group.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/options/social/group.jade b/views/options/social/group.jade index c7d9cb089c..6bc92d1ac6 100644 --- a/views/options/social/group.jade +++ b/views/options/social/group.jade @@ -83,8 +83,8 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild h3.panel-title | {{group.name}} span(ng-if='group.leader == user.id') - button.btn.btn-primary.pull-right(ng-click='save(group)', ng-show='group._editing', style="margin-top:-8px;")=env.t('save') - button.btn.btn-default.pull-right(ng-click='group._editing = true', ng-hide='group._editing', style="margin-top:-8px;")=env.t('editGroup') + button.btn.btn-primary.pull-right(ng-click='save(group)', ng-show='group._editing')=env.t('save') + button.btn.btn-default.pull-right(ng-click='group._editing = true', ng-hide='group._editing')=env.t('editGroup') .panel-body form(ng-show='group._editing') From 2c8a43e2483aeb39ee0916a143f13b0b34094223 Mon Sep 17 00:00:00 2001 From: TheSisb Date: Sat, 1 Mar 2014 10:18:06 -0800 Subject: [PATCH 3/3] Fixing buttons alignment in panel headings --- public/css/index.styl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/css/index.styl b/public/css/index.styl index c10b3b12c9..9fc63b124d 100644 --- a/public/css/index.styl +++ b/public/css/index.styl @@ -142,6 +142,8 @@ a.label .btn margin-right: 5px +.panel-heading .btn // Fixing improper vertical alignment of buttons in panel headers + margin-top: -8px .vertical-align vertical-align: middle