Merge branch 'upstream-devel' into calendar

5 files changed, 8 insertions, 8 deletions

diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js
index 02ea09ae..b0f2baa3 100644
--- a/client/components/cards/cardDate.js
+++ b/client/components/cards/cardDate.js
@@ -1,5 +1,5 @@
 // Edit received, start, due & end dates
-const EditCardDate = BlazeComponent.extendComponent({
+BlazeComponent.extendComponent({
   template() {
     return 'editCardDate';
   },
diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl
index 391a6316..b89805be 100644
--- a/client/components/cards/minicard.styl
+++ b/client/components/cards/minicard.styl
@@ -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
diff --git a/client/components/settings/invitationCode.js b/client/components/settings/invitationCode.js
index c02f860f..a403d8ab 100644
--- a/client/components/settings/invitationCode.js
+++ b/client/components/settings/invitationCode.js
@@ -1,6 +1,6 @@
 Template.invitationCode.onRendered(() => {
   const setting = Settings.findOne();
-  if (setting || setting.disableRegistration) {
+  if (!setting || !setting.disableRegistration) {
     $('#invitationcode').hide();
   }
 });
diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade
index 514870b8..f11528b1 100644
--- a/client/components/sidebar/sidebarFilters.jade
+++ b/client/components/sidebar/sidebarFilters.jade
@@ -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")
diff --git a/client/components/users/userAvatar.jade b/client/components/users/userAvatar.jade
index df2ac461..83e2c8d0 100644
--- a/client/components/users/userAvatar.jade
+++ b/client/components/users/userAvatar.jade
@@ -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