From f3915d78f86fe2fdd8620139388dfc95cd92925e Mon Sep 17 00:00:00 2001 From: Elmar Ludwig Date: Thu, 20 Feb 2025 08:30:53 +0000 Subject: update icons for vips (except for assignment icons), re #5163 Merge request studip/studip!3948 --- lib/models/vips/ClozeTask.php | 2 +- lib/models/vips/MatchingTask.php | 2 +- lib/models/vips/MatrixChoiceTask.php | 2 +- lib/models/vips/MultipleChoiceTask.php | 2 +- lib/models/vips/SequenceTask.php | 2 +- lib/models/vips/SingleChoiceTask.php | 2 +- lib/models/vips/TextLineTask.php | 2 +- lib/models/vips/TextTask.php | 2 +- public/assets/images/icons/black/vips.svg | 2 +- public/assets/images/icons/blue/assessment-mc.svg | 1 - public/assets/images/icons/blue/edit-line.svg | 1 - public/assets/images/icons/blue/task-cloze.svg | 1 + public/assets/images/icons/blue/task-matching.svg | 1 + public/assets/images/icons/blue/task-matrix-choice.svg | 1 + public/assets/images/icons/blue/task-multiple-choice.svg | 1 + public/assets/images/icons/blue/task-sequence.svg | 1 + public/assets/images/icons/blue/task-single-choice.svg | 1 + public/assets/images/icons/blue/task-text-line.svg | 1 + public/assets/images/icons/blue/task-text.svg | 1 + public/assets/images/icons/blue/vips.svg | 2 +- public/assets/images/icons/red/vips.svg | 2 +- public/assets/images/icons/white/vips.svg | 2 +- resources/assets/stylesheets/scss/courseware/variables.scss | 2 +- 23 files changed, 21 insertions(+), 15 deletions(-) delete mode 100644 public/assets/images/icons/blue/assessment-mc.svg delete mode 100644 public/assets/images/icons/blue/edit-line.svg create mode 100644 public/assets/images/icons/blue/task-cloze.svg create mode 100644 public/assets/images/icons/blue/task-matching.svg create mode 100644 public/assets/images/icons/blue/task-matrix-choice.svg create mode 100644 public/assets/images/icons/blue/task-multiple-choice.svg create mode 100644 public/assets/images/icons/blue/task-sequence.svg create mode 100644 public/assets/images/icons/blue/task-single-choice.svg create mode 100644 public/assets/images/icons/blue/task-text-line.svg create mode 100644 public/assets/images/icons/blue/task-text.svg diff --git a/lib/models/vips/ClozeTask.php b/lib/models/vips/ClozeTask.php index b5c8069..4e45d26 100644 --- a/lib/models/vips/ClozeTask.php +++ b/lib/models/vips/ClozeTask.php @@ -34,7 +34,7 @@ class ClozeTask extends Exercise */ public static function getTypeIcon(string $role = Icon::DEFAULT_ROLE): Icon { - return Icon::create('log', $role); + return Icon::create('task-cloze', $role); } /** diff --git a/lib/models/vips/MatchingTask.php b/lib/models/vips/MatchingTask.php index bb559e2..62d704f 100644 --- a/lib/models/vips/MatchingTask.php +++ b/lib/models/vips/MatchingTask.php @@ -34,7 +34,7 @@ class MatchingTask extends Exercise */ public static function getTypeIcon(string $role = Icon::DEFAULT_ROLE): Icon { - return Icon::create('view-list', $role); + return Icon::create('task-matching', $role); } /** diff --git a/lib/models/vips/MatrixChoiceTask.php b/lib/models/vips/MatrixChoiceTask.php index 1ba2d90..f6ca62c 100644 --- a/lib/models/vips/MatrixChoiceTask.php +++ b/lib/models/vips/MatrixChoiceTask.php @@ -34,7 +34,7 @@ class MatrixChoiceTask extends Exercise */ public static function getTypeIcon(string $role = Icon::DEFAULT_ROLE): Icon { - return Icon::create('timetable', $role); + return Icon::create('task-matrix-choice', $role); } /** diff --git a/lib/models/vips/MultipleChoiceTask.php b/lib/models/vips/MultipleChoiceTask.php index 68470ef..90ba859 100644 --- a/lib/models/vips/MultipleChoiceTask.php +++ b/lib/models/vips/MultipleChoiceTask.php @@ -34,7 +34,7 @@ class MultipleChoiceTask extends Exercise */ public static function getTypeIcon(string $role = Icon::DEFAULT_ROLE): Icon { - return Icon::create('assessment-mc', $role); + return Icon::create('task-multiple-choice', $role); } /** diff --git a/lib/models/vips/SequenceTask.php b/lib/models/vips/SequenceTask.php index 696fe6a..b7aa908 100644 --- a/lib/models/vips/SequenceTask.php +++ b/lib/models/vips/SequenceTask.php @@ -34,7 +34,7 @@ class SequenceTask extends Exercise */ public static function getTypeIcon(string $role = Icon::DEFAULT_ROLE): Icon { - return Icon::create('hamburger', $role); + return Icon::create('task-sequence', $role); } /** diff --git a/lib/models/vips/SingleChoiceTask.php b/lib/models/vips/SingleChoiceTask.php index 4029a65..1db425d 100644 --- a/lib/models/vips/SingleChoiceTask.php +++ b/lib/models/vips/SingleChoiceTask.php @@ -34,7 +34,7 @@ class SingleChoiceTask extends Exercise */ public static function getTypeIcon(string $role = Icon::DEFAULT_ROLE): Icon { - return Icon::create('assessment', $role); + return Icon::create('task-single-choice', $role); } /** diff --git a/lib/models/vips/TextLineTask.php b/lib/models/vips/TextLineTask.php index 4a2e7d2..2a7dc18 100644 --- a/lib/models/vips/TextLineTask.php +++ b/lib/models/vips/TextLineTask.php @@ -34,7 +34,7 @@ class TextLineTask extends Exercise */ public static function getTypeIcon(string $role = Icon::DEFAULT_ROLE): Icon { - return Icon::create('edit-line', $role); + return Icon::create('task-text-line', $role); } /** diff --git a/lib/models/vips/TextTask.php b/lib/models/vips/TextTask.php index 5684195..03aa088 100644 --- a/lib/models/vips/TextTask.php +++ b/lib/models/vips/TextTask.php @@ -34,7 +34,7 @@ class TextTask extends Exercise */ public static function getTypeIcon(string $role = Icon::DEFAULT_ROLE): Icon { - return Icon::create('edit', $role); + return Icon::create('task-text', $role); } /** diff --git a/public/assets/images/icons/black/vips.svg b/public/assets/images/icons/black/vips.svg index fdd66a7..0131146 100644 --- a/public/assets/images/icons/black/vips.svg +++ b/public/assets/images/icons/black/vips.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/public/assets/images/icons/blue/assessment-mc.svg b/public/assets/images/icons/blue/assessment-mc.svg deleted file mode 100644 index cb919d8..0000000 --- a/public/assets/images/icons/blue/assessment-mc.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/assets/images/icons/blue/edit-line.svg b/public/assets/images/icons/blue/edit-line.svg deleted file mode 100644 index b8e2f4a..0000000 --- a/public/assets/images/icons/blue/edit-line.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/assets/images/icons/blue/task-cloze.svg b/public/assets/images/icons/blue/task-cloze.svg new file mode 100644 index 0000000..5b1a022 --- /dev/null +++ b/public/assets/images/icons/blue/task-cloze.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/blue/task-matching.svg b/public/assets/images/icons/blue/task-matching.svg new file mode 100644 index 0000000..b6a2d63 --- /dev/null +++ b/public/assets/images/icons/blue/task-matching.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/blue/task-matrix-choice.svg b/public/assets/images/icons/blue/task-matrix-choice.svg new file mode 100644 index 0000000..a0da2c0 --- /dev/null +++ b/public/assets/images/icons/blue/task-matrix-choice.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/blue/task-multiple-choice.svg b/public/assets/images/icons/blue/task-multiple-choice.svg new file mode 100644 index 0000000..cfc96d4 --- /dev/null +++ b/public/assets/images/icons/blue/task-multiple-choice.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/blue/task-sequence.svg b/public/assets/images/icons/blue/task-sequence.svg new file mode 100644 index 0000000..d3979ab --- /dev/null +++ b/public/assets/images/icons/blue/task-sequence.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/blue/task-single-choice.svg b/public/assets/images/icons/blue/task-single-choice.svg new file mode 100644 index 0000000..6a9c88d --- /dev/null +++ b/public/assets/images/icons/blue/task-single-choice.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/blue/task-text-line.svg b/public/assets/images/icons/blue/task-text-line.svg new file mode 100644 index 0000000..036e05c --- /dev/null +++ b/public/assets/images/icons/blue/task-text-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/blue/task-text.svg b/public/assets/images/icons/blue/task-text.svg new file mode 100644 index 0000000..1ff1739 --- /dev/null +++ b/public/assets/images/icons/blue/task-text.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/blue/vips.svg b/public/assets/images/icons/blue/vips.svg index 35dae00..ae407a4 100644 --- a/public/assets/images/icons/blue/vips.svg +++ b/public/assets/images/icons/blue/vips.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/public/assets/images/icons/red/vips.svg b/public/assets/images/icons/red/vips.svg index 49c4cae..6b4de6b 100644 --- a/public/assets/images/icons/red/vips.svg +++ b/public/assets/images/icons/red/vips.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/public/assets/images/icons/white/vips.svg b/public/assets/images/icons/white/vips.svg index 516901d..a8eeed5 100644 --- a/public/assets/images/icons/white/vips.svg +++ b/public/assets/images/icons/white/vips.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/assets/stylesheets/scss/courseware/variables.scss b/resources/assets/stylesheets/scss/courseware/variables.scss index b3da454..248e300 100644 --- a/resources/assets/stylesheets/scss/courseware/variables.scss +++ b/resources/assets/stylesheets/scss/courseware/variables.scss @@ -74,7 +74,7 @@ $blockadder-items: ( key-point: exclaim-circle, link: link-extern, table-of-contents: table-of-contents, - test: check-circle, + test: vips, text: edit, timeline: date-cycle, typewriter: block-typewriter, -- cgit v1.0