Merge branch 'MDL-42980_m26' of git://github.com/rwijaya/moodle into MOODLE_26_STABLE

Conflicts: theme/bootstrapbase/style/moodle.css
2014-01-20 12:56:20 +08:00
parent b53af0f2a6 dc842aaa36
commit 8a073e4364
2 changed files with 7 additions and 1 deletions
@@ -1681,6 +1681,12 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
    padding: 0.7em 0;
    text-align: center;
 }
+/* Fixed for safari browser on iPhone4S with ios7.*/
+@media (max-height: 639px) {
+    .ios.safari .choosercontainer #chooseform .submitbuttons {
+        padding: 45px 0;
+    }
+}
 .choosercontainer #chooseform .submitbuttons input {
    min-width: 100px;
    margin: 0 0.5em;