Merge tag '2.1.4' into develop

Author: alexusmai

src/FileManager.vue

@@ -2,7 +2,7 @@
   <div class="fm d-flex flex-column"
        v-bind:class="{ 'fm-full-screen': fullScreen }">
     <navbar></navbar>
-    <div class="row fm-body">
+    <div class="fm-body">
       <notification></notification>
       <context-menu></context-menu>
       <modal v-if="showModal"></modal>
@@ -204,7 +204,10 @@ export default {
     }
 
     .fm-body {
+      display: flex;
       height: 100%;
+      margin-right: -15px;
+      margin-left: -15px;
       position: relative;
       padding-top: 1rem;
       padding-bottom: 1rem;

src/components/blocks/InfoBlock.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="row justify-content-between fm-info-block">
+    <div class="justify-content-between fm-info-block">
         <div class="col-auto">
             <span v-show="selectedCount">
                 {{ `${lang.info.selected} ${selectedCount}` }}
@@ -146,6 +146,9 @@ export default {
 
 <style lang="scss">
     .fm-info-block {
+        display: flex;
+        margin-right: -15px;
+        margin-left: -15px;
         padding-top: 0.2rem;
         padding-bottom: 0.4rem;
         border-bottom: 1px solid #6d757d;

src/components/modals/additions/Cropper.vue

@@ -272,6 +272,10 @@ export default {
     .fm-additions-cropper {
         overflow: hidden;
 
+        & > .row {
+            flex-wrap: nowrap;
+        }
+
         .cropper-block {
             overflow: hidden;
 

src/store/settings/store.js

@@ -14,7 +14,7 @@ export default {
       acl: null,
 
       // App version
-      version: '2.1.1',
+      version: '2.1.4',
 
       // this headers will be merged with default headers
       headers: {},