diff --git a/css/vips.css b/css/vips.css index 159e7bc51f4424dcccb23985a9f060df63970dd6..222a0ef7fa7d911be0940a31cd822e65d527633e 100644 --- a/css/vips.css +++ b/css/vips.css @@ -428,6 +428,16 @@ button.vips_file_upload:hover { padding: 4px; } +.mc_flex, form.default label.mc_flex { + align-items: start; + column-gap: 6px; + display: flex; +} + +.mc_flex > img:first-child { + padding: 2px; +} + .correct_item { background: #f0fff0; border: 1px solid #b0ffb0; diff --git a/images/choice_checked.svg b/images/choice_checked.svg index 9a41a8eb70efb7f462bc3f74497554b96f4bbc30..04369a49b404e998681d69456b68aed38ff4e733 100644 --- a/images/choice_checked.svg +++ b/images/choice_checked.svg @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="12px" height="12px" viewBox="0 0 16 16"> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16px" height="16px" viewBox="0 0 16 16"> <path d="M7.986,1.337c-3.688,0-6.678,2.988-6.678,6.676c0,3.687,2.99,6.676,6.678,6.676c3.689,0,6.677-2.989,6.677-6.676 C14.663,4.326,11.675,1.337,7.986,1.337z M7.986,13.231c-2.882,0-5.219-2.336-5.219-5.218s2.337-5.218,5.219-5.218 c2.882,0,5.219,2.335,5.219,5.218S10.868,13.231,7.986,13.231z"/> diff --git a/images/choice_unchecked.svg b/images/choice_unchecked.svg index 7f9b0ae9d9f11acf5756d439d62d3defea6dc9dc..cd92a0cb0add322f95fd48d98ac3e1c17b641cda 100644 --- a/images/choice_unchecked.svg +++ b/images/choice_unchecked.svg @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="12px" height="12px" viewBox="0 0 16 16"> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16px" height="16px" viewBox="0 0 16 16"> <path d="M7.999,1.337c-3.687,0-6.676,2.988-6.676,6.676c0,3.687,2.989,6.676,6.676,6.676c3.689,0,6.677-2.989,6.677-6.676 C14.676,4.326,11.688,1.337,7.999,1.337z M7.999,13.231c-2.88,0-5.217-2.336-5.217-5.218s2.337-5.218,5.217-5.218 c2.882,0,5.218,2.335,5.218,5.218S10.881,13.231,7.999,13.231z"/> diff --git a/views/exercises/mc_exercise/correct.php b/views/exercises/mc_exercise/correct.php index c732295ac3083f32b10ada92b2a0c591177f7c50..faec5dea2b4565350fbd6bba22d2b76dae691621 100644 --- a/views/exercises/mc_exercise/correct.php +++ b/views/exercises/mc_exercise/correct.php @@ -1,6 +1,6 @@ <div class="mc_list inline-content"> <? foreach ($exercise->task['answers'] as $key => $entry): ?> - <div class="<?= $show_solution && $entry['score'] ? 'correct_item' : 'mc_item' ?>"> + <div class="mc_flex <?= $show_solution && $entry['score'] ? 'correct_item' : 'mc_item' ?>"> <? if (isset($response[$key]) && $response[$key]): ?> <?= Assets::img(vips_image_url('choice_checked.svg')) ?> <? else: ?> diff --git a/views/exercises/mc_exercise/print.php b/views/exercises/mc_exercise/print.php index 42ef91584eda782886e18fbd9b8ed79fcfaaa8c4..24909860bb9b1909d168dcce5e568885fd607868 100644 --- a/views/exercises/mc_exercise/print.php +++ b/views/exercises/mc_exercise/print.php @@ -1,6 +1,6 @@ <div class="mc_list inline-content"> <? foreach ($exercise->task['answers'] as $key => $entry): ?> - <div class="<?= $show_solution && $entry['score'] ? 'correct_item' : 'mc_item' ?>"> + <div class="mc_flex <?= $show_solution && $entry['score'] ? 'correct_item' : 'mc_item' ?>"> <? if (isset($response[$key]) && $response[$key]): ?> <?= Assets::img(vips_image_url('choice_checked.svg')) ?> <? else: ?> diff --git a/views/exercises/mc_exercise/solve.php b/views/exercises/mc_exercise/solve.php index 050433f24e84a7f3b36220d5108246708fb13a3f..0872ba37fbfd754d05fbba8ab38484d03b11dd5a 100644 --- a/views/exercises/mc_exercise/solve.php +++ b/views/exercises/mc_exercise/solve.php @@ -1,5 +1,5 @@ <? foreach ($exercise->task['answers'] as $key => $entry): ?> - <label class="inline-content"> + <label class="inline-content mc_flex"> <input type="checkbox" name="answer[<?= $key ?>]" value="1"<? if (isset($response[$key]) && $response[$key]): ?> checked<? endif ?>> <?= formatReady($entry['text']) ?> </label> diff --git a/views/exercises/sc_exercise/correct.php b/views/exercises/sc_exercise/correct.php index b1cd8a2e76610d6987a3e98744a177cbd5901660..83c99b1aefc02f1ecc6c45b642a96fc28db941e2 100644 --- a/views/exercises/sc_exercise/correct.php +++ b/views/exercises/sc_exercise/correct.php @@ -7,7 +7,7 @@ <div class="mc_list inline-content"> <? foreach ($task['answers'] + $optional_answer as $key => $entry): ?> - <div class="<?= $show_solution && $entry['score'] == 1 ? 'correct_item' : 'mc_item' ?>"> + <div class="mc_flex <?= $show_solution && $entry['score'] == 1 ? 'correct_item' : 'mc_item' ?>"> <? if (isset($response[$group]) && $response[$group] === "$key"): ?> <?= Assets::img(vips_image_url('choice_checked.svg')) ?> <? else: ?> diff --git a/views/exercises/sc_exercise/print.php b/views/exercises/sc_exercise/print.php index 45b192399b4f476a1de0c0b8326f7d36fe73306e..a9baf1bc28a7b480f1627db8f429a6d4066d93a4 100644 --- a/views/exercises/sc_exercise/print.php +++ b/views/exercises/sc_exercise/print.php @@ -7,7 +7,7 @@ <div class="mc_list inline-content"> <? foreach ($task['answers'] + $optional_answer as $key => $entry): ?> - <div class="<?= $show_solution && $entry['score'] == 1 ? 'correct_item' : 'mc_item' ?>"> + <div class="mc_flex <?= $show_solution && $entry['score'] == 1 ? 'correct_item' : 'mc_item' ?>"> <? if (isset($response[$group]) && $response[$group] === "$key"): ?> <?= Assets::img(vips_image_url('choice_checked.svg')) ?> <? else: ?> diff --git a/views/exercises/sc_exercise/solve.php b/views/exercises/sc_exercise/solve.php index 4f0b67736fdcc9628f6bf7ebc5742fa82b370473..ebe6d9ee73089f674471f80961e9cba8f9885d91 100644 --- a/views/exercises/sc_exercise/solve.php +++ b/views/exercises/sc_exercise/solve.php @@ -6,7 +6,7 @@ </div> <? foreach ($task['answers'] + $optional_answer as $key => $entry): ?> - <label class="inline-content"> + <label class="inline-content mc_flex"> <input type="radio" name="answer[<?= $group ?>]" value="<?= $key ?>" <? if (!isset($response[$group]) && $key == -1 || isset($response[$group]) && $response[$group] === "$key"): ?>checked<? endif ?>> <?= formatReady($entry['text']) ?>