Merge branch 'MDL-68963-master' of git://github.com/bmbrands/moodle
authorVíctor Déniz Falcón <victor@moodle.com>
Mon, 8 Jun 2020 21:03:39 +0000 (22:03 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Mon, 8 Jun 2020 21:03:39 +0000 (22:03 +0100)
question/type/calculatedmulti/styles.css
question/type/multichoice/styles.css
theme/boost/scss/moodle/core.scss
theme/boost/style/moodle.css
theme/classic/style/moodle.css

index 8724019..297af38 100644 (file)
     display: none;
 }
 
+
 .que.calculatedmulti .answer div.r0,
 .que.calculatedmulti .answer div.r1 {
-    padding: 0.3em;
+    display: flex;
+    margin: 0.25rem 0;
+    align-items: flex-start;
+}
+
+.que.calculatedmulti .answer div.r0 input,
+.que.calculatedmulti .answer div.r1 input {
+    margin: 0.3rem 0.5rem;
+    width: 14px;
 }
index cef8048..df8ed86 100644 (file)
@@ -22,7 +22,8 @@
 
 .que.multichoice .answer div.r0 input,
 .que.multichoice .answer div.r1 input {
-    margin: 0.4rem 0.5rem;
+    margin: 0.3rem 0.5rem;
+    width: 14px;
 }
 
 /* Editing form. */
index afd70e8..ac58e81 100644 (file)
@@ -179,6 +179,17 @@ button.close {
     }
 }
 
+// Safari does not allow custom styling of checkboxes.
+.safari {
+    input[type="checkbox"],
+    input[type="radio"] {
+        &.focus,
+        &:focus {
+            outline: auto;
+        }
+    }
+}
+
 .usermenu,
 div.dropdown-item {
     a,
index 811f3c1..c9fc671 100644 (file)
@@ -9807,6 +9807,11 @@ a.dropdown-toggle:focus:hover,
 button.close:focus:hover {
   text-decoration: none; }
 
+.safari input[type="checkbox"].focus, .safari input[type="checkbox"]:focus,
+.safari input[type="radio"].focus,
+.safari input[type="radio"]:focus {
+  outline: auto; }
+
 .usermenu a,
 .usermenu a[role="button"],
 div.dropdown-item a,
index d3cda53..7be6184 100644 (file)
@@ -10012,6 +10012,11 @@ a.dropdown-toggle:focus:hover,
 button.close:focus:hover {
   text-decoration: none; }
 
+.safari input[type="checkbox"].focus, .safari input[type="checkbox"]:focus,
+.safari input[type="radio"].focus,
+.safari input[type="radio"]:focus {
+  outline: auto; }
+
 .usermenu a,
 .usermenu a[role="button"],
 div.dropdown-item a,