9 files changed, 37 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56fc9f2a..1c3a038c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,26 @@
+# Upcoming Wekan release
+
+This release fixes the following bugs:
+
+- [Fix warning about missing space in jade file](https://github.com/wekan/wekan/commit/067aef9de948ef0cb6037d52602100b00d214706);
+- Revert [Fix vertical align of user avatar initials](https://github.com/wekan/wekan/pull/1714), so that [initials are again
+  visible](https://github.com/wekan/wekan/commit/122a61b3333fb77c0f08bbdc6fe0d3c2f6db97df);
+- Fix lint warning: [EditCardDate is assigned a value but never used
+  no-unused-vars](https://github.com/wekan/wekan/commit/dd324aa581bed7ea31f20968c6b596f373e7054f);
+- Fix [Minimize board sidebar actually just moves it over](https://github.com/wekan/wekan/issues/1589).
+
+Thanks to GitHub users dagomar, pravdomil and xet7 for their contributions.
+
+# v1.11 2018-06-30 Wekan release
+
+This release fixes the following bugs:
+
+* [Remove card shadow](https://github.com/wekan/wekan/pull/1726), Wekan users now prefer not to have it;
+* [Revert](https://github.com/wekan/wekan/commit/928d88cfe1da4187797519c929cd2fdd9ffe9c2e) previous
+  [Less margin-bottom after minicard](https://github.com/wekan/wekan/pull/1713).
+
+Thanks to GitHub users pravdomil and xet7 for their contributions.
+
 # v1.10 2018-06-28 Wekan release
 
 This release fixes the following bugs:
diff --git a/client/components/boards/boardBody.styl b/client/components/boards/boardBody.styl
index a614c7ed..148c6ce1 100644
--- a/client/components/boards/boardBody.styl
+++ b/client/components/boards/boardBody.styl
@@ -15,12 +15,13 @@ position()
 
 .board-wrapper
   position: cover
-  overflow-y: hidden;
+  overflow-x: hidden
+  overflow-y: hidden
 
   .board-canvas
     position: cover
     transition: margin .1s
-    overflow-y: auto;
+    overflow-y: auto
 
     &.is-sibling-sidebar-open
       margin-right: 248px
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 90429dff..5624787c 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/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
diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json
index 53e45eb8..cae8c836 100644
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@@ -100,7 +100,7 @@
     "boardMenuPopup-title": "Menu du tableau",
     "boards": "Tableaux",
     "board-view": "Vue du tableau",
-    "board-view-cal": "Calendar",
+    "board-view-cal": "Calendrier",
     "board-view-swimlanes": "Couloirs",
     "board-view-lists": "Listes",
     "bucket-example": "Comme « todo list » par exemple",
diff --git a/package.json b/package.json
index e3f7b0d8..117baa70 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "The open-source Trello-like kanban",
   "private": true,
   "scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 6dccb65d..22f53168 100644
--- a/sandstorm-pkgdef.capnp
+++ b/sandstorm-pkgdef.capnp
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 95,
+    appVersion = 96,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "1.10.0~2018-06-28"),
+    appMarketingVersion = (defaultText = "1.11.0~2018-06-30"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,