Merge branch '42682-26' of git://github.com/samhemelryk/moodle into M…

…OODLE_26_STABLE
moodle · Jan 20, 2014 · 4f02d00 · 4f02d00
2 parents 1605660 + d073c81
commit 4f02d00
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 7 deletions.
diff --git a/theme/bootstrapbase/less/moodle/modules.less b/theme/bootstrapbase/less/moodle/modules.less
@@ -11,6 +11,13 @@ select {
 
 // Forum
 
+.path-mod-forum .forumsearch {
+    input,
+    .helptooltip {
+        margin: 0 3px;
+    }
+}
+
 .path-mod-forum .forumheaderlist,
 .path-mod-forum .forumheaderlist td {
     border: none;
@@ -71,12 +78,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 {

diff --git a/theme/bootstrapbase/less/moodle/responsive.less b/theme/bootstrapbase/less/moodle/responsive.less
@@ -498,4 +498,26 @@
             margin: 0 0 1em 0;
         }
     }
+
+    #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;
+   }
 }
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css