Merge branch 'hotfix/3.3.5' into develop

Conflicts:
	composer.json
	composer.lock
	contao/install.php
	contao/password.php
	index.php
	system/docs/CHANGELOG.md

Author: leofeyer

.gitignore

@@ -13,6 +13,7 @@ nbproject/
 # Contao
 /.htaccess
 /*.xml
+/composer
 /contao/update.phar.php
 /files/*
 /assets/css/*
@@ -27,6 +28,8 @@ nbproject/
 /system/config/pathconfig.php
 /system/cron/cron.txt
 /system/logs/*
+/system/modules/!composer
+/system/modules/*/.skip
 /system/tmp/*
 /templates/*
 /vendor/

.htaccess.default

@@ -248,7 +248,7 @@ FileETag None
   #   RewriteRule .*\.txt$ index.php [L]    # URL suffix .txt
   #   RewriteRule .*\.json$ index.php [L]   # URL suffix .json
   #
-  # If you do not want to use an URL suffix at all, you have to add a second
+  # If you do not want to use an URL suffix at all, you have to add a third
   # line to prevent URLs that point to folders from being rewritten (see #4031).
   #
   #   RewriteCond %{REQUEST_FILENAME} !-d

assets/contao/css/grid-uncompressed.css

@@ -114,6 +114,22 @@
 .offset11 { margin-left:890px !important; }
 .offset12 { margin-left:970px !important; }
 
+/**
+ * Floated articles do not have margin
+ */
+.mod_article.offset1  { margin-left:80px  !important; }
+.mod_article.offset2  { margin-left:160px !important; }
+.mod_article.offset3  { margin-left:240px !important; }
+.mod_article.offset4  { margin-left:320px !important; }
+.mod_article.offset5  { margin-left:400px !important; }
+.mod_article.offset6  { margin-left:480px !important; }
+.mod_article.offset7  { margin-left:560px !important; }
+.mod_article.offset8  { margin-left:640px !important; }
+.mod_article.offset9  { margin-left:720px !important; }
+.mod_article.offset10 { margin-left:800px !important; }
+.mod_article.offset11 { margin-left:880px !important; }
+.mod_article.offset12 { margin-left:960px !important; }
+
 /**
  * Reduce the overall width and the width of the grid columns if the screen
  * width is less than 980px (e.g. on a portrait tablet)
@@ -174,6 +190,22 @@
 	.offset10 { margin-left:630px !important; }
 	.offset11 { margin-left:692px !important; }
 	.offset12 { margin-left:754px !important; }
+
+	/**
+	 * Floated articles do not have margin
+	 */
+	.mod_article.offset1  { margin-left:62px  !important; }
+	.mod_article.offset2  { margin-left:124px !important; }
+	.mod_article.offset3  { margin-left:186px !important; }
+	.mod_article.offset4  { margin-left:248px !important; }
+	.mod_article.offset5  { margin-left:310px !important; }
+	.mod_article.offset6  { margin-left:372px !important; }
+	.mod_article.offset7  { margin-left:434px !important; }
+	.mod_article.offset8  { margin-left:496px !important; }
+	.mod_article.offset9  { margin-left:558px !important; }
+	.mod_article.offset10 { margin-left:620px !important; }
+	.mod_article.offset11 { margin-left:682px !important; }
+	.mod_article.offset12 { margin-left:744px !important; }
 }
 
 /**

assets/contao/css/grid.css

@@ -120,10 +120,10 @@ select,input,textarea {
  * Custom layout sections
  */
 .custom {
-    display:block;
+	display:block;
 }
 #container:after,.custom:after {
-    content:"";
-    display:table;
-    clear:both;
+	content:"";
+	display:table;
+	clear:both;
 }