Merge branch '42682-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css

theme/bootstrapbase/less/moodle/modules.less

@@ -9,6 +9,14 @@ select {
     width: auto;
 }
 
+// Forum
+.path-mod-forum .forumsearch {
+    input,
+    .helptooltip {
+        margin: 0 3px;
+    }
+}
+
 .path-mod-forum .forumheaderlist,
 .path-mod-forum .forumheaderlist td {
     border: none;
@@ -36,12 +44,9 @@ select {
      margin-bottom: 0 !important;
 }
 
-#page-mod-forum-discuss .discussioncontrol.displaymode {
-    text-align: left;
-}
-
-#page-mod-forum-discuss .discussioncontrols .discussioncontrol {
-    float: left;
+#page-mod-forum-discuss .discussioncontrols {
+    width: auto;
+    margin: 0;
 }
 
 #page-footer {

theme/bootstrapbase/less/moodle/responsive.less

@@ -412,3 +412,28 @@
       margin-bottom: 1em;
   }
 }
+
+// All widths up to 1199px.
+@media (max-width: 1199px) {
+    #page-mod-forum-discuss .discussioncontrols {
+        text-align: right;
+        .discussioncontrol {
+            float: none;
+            width: auto;
+            display: inline-block;
+            margin: 0 3px 0.5em;
+            select,
+            input {
+                margin-bottom: 0;
+            }
+            &.movediscussion {
+                margin-right: 0;
+                padding-right: 0;
+            }
+        }
+    }
+
+   #page-mod-forum-discuss.dir-rtl .discussioncontrols {
+       text-align: left;
+   }
+}