summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/components/cards/cardDetails.jade13
-rw-r--r--client/components/cards/cardDetails.js2
-rw-r--r--client/components/cards/cardDetails.styl28
-rw-r--r--client/components/cards/minicard.styl4
-rw-r--r--client/components/lists/list.styl1
-rw-r--r--client/components/lists/listHeader.jade2
6 files changed, 22 insertions, 28 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index 3cb1c87d..6ff1c38a 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -7,19 +7,12 @@ template(name="cardDetails")
button.primary.confirm(type="submit") {{_ 'save'}}
a.fa.fa-times-thin.js-close-inlined-form
else
- a.fa.fa-angle-left.close-card-details.js-close-card-details
+ a.fa.fa-times-thin.close-card-details.js-close-card-details
if currentUser.isBoardMember
- a.fa.fa-bars.card-details-menu.js-open-card-details-menu
+ a.fa.fa-ellipsis-v.card-details-menu.js-open-card-details-menu
h2.card-details-title.js-card-title(
class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}")
= title
- p.card-details-list
- | {{_ 'in-list'}}
- a.card-details-list-title(
- class="{{#if currentUser.isBoardMember}}js-move-card is-editable{{/if}}")
- = list.title
- if currentUser.isBoardMember
- i.fa.fa-chevron-down
.card-details-items
.card-details-item.card-details-item-members
@@ -79,7 +72,7 @@ template(name="cardDetailsActionsPopup")
li: a.js-attachments Edit Attachments…
hr
ul.pop-over-list
- li: a.js-copy Copy Card
+ li: a.js-move-card Move card
unless archived
li: a.js-archive Archive Card
li: a.js-more More
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index 82ecde85..c0ea6a05 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -56,7 +56,6 @@ BlazeComponent.extendComponent({
'click .js-close-card-details': function() {
Utils.goBoardId(this.data().boardId);
},
- 'click .js-move-card': Popup.open('moveCard'),
'click .js-open-card-details-menu': Popup.open('cardDetailsActions'),
'submit .js-card-description': function(evt) {
evt.preventDefault();
@@ -85,6 +84,7 @@ Template.cardDetailsActionsPopup.events({
'click .js-members': Popup.open('cardMembers'),
'click .js-labels': Popup.open('cardLabels'),
'click .js-attachments': Popup.open('cardAttachments'),
+ 'click .js-move-card': Popup.open('moveCard'),
// 'click .js-copy': Popup.open(),
'click .js-archive': function(evt) {
evt.preventDefault();
diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl
index 9a6736ee..8d71c54d 100644
--- a/client/components/cards/cardDetails.styl
+++ b/client/components/cards/cardDetails.styl
@@ -7,7 +7,7 @@
flex-basis: 470px
will-change: flex-basis
overflow: hidden
- background: darken(white, 2%)
+ background: darken(white, 3%)
border-radius: bottom 3px
z-index: 20 !important
animation: flexGrowIn 0.1s
@@ -19,30 +19,30 @@
.card-details-header
margin: 0 -20px 5px
- padding 7px 20px 0
- border-bottom: 1px solid darken(white, 10%)
- min-height: 38px
- position: relative
+ padding 7px 16px
+ background: darken(white, 7%)
+ border-bottom: 1px solid darken(white, 14%)
+
+ .close-card-details,
+ .card-details-menu
+ float: right
.close-card-details
- float: left
font-size: 24px
- padding: 8px
- padding-right: 11px
- margin-left: -18px
+ padding: 5px
+ margin-right: -8px
.card-details-menu
- float: right
- position: absolute
- bottom: 6px
- right: 15px
+ font-size: 17px
+ padding: 10px
.card-details-title
font-weight: bold
font-size: 1.33em
- margin: 3px 0
+ margin: 7px 0 0
padding: 0
+
form.inlined-form
margin-top: 5px
margin-bottom: 10px
diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl
index c45c7eb9..1c27efff 100644
--- a/client/components/cards/minicard.styl
+++ b/client/components/cards/minicard.styl
@@ -52,10 +52,10 @@
&:hover:not(.minicard-composer),
.is-selected &,
.draggable-hover-card &
- background: darken(white, 2%)
+ background: darken(white, 3%)
.draggable-hover-card &
- background: darken(white, 4%)
+ background: darken(white, 7%)
.minicard-cover
background-position: center
diff --git a/client/components/lists/list.styl b/client/components/lists/list.styl
index 86454fcd..3f4e9eba 100644
--- a/client/components/lists/list.styl
+++ b/client/components/lists/list.styl
@@ -81,6 +81,7 @@
.list-header-menu-icon
position: absolute
padding: 7px
+ margin-top: 1px
top: -@padding
right: -@padding
diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade
index e314e18f..0528514e 100644
--- a/client/components/lists/listHeader.jade
+++ b/client/components/lists/listHeader.jade
@@ -7,7 +7,7 @@ template(name="listHeader")
class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}")
= title
if currentUser.isBoardMember
- a.list-header-menu-icon.fa.fa-bars.js-open-list-menu
+ a.list-header-menu-icon.fa.fa-ellipsis-v.js-open-list-menu
template(name="editListTitleForm")
.list-composer