Merge branch '4_1'

backend/src/Squidex/Config/Domain/AssetServices.cs

@@ -29,8 +29,11 @@ namespace Squidex.Config.Domain
             services.Configure<AssetOptions>(
                 config.GetSection("assets"));
 
-            services.AddTransientAs<RecursiveDeleter>()
-               .As<IEventConsumer>();
+            if (config.GetValue<bool>("assets:deleteRecursive"))
+            {
+                services.AddTransientAs<RecursiveDeleter>()
+                   .As<IEventConsumer>();
+            }
 
             services.AddTransientAs<AssetDomainObject>()
                 .AsSelf();

backend/src/Squidex/appsettings.json

@@ -217,7 +217,11 @@
     /*
      * The maximum file size in bytes. Default: 5MB
      */
-    "maxSize": 5242880
+    "maxSize": 5242880,
+    /*
+     * True to delete assets recursively.
+     */
+    "deleteRecursive": false
   },
 
   "logging": {

frontend/app/theme/_bootstrap.scss

@@ -1,3 +1,6 @@
+@import '_mixins';
+@import '_vars';
+
 @import './../../node_modules/bootstrap/scss/mixins/_buttons';
 
 //

frontend/app/theme/_common.scss

@@ -1,3 +1,6 @@
+@import '_mixins';
+@import '_vars';
+
 body {
     // Default body with padding for fixed navbar and sidebar.
     & {

frontend/app/theme/_forms.scss

@@ -1,3 +1,6 @@
+@import '_mixins';
+@import '_vars';
+
 //
 // Support for Angular validation states.
 // 

frontend/app/theme/_lists.scss

@@ -1,3 +1,6 @@
+@import '_mixins';
+@import '_vars';
+
 //
 // Custom list that can either be used with a table or divs.
 //

frontend/app/theme/_mixins.scss

@@ -1,3 +1,5 @@
+// sass-lint:disable no-vendor-prefixes, one-declaration-per-line, no-misspelled-properties, no-color-keywords, no-color-literals
+
 @mixin build-icon($color) {
     & {
         color: $color;
@@ -27,13 +29,13 @@
     &:disabled
     &.disabled {
         opacity: .4;
-    }  
+    }
 
     &:focus,
     &.focus {
         box-shadow: 0 0 0 $btn-focus-width rgba($color, .5);
     }
-    
+
     &:active,
     &:hover {
         color: darken($color, 15%);
@@ -71,23 +73,26 @@
     }
 }
 
-@mixin hidden() {
+@mixin hidden {
     opacity: 0;
-    overflow: hidden;
+    overflow-x: hidden;
+    overflow-y: hidden;
     position: absolute;
     width: 0;
 }
 
 @mixin force-width($width) {
-    width:  $width;
     // Ensure that we use the minimum width in flex scenarios.
     max-width: $width;
     min-width: $width;
+    // Normal width definition.
+    width:  $width;
 }
 
 @mixin force-height($height) {
+    // Normal height definition.
     height:  $height;
-    // Ensure that we use the minimum width in flex scenarios.
+    // Ensure that we use the minimum height in flex scenarios.
     max-height: $height;
     min-height: $height;
 }
@@ -122,7 +127,7 @@
     content: '';
     display: inline-block;
 }
- 
+
 @mixin circle($size) {
     @include border-radius($size * .5);
     @include force-height($size);

frontend/app/theme/_panels.scss

@@ -1,3 +1,6 @@
+@import '_mixins';
+@import '_vars';
+
 @mixin panel-icon {
     color: $color-border-dark;
     cursor: pointer;

frontend/app/theme/_static.scss

@@ -1,3 +1,6 @@
+@import '_mixins';
+@import '_vars';
+
 //
 // Noscript element with warning, when javascript is disabled.
 //