Merge branch 'hotfix/3.1.2'

.htaccess.default

@@ -26,7 +26,7 @@
 # @see https://github.com/h5bp/html5-boilerplate
 ##
 <IfModule mod_headers.c>
-  <FilesMatch "\.(ttf|ttc|otf|eot|woff|font.css)$">
+  <FilesMatch "\.(ttf|ttc|otf|eot|woff|font\.css)$">
     Header set Access-Control-Allow-Origin "*"
   </FilesMatch>
 </IfModule>
@@ -179,7 +179,7 @@ FileETag None
   #
   # For more information see: https://github.com/contao/core/issues/4364
   ##
-  <FilesMatch "\.(js|css|xml|gz)$">
+  <FilesMatch "\.(js|css|xml|gz|svgz)$">
     Header append Vary Accept-Encoding
   </FilesMatch>
 
@@ -250,7 +250,7 @@ FileETag None
   #
   # For more information see: https://github.com/contao/core/issues/4364
   ##
-  <FilesMatch "\.(htm|php|js|css|htc|png|gif|jpe?g|ico|xml|csv|txt|swf|flv|mp4|webm|ogv|mp3|ogg|oga|eot|woff|svg|ttf|pdf|gz)$">
+  <FilesMatch "\.(htm|php|js|css|htc|png|gif|jpe?g|ico|xml|csv|txt|swf|flv|mp4|webm|ogv|mp3|ogg|oga|eot|woff|svg|svgz|ttf|pdf|gz)$">
     RewriteEngine Off
   </FilesMatch>
 

assets/contao/css/grid-uncompressed.css

@@ -101,18 +101,18 @@
 /**
  * Default offset widths
  */
-.offset1  { margin-left:90px;  }
-.offset2  { margin-left:170px; }
-.offset3  { margin-left:250px; }
-.offset4  { margin-left:330px; }
-.offset5  { margin-left:410px; }
-.offset6  { margin-left:490px; }
-.offset7  { margin-left:570px; }
-.offset8  { margin-left:650px; }
-.offset9  { margin-left:730px; }
-.offset10 { margin-left:810px; }
-.offset11 { margin-left:890px; }
-.offset12 { margin-left:970px; }
+.offset1  { margin-left:90px  !important; }
+.offset2  { margin-left:170px !important; }
+.offset3  { margin-left:250px !important; }
+.offset4  { margin-left:330px !important; }
+.offset5  { margin-left:410px !important; }
+.offset6  { margin-left:490px !important; }
+.offset7  { margin-left:570px !important; }
+.offset8  { margin-left:650px !important; }
+.offset9  { margin-left:730px !important; }
+.offset10 { margin-left:810px !important; }
+.offset11 { margin-left:890px !important; }
+.offset12 { margin-left:970px !important; }
 
 /**
  * Reduce the overall width and the width of the grid columns if the screen
@@ -162,18 +162,18 @@
 	/**
 	 * Reduce the offset widths
 	 */
-	.offset1  { margin-left:72px;  }
-	.offset2  { margin-left:134px; }
-	.offset3  { margin-left:196px; }
-	.offset4  { margin-left:258px; }
-	.offset5  { margin-left:320px; }
-	.offset6  { margin-left:382px; }
-	.offset7  { margin-left:444px; }
-	.offset8  { margin-left:506px; }
-	.offset9  { margin-left:568px; }
-	.offset10 { margin-left:630px; }
-	.offset11 { margin-left:692px; }
-	.offset12 { margin-left:754px; }
+	.offset1  { margin-left:72px  !important; }
+	.offset2  { margin-left:134px !important; }
+	.offset3  { margin-left:196px !important; }
+	.offset4  { margin-left:258px !important; }
+	.offset5  { margin-left:320px !important; }
+	.offset6  { margin-left:382px !important; }
+	.offset7  { margin-left:444px !important; }
+	.offset8  { margin-left:506px !important; }
+	.offset9  { margin-left:568px !important; }
+	.offset10 { margin-left:630px !important; }
+	.offset11 { margin-left:692px !important; }
+	.offset12 { margin-left:754px !important; }
 }
 
 /**
@@ -197,4 +197,7 @@
 		display:block !important;
 		width:auto !important;
 	}
+	*[class*="offset"] {
+		margin-left:10px !important;
+	}
 }

assets/contao/js/core-uncompressed.js

@@ -418,7 +418,6 @@ var AjaxRequest =
 				});
 
 				AjaxRequest.hideBox();
-				Backend.addInteractiveHelp();
 				Backend.addColorPicker();
 
 				// HOOK
@@ -831,6 +830,7 @@ var Backend =
 						$('ctrl_'+opt.id).getParent('div').set('html', json.content);
 						json.javascript && Browser.exec(json.javascript);
 						AjaxRequest.hideBox();
+						window.fireEvent('ajax_change');
 					}
 				}).post({'action':act, 'name':opt.id, 'value':$('ctrl_'+opt.id).value, 'REQUEST_TOKEN':Contao.request_token});
 			}

assets/mootools/simplemodal/1.2/css/simplemodal-uncompressed.css

@@ -67,6 +67,12 @@
   -webkit-border-radius: 6px;
   border-radius: 6px;
 }
+.ios .simple-modal {
+  /* see 6028 */
+  overflow: auto;
+  bottom: 40px;
+  -webkit-overflow-scrolling: touch;
+}
 .simple-modal .simple-modal-header {
   padding: 5px 15px;
   margin: 0;