Merge branch 'MDL-45525-25' of git://github.com/jethac/moodle into MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css

theme/bootstrapbase/less/moodle/modules.less

@@ -22,6 +22,34 @@ select {
     border: none;
 }
 
+.path-mod-forum .forumheaderlist {
+    thead .header {
+        white-space: normal;
+        vertical-align: top;
+    }
+    thead .header.replies {
+        text-align: center;
+    }
+    thead .header.lastpost {
+        text-align: right;
+    }
+    .discussion {
+        .author, .replies, .lastpost {
+            white-space: normal;
+        }
+        .replies {
+            text-align: center;
+        }
+        .topic, .topic.starter, .picture, .author, .replies, .lastpost {
+            vertical-align: top;
+        }
+    }
+}
+
+.path-mod-feedback .generalbox div table tbody img {
+    height: 5px; // we should remove the bar height specification in core
+}
+
 .forumpost {
     .well;
     padding: 6px;
@@ -191,3 +219,39 @@ div#dock {
     padding: 5px;
     text-align: center;
 }
+
+.path-mod-wiki .wiki_headingtitle,
+.path-mod-wiki .midpad,
+.path-mod-wiki .wiki_headingtime {
+    text-align: inherit;
+}
+
+.path-mod-wiki .wiki_contentbox {
+    width: 100%;
+}
+
+// Survey module
+
+.path-mod-survey {
+    .surveytable {
+      > tbody > tr:nth-of-type(odd) {background-color: @tableBackground;}
+      > tbody > tr:nth-of-type(even) {background-color: @tableBackgroundAccent;}
+        .rblock label {text-align: center;}
+    }
+    .resultgraph, .reportsummary, .studentreport, .reportbuttons, .centerpara {
+        text-align:center;
+    }
+}
+// rtl overrides
+.dir-rtl {
+    &.path-mod-forum .forumheaderlist {
+        thead .header.lastpost {
+            text-align: left;
+        }
+        .discussion {
+            .lastpost {
+                text-align: left;
+            }
+        }
+    }
+}