From 0af264ef87470db05f15d3a8e67da5279af652c7 Mon Sep 17 00:00:00 2001 From: Kelsey Ando Date: Thu, 14 May 2015 21:09:41 -0400 Subject: [PATCH 1/2] changing padding for the leave button on the party page so it will line up with the edit group button --- website/public/css/shared.styl | 3 +++ website/views/options/social/group.jade | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/website/public/css/shared.styl b/website/public/css/shared.styl index b971460366..336eba0356 100644 --- a/website/public/css/shared.styl +++ b/website/public/css/shared.styl @@ -44,6 +44,9 @@ a.hint:hover ul padding-left: 10px +a#btn-leave + margin-top -6px + .group-leave-join .glyphicon-ban-circle color: white; diff --git a/website/views/options/social/group.jade b/website/views/options/social/group.jade index 4315ee285e..4bc11767bc 100644 --- a/website/views/options/social/group.jade +++ b/website/views/options/social/group.jade @@ -18,7 +18,7 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter h3.panel-title | {{group.name}} span.group-leave-join(ng-if='group') - a.btn.btn-sm.btn-danger.pull-right(ng-if=":: isMemberOfGroup(User.user._id, group)", ng-click='clickLeave(group, $event)') + a.btn.btn-sm.btn-danger.pull-right#btn-leave(ng-if=":: isMemberOfGroup(User.user._id, group)", ng-click='clickLeave(group, $event)') span.glyphicon.glyphicon-ban-circle =env.t('leave') a.btn.btn-success.pull-right(ng-if=':: !isMemberOfGroup(User.user._id, group)', ng-click='join(group)')=env.t('join') From f06e286f6435c2f0acde3b165c76c31131681862 Mon Sep 17 00:00:00 2001 From: Kelsey Ando Date: Fri, 15 May 2015 11:00:26 -0400 Subject: [PATCH 2/2] adding changes that were suggested from crookedneighbor to make the edit and save button be btn-sm --- website/public/css/shared.styl | 3 --- website/views/options/social/group.jade | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/website/public/css/shared.styl b/website/public/css/shared.styl index 016d5cf58e..7653337538 100644 --- a/website/public/css/shared.styl +++ b/website/public/css/shared.styl @@ -45,9 +45,6 @@ a.hint:hover ul list-style-position: inside; -a#btn-leave - margin-top -6px - .group-leave-join .glyphicon-ban-circle color: white; diff --git a/website/views/options/social/group.jade b/website/views/options/social/group.jade index 3d322396d0..add08b2ddc 100644 --- a/website/views/options/social/group.jade +++ b/website/views/options/social/group.jade @@ -18,13 +18,13 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter h3.panel-title | {{group.name}} span.group-leave-join(ng-if='group') - a.btn.btn-sm.btn-danger.pull-right#btn-leave(ng-if=":: isMemberOfGroup(User.user._id, group)", ng-click='clickLeave(group, $event)') + a.btn.btn-sm.btn-danger.pull-right(ng-if=":: isMemberOfGroup(User.user._id, group)", ng-click='clickLeave(group, $event)') span.glyphicon.glyphicon-ban-circle =env.t('leave') a.btn.btn-success.pull-right(ng-if=':: !isMemberOfGroup(User.user._id, group)', ng-click='join(group)')=env.t('join') 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-sm.btn-primary.pull-right(ng-click='save(group)', ng-show='group._editing')=env.t('save') + button.btn.btn-sm.btn-default.pull-right(ng-click='group._editing = true', ng-hide='group._editing')=env.t('editGroup') .panel-body form(ng-show='group._editing')