From 55712c3ac7d32c62f88d8eb3203cf98550787334 Mon Sep 17 00:00:00 2001 From: Sukhvir Singh Date: Sat, 15 Feb 2025 02:29:16 +0530 Subject: [PATCH 1/3] Replace Material Icons with Kolibri Design System Icon --- .../frontend/shared/views/details/Details.vue | 4 ---- .../shared/views/files/ImageOnlyThumbnail.vue | 12 ++++------ .../frontend/shared/views/files/Thumbnail.vue | 22 ++++++++----------- .../contentcuration/templates/base.html | 4 ++-- 4 files changed, 15 insertions(+), 27 deletions(-) diff --git a/contentcuration/contentcuration/frontend/shared/views/details/Details.vue b/contentcuration/contentcuration/frontend/shared/views/details/Details.vue index 03ace0c8fd..fe37a3dbe1 100644 --- a/contentcuration/contentcuration/frontend/shared/views/details/Details.vue +++ b/contentcuration/contentcuration/frontend/shared/views/details/Details.vue @@ -553,10 +553,6 @@ .printing /deep/ * { font-family: 'Noto Sans', helvetica !important; - - &.material-icons { - font-family: 'Material Icons' !important; - } } .v-toolbar__title { diff --git a/contentcuration/contentcuration/frontend/shared/views/files/ImageOnlyThumbnail.vue b/contentcuration/contentcuration/frontend/shared/views/files/ImageOnlyThumbnail.vue index 6101b531cb..27e792598a 100644 --- a/contentcuration/contentcuration/frontend/shared/views/files/ImageOnlyThumbnail.vue +++ b/contentcuration/contentcuration/frontend/shared/views/files/ImageOnlyThumbnail.vue @@ -26,19 +26,15 @@ - - image - + :y="y - 14" + :style="{ fill: '#999999' }" /> diff --git a/contentcuration/contentcuration/frontend/shared/views/files/Thumbnail.vue b/contentcuration/contentcuration/frontend/shared/views/files/Thumbnail.vue index 007ebb73d1..3186e26da6 100644 --- a/contentcuration/contentcuration/frontend/shared/views/files/Thumbnail.vue +++ b/contentcuration/contentcuration/frontend/shared/views/files/Thumbnail.vue @@ -52,26 +52,22 @@ :aria-label="kindTitle" class="thumbnail-image" > - {{ icon }} + - image + diff --git a/contentcuration/contentcuration/templates/base.html b/contentcuration/contentcuration/templates/base.html index 8137cc54d5..82108ac00e 100644 --- a/contentcuration/contentcuration/templates/base.html +++ b/contentcuration/contentcuration/templates/base.html @@ -122,11 +122,11 @@ {% if INCIDENT %}
- error {{INCIDENT.message | safe}} + {{INCIDENT.message | safe}}
{% elif DEPRECATED %}
- error {% blocktrans %}Contentworkshop.learningequality.org has been deprecated. Please go to studio.learningequality.org for the latest version of Studio{% endblocktrans %} + {% blocktrans %}Contentworkshop.learningequality.org has been deprecated. Please go to studio.learningequality.org for the latest version of Studio{% endblocktrans %}
{% endif %} {% endblock nav %} From 1964e23289b1c09e2227de536ca9856bec02021b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Mon, 17 Feb 2025 04:47:58 +0000 Subject: [PATCH 2/3] [pre-commit.ci lite] apply automatic fixes --- .../shared/views/files/ImageOnlyThumbnail.vue | 6 ++++-- .../frontend/shared/views/files/Thumbnail.vue | 14 +++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/contentcuration/contentcuration/frontend/shared/views/files/ImageOnlyThumbnail.vue b/contentcuration/contentcuration/frontend/shared/views/files/ImageOnlyThumbnail.vue index 27e792598a..ece215becb 100644 --- a/contentcuration/contentcuration/frontend/shared/views/files/ImageOnlyThumbnail.vue +++ b/contentcuration/contentcuration/frontend/shared/views/files/ImageOnlyThumbnail.vue @@ -31,10 +31,12 @@ class="nothumbnail-image" :class="$isRTL ? 'rtl-image' : 'ltr-image'" > - + :style="{ fill: '#999999' }" + /> diff --git a/contentcuration/contentcuration/frontend/shared/views/files/Thumbnail.vue b/contentcuration/contentcuration/frontend/shared/views/files/Thumbnail.vue index 3186e26da6..4013f98752 100644 --- a/contentcuration/contentcuration/frontend/shared/views/files/Thumbnail.vue +++ b/contentcuration/contentcuration/frontend/shared/views/files/Thumbnail.vue @@ -52,10 +52,12 @@ :aria-label="kindTitle" class="thumbnail-image" > - + :y="y + 20" + :style="{ fill: '#ffffff' }" + /> - + :style="{ fill: '#999999' }" + /> From fb3bb64fa9812225ed7ac19c54c44f13d6dd0969 Mon Sep 17 00:00:00 2001 From: Sukhvir Singh <72186852+SukhvirKooner@users.noreply.github.com> Date: Thu, 20 Mar 2025 14:04:26 +0530 Subject: [PATCH 3/3] Update Details.vue --- .../contentcuration/frontend/shared/views/details/Details.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contentcuration/contentcuration/frontend/shared/views/details/Details.vue b/contentcuration/contentcuration/frontend/shared/views/details/Details.vue index fe37a3dbe1..03ace0c8fd 100644 --- a/contentcuration/contentcuration/frontend/shared/views/details/Details.vue +++ b/contentcuration/contentcuration/frontend/shared/views/details/Details.vue @@ -553,6 +553,10 @@ .printing /deep/ * { font-family: 'Noto Sans', helvetica !important; + + &.material-icons { + font-family: 'Material Icons' !important; + } } .v-toolbar__title {