Merge branch 'MDL-41383-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE

2014-05-13 16:01:50 +08:00
parent 11b39253d2 b993411de1
commit 1c48d7e188
2 changed files with 16 additions and 3 deletions
@@ -96,16 +96,29 @@
    float: right;
 }
 .file-picker .fp-repo-items {
+    float: none;
+    width: auto;
+    margin-left:181px;
+}
+.moodle-dialogue-fullscreen .file-picker .fp-repo-items {
+    margin-left: 0px;
+    margin-right:0px;
    float: left;
-    width: 693px;
 }
 .dir-rtl .file-picker .fp-repo-items {
+    margin-left: 0px;
+    margin-right:181px;
+}
+.dir-rtl .moodle-dialogue-fullscreen .file-picker .fp-repo-items {
+    margin-left: 0px;
+    margin-right:0px;
    float: right;
 }
 .file-picker .fp-navbar {
    background: #F2F2F2;
    border-bottom: 1px solid #BBBBBB;
    min-height: 40px;
+    overflow: hidden;
 }
 .file-picker .fp-navbar .fp-viewbar {
    margin: 4px;
@@ -113,7 +126,7 @@

 .file-picker .fp-content {
    background: #FFFFFF;
-    clear: both;
+    clear: none;
    overflow: auto;
    height: 452px;
 }