Merge branch 'upstream-devel' into calendar

This commit is contained in:
Nicu Tofan 2018-07-05 20:17:18 +03:00
commit 243797d2e9
No known key found for this signature in database
GPG key ID: 7EE66E95E64FD0B7
55 changed files with 606 additions and 38 deletions

View file

@ -1,5 +1,5 @@
// Edit received, start, due & end dates
const EditCardDate = BlazeComponent.extendComponent({
BlazeComponent.extendComponent({
template() {
return 'editCardDate';
},

View file

@ -5,11 +5,11 @@
position: relative
display: flex
align-items: center
margin-bottom: 2px
margin-bottom: 9px
&.placeholder
background: darken(white, 20%)
border-radius: 2px
border-radius: 9px
&.ui-sortable-helper
cursor: grabbing
@ -37,7 +37,7 @@
flex-wrap: wrap
background-color: #fff
min-height: 20px
box-shadow: 0 0px 16px rgba(0,0,0,0.15) inset
box-shadow: 0 1px 2px rgba(0,0,0,.15)
border-radius: 2px
color: #4d4d4d
overflow: hidden

View file

@ -1,6 +1,6 @@
Template.invitationCode.onRendered(() => {
const setting = Settings.findOne();
if (setting || setting.disableRegistration) {
if (!setting || !setting.disableRegistration) {
$('#invitationcode').hide();
}
});

View file

@ -52,9 +52,9 @@ template(name="filterSidebar")
li(class="{{#if Filter.customFields.isSelected _id}}active{{/if}}")
a.name.js-toggle-custom-fields-filter
span.sidebar-list-item-description
{{ name }}
| {{ name }}
if Filter.customFields.isSelected _id
i.fa.fa-check
i.fa.fa-check
hr
span {{_ 'advanced-filter-label'}}
input.js-field-advanced-filter(type="text")

View file

@ -17,7 +17,7 @@ template(name="userAvatar")
template(name="userAvatarInitials")
svg.avatar.avatar-initials(viewBox="0 0 {{viewPortWidth}} 15")
text(x="50%" y="50%" text-anchor="middle" alignment-baseline="central")= initials
text(x="50%" y="13" text-anchor="middle")= initials
template(name="userPopup")
.board-member-menu