mirror of
https://github.com/moodle/moodle.git
synced 2025-03-04 16:10:59 +01:00
Merge branch 'MDL-41215-master' of git://github.com/andrewnicols/moodle
Conflicts: theme/bootstrapbase/style/moodle.css
This commit is contained in:
commit
6455dec02d
@ -34,7 +34,7 @@ background: #E2E2E2;filter: progid:DXImageTransform.Microsoft.gradient(startColo
|
||||
.dir-rtl .file-picker .fp-repo-items {float:right;}
|
||||
.file-picker .fp-navbar {background: #F2F2F2;min-height:22px;border-bottom: 1px solid #BBBBBB;padding: 5px 8px;}
|
||||
.file-picker .fp-content {background: #FFFFFF;clear: both;overflow:auto;height: 468px;}
|
||||
.filepicker.moodle-dialogue-fullscreen .file-picker .fp-content { width: 100%; height: 100%; }
|
||||
.filepicker.moodle-dialogue-fullscreen .file-picker .fp-content { width: 100%; }
|
||||
|
||||
.file-picker .fp-content-loading {height: 100%;width: 100%;display: table;text-align:center;}
|
||||
.file-picker .fp-content .fp-object-container {width:98%;height:98%;}
|
||||
|
@ -116,7 +116,6 @@
|
||||
}
|
||||
.filepicker.moodle-dialogue-fullscreen .file-picker .fp-content {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
.dir-rtl .file-picker .fp-repo-items {
|
||||
margin-right: 181px;
|
||||
|
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user