From 69928eb5f7492f7499a5621d99806a49b74947a1 Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Tue, 29 Oct 2024 16:42:19 +0000 Subject: [PATCH 01/11] WMV file included in the admin UI Information page also --- .../Scripts/vuesrc/content/upload/fileValidation.ts | 2 +- .../Scripts/Post-Deploy/Scripts/UpdateFileTypes.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/upload/fileValidation.ts b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/upload/fileValidation.ts index c92d88b7e..a950f3a21 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/upload/fileValidation.ts +++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/upload/fileValidation.ts @@ -8,7 +8,7 @@ export const file_size_validation = (value: any) => { export const file_extension_validation = (value: any) => { if (!value) { return true; } let fileExtension = value.name.split(".").pop(); - let fileType = ['mp4', 'avi', 'm4v', 'mov', 'mkv', 'mpg', 'm2v', 'vob'].find(ext => ext == fileExtension); + let fileType = ['mp4', 'avi', 'm4v', 'mov', 'mkv', 'mpg', 'm2v', 'vob','wmv'].find(ext => ext == fileExtension); return fileType != undefined; }; export const transcriptfile_extension_validation = (value: any) => { diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/UpdateFileTypes.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/UpdateFileTypes.sql index cc5d1935b..f06588190 100644 --- a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/UpdateFileTypes.sql +++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/UpdateFileTypes.sql @@ -1 +1 @@ -update resources.FileType set NotAllowed =1 where Extension='webm' \ No newline at end of file +update resources.FileType set NotAllowed =0 where Extension='WMV' \ No newline at end of file From 2a8e9bd6a2cf35f9d54ddaaa8d57dcb2bfd1097c Mon Sep 17 00:00:00 2001 From: Oluwatobi Awe Date: Wed, 30 Oct 2024 09:15:27 +0000 Subject: [PATCH 02/11] TD-4782 image processing fix --- .../Resources/BlockCollectionRepository.cs | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/WebAPI/LearningHub.Nhs.Repository/Resources/BlockCollectionRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Resources/BlockCollectionRepository.cs index 554fdde25..a65b0ddb6 100644 --- a/WebAPI/LearningHub.Nhs.Repository/Resources/BlockCollectionRepository.cs +++ b/WebAPI/LearningHub.Nhs.Repository/Resources/BlockCollectionRepository.cs @@ -83,22 +83,7 @@ public async Task DeleteBlockCollection(int userId, int blockCollectionId) foreach (var id in collectionIds) { - _ = Task.Run(async () => - { - var lhContext = new LearningHubDbContext(this.DbContext.Options); - try - { - await lhContext.Database.ExecuteSqlRawAsync("resources.BlockCollectionDelete @p0", new SqlParameter("@p0", SqlDbType.Int) { Value = id }); - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - finally - { - await lhContext.DisposeAsync(); - } - }); + await this.DbContext.Database.ExecuteSqlRawAsync("resources.BlockCollectionDelete @p0", new SqlParameter("@p0", SqlDbType.Int) { Value = id }); } } From 25039ae7f2048bd0780d760ddf1dffd506bea30d Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Thu, 31 Oct 2024 13:08:57 +0000 Subject: [PATCH 03/11] TD-4944: Fixes for UI issues on Mobile view --- .../Scripts/vuesrc/content/pageSectionToolbar.vue | 13 +++++++------ .../wwwroot/css/mkplayer-ui.css | 6 +++--- LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css | 6 +++--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue index d091b8081..b5677ca5b 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue +++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue @@ -2,7 +2,7 @@
-
+
{{ contentLib.getPageSectionStatusText(this.pageSection.pageSectionDetail) }}
@@ -168,7 +168,7 @@ getStatusStyle(): string { return this.pageSection.pageSectionDetail.pageSectionStatus === PageSectionStatus.Live ? 'background: #007F3B; height: 45px; margin: -8px;border: 1px solid #FFFFFF;' - : ((this.pageSection.pageSectionDetail.deletePending == null || !this.pageSection.pageSectionDetail.deletePending) ? 'background: #FFB81C; height: 45px; margin: -8px;border: 1px solid #FFFFFF;color: #425563;' : 'background: #DA291C; height: 45px; margin: -8px; border: 1px solid #FFFFFF;'); + : ((this.pageSection.pageSectionDetail.deletePending == null || !this.pageSection.pageSectionDetail.deletePending) ? 'background: #FFB81C; height: 50px; margin: -12px;border: 1px solid #FFFFFF;color: #425563;' : 'background: #DA291C; height: 45px; margin: -8px; border: 1px solid #FFFFFF;'); }, getStatusIconStyle(): string { return 'margin-top:20px;' @@ -214,9 +214,10 @@ @use "../../../Styles/Abstracts/all" as *; .toolBarBox { - position: absolute; - right: 20px; - top: 20px; + position: relative; + right: 12px; + left:3px; + top: 2px; z-index: 1; } @@ -237,7 +238,7 @@ .toolBar { display: flex; padding: 16px; - height: 64px; + height: 60px; float: right; background: $nhsuk-grey; border: 2px solid $nhsuk-white; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/wwwroot/css/mkplayer-ui.css b/AdminUI/LearningHub.Nhs.AdminUI/wwwroot/css/mkplayer-ui.css index 7cd3f44d9..e564e5c74 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/wwwroot/css/mkplayer-ui.css +++ b/AdminUI/LearningHub.Nhs.AdminUI/wwwroot/css/mkplayer-ui.css @@ -17,7 +17,7 @@ } .bmpui-ui-buffering-overlay, .bmpui-ui-cast-status-overlay, .bmpui-ui-container, .bmpui-ui-controlbar, .bmpui-ui-errormessage-overlay, .bmpui-ui-listbox, .bmpui-ui-playbacktoggle-overlay, .bmpui-ui-recommendation-overlay, .bmpui-ui-seekbar-label, .bmpui-ui-settings-panel, .bmpui-ui-subtitle-overlay.bmpui-fontsize-100 .bmpui-ui-subtitle-label, .bmpui-ui-titlebar, .bmpui-ui-uicontainer, .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay, .bmpui-ui-volumecontrolbutton { - font-size: 1em + font-size: 0.7em } .bmpui-ui-uicontainer { @@ -89,7 +89,7 @@ display: -webkit-box; display: -ms-flexbox; display: flex; - margin: 1em 0 + margin: .5em 0 } .bmpui-ui-controlbar .bmpui-controlbar-top .bmpui-ui-label { @@ -563,7 +563,7 @@ .bmpui-ui-seekbar, .bmpui-ui-volumeslider { cursor: pointer; - font-size: 0.2em; + font-size: 1em; height: 1em; position: relative; width: 100% diff --git a/LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css b/LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css index 7cd3f44d9..e564e5c74 100644 --- a/LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css +++ b/LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css @@ -17,7 +17,7 @@ } .bmpui-ui-buffering-overlay, .bmpui-ui-cast-status-overlay, .bmpui-ui-container, .bmpui-ui-controlbar, .bmpui-ui-errormessage-overlay, .bmpui-ui-listbox, .bmpui-ui-playbacktoggle-overlay, .bmpui-ui-recommendation-overlay, .bmpui-ui-seekbar-label, .bmpui-ui-settings-panel, .bmpui-ui-subtitle-overlay.bmpui-fontsize-100 .bmpui-ui-subtitle-label, .bmpui-ui-titlebar, .bmpui-ui-uicontainer, .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay, .bmpui-ui-volumecontrolbutton { - font-size: 1em + font-size: 0.7em } .bmpui-ui-uicontainer { @@ -89,7 +89,7 @@ display: -webkit-box; display: -ms-flexbox; display: flex; - margin: 1em 0 + margin: .5em 0 } .bmpui-ui-controlbar .bmpui-controlbar-top .bmpui-ui-label { @@ -563,7 +563,7 @@ .bmpui-ui-seekbar, .bmpui-ui-volumeslider { cursor: pointer; - font-size: 0.2em; + font-size: 1em; height: 1em; position: relative; width: 100% From 2395bcc311f334dbd582cd2c10744fd6643217bf Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Thu, 31 Oct 2024 16:50:34 +0000 Subject: [PATCH 04/11] Design fix --- .../Scripts/vuesrc/content/pageSectionToolbar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue index b5677ca5b..c6d45eb5d 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue +++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue @@ -214,7 +214,7 @@ @use "../../../Styles/Abstracts/all" as *; .toolBarBox { - position: relative; + position: absolute; right: 12px; left:3px; top: 2px; From fdd34fae993f6866f745bafe3be80745c3d4be4d Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Thu, 31 Oct 2024 19:27:04 +0000 Subject: [PATCH 05/11] Design fixes --- .../Scripts/vuesrc/content/pageSectionToolbar.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue index c6d45eb5d..3c12b7d85 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue +++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue @@ -2,7 +2,7 @@
-
+
{{ contentLib.getPageSectionStatusText(this.pageSection.pageSectionDetail) }}
@@ -167,8 +167,8 @@ methods: { getStatusStyle(): string { return this.pageSection.pageSectionDetail.pageSectionStatus === PageSectionStatus.Live - ? 'background: #007F3B; height: 45px; margin: -8px;border: 1px solid #FFFFFF;' - : ((this.pageSection.pageSectionDetail.deletePending == null || !this.pageSection.pageSectionDetail.deletePending) ? 'background: #FFB81C; height: 50px; margin: -12px;border: 1px solid #FFFFFF;color: #425563;' : 'background: #DA291C; height: 45px; margin: -8px; border: 1px solid #FFFFFF;'); + ? 'background: #007F3B; height: 50px; margin: -12px;border: 1px solid #FFFFFF;' + : ((this.pageSection.pageSectionDetail.deletePending == null || !this.pageSection.pageSectionDetail.deletePending) ? 'background: #FFB81C; height: 50px; margin: -12px;border: 1px solid #FFFFFF;color: #425563;' : 'background: #DA291C; height: 50px; margin: -12px; border: 1px solid #FFFFFF;'); }, getStatusIconStyle(): string { return 'margin-top:20px;' @@ -216,7 +216,7 @@ .toolBarBox { position: absolute; right: 12px; - left:3px; + left:12px; top: 2px; z-index: 1; } From cb6da196880e7c620527321dc7ec1a14079ac614 Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Fri, 1 Nov 2024 09:34:50 +0000 Subject: [PATCH 06/11] design fix --- .../Scripts/vuesrc/content/pageSectionToolbar.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue index 3c12b7d85..45eddd45b 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue +++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue @@ -216,9 +216,10 @@ .toolBarBox { position: absolute; right: 12px; - left:12px; + left:10px; top: 2px; z-index: 1; + width:fit-content; } .warningTriangle { From 0591e7e1f61da9c08f5e0885c603e4a4e6595822 Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Mon, 4 Nov 2024 13:15:38 +0000 Subject: [PATCH 07/11] Css fixes for mobile devices --- .../wwwroot/css/mkplayer-ui.css | 38 ++++++++++++++++++- .../wwwroot/css/mkplayer-ui.css | 38 ++++++++++++++++++- 2 files changed, 72 insertions(+), 4 deletions(-) diff --git a/AdminUI/LearningHub.Nhs.AdminUI/wwwroot/css/mkplayer-ui.css b/AdminUI/LearningHub.Nhs.AdminUI/wwwroot/css/mkplayer-ui.css index e564e5c74..0929e5a25 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/wwwroot/css/mkplayer-ui.css +++ b/AdminUI/LearningHub.Nhs.AdminUI/wwwroot/css/mkplayer-ui.css @@ -17,7 +17,7 @@ } .bmpui-ui-buffering-overlay, .bmpui-ui-cast-status-overlay, .bmpui-ui-container, .bmpui-ui-controlbar, .bmpui-ui-errormessage-overlay, .bmpui-ui-listbox, .bmpui-ui-playbacktoggle-overlay, .bmpui-ui-recommendation-overlay, .bmpui-ui-seekbar-label, .bmpui-ui-settings-panel, .bmpui-ui-subtitle-overlay.bmpui-fontsize-100 .bmpui-ui-subtitle-label, .bmpui-ui-titlebar, .bmpui-ui-uicontainer, .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay, .bmpui-ui-volumecontrolbutton { - font-size: 0.7em + font-size: 1em } .bmpui-ui-uicontainer { @@ -684,7 +684,7 @@ .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay { bottom: 0; - font-size: 1em; + font-size: 1.2em; left: 0; pointer-events: none; position: absolute; @@ -1871,3 +1871,37 @@ .bmpui-ui-uicontainer.bmpui-layout-max-width-400 .bmpui-ui-hugeplaybacktogglebutton, .bmpui-ui-uicontainer.bmpui-layout-max-width-400 .bmpui-ui-watermark, .bmpui-ui-uicontainer.bmpui-layout-max-width-600 .bmpui-ui-hugeplaybacktogglebutton, .bmpui-ui-uicontainer.bmpui-layout-max-width-600 .bmpui-ui-watermark { font-size: .7em } +@media (max-width: 767px) { + .bmpui-ui-buffering-overlay, + .bmpui-ui-cast-status-overlay, + .bmpui-ui-container, + .bmpui-ui-controlbar, + .bmpui-ui-errormessage-overlay, + .bmpui-ui-listbox, + .bmpui-ui-playbacktoggle-overlay, + .bmpui-ui-recommendation-overlay, + .bmpui-ui-seekbar-label, + .bmpui-ui-settings-panel, + .bmpui-ui-subtitle-overlay.bmpui-fontsize-100 .bmpui-ui-subtitle-label, + .bmpui-ui-titlebar, + .bmpui-ui-uicontainer, + .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay, + .bmpui-ui-volumecontrolbutton { + font-size: 0.7em; + } +} + +@media (max-width: 767px) { + .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay { + bottom: 0; + font-size: 1em; + left: 0; + pointer-events: none; + position: absolute; + right: 0; + text-align: center; + top: 0; + -webkit-transition: bottom .15s ease-out; + transition: bottom .15s ease-out + } +} diff --git a/LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css b/LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css index e564e5c74..df6bc583f 100644 --- a/LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css +++ b/LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css @@ -17,7 +17,7 @@ } .bmpui-ui-buffering-overlay, .bmpui-ui-cast-status-overlay, .bmpui-ui-container, .bmpui-ui-controlbar, .bmpui-ui-errormessage-overlay, .bmpui-ui-listbox, .bmpui-ui-playbacktoggle-overlay, .bmpui-ui-recommendation-overlay, .bmpui-ui-seekbar-label, .bmpui-ui-settings-panel, .bmpui-ui-subtitle-overlay.bmpui-fontsize-100 .bmpui-ui-subtitle-label, .bmpui-ui-titlebar, .bmpui-ui-uicontainer, .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay, .bmpui-ui-volumecontrolbutton { - font-size: 0.7em + font-size: 1em } .bmpui-ui-uicontainer { @@ -684,7 +684,7 @@ .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay { bottom: 0; - font-size: 1em; + font-size: 1.2em; left: 0; pointer-events: none; position: absolute; @@ -1871,3 +1871,37 @@ .bmpui-ui-uicontainer.bmpui-layout-max-width-400 .bmpui-ui-hugeplaybacktogglebutton, .bmpui-ui-uicontainer.bmpui-layout-max-width-400 .bmpui-ui-watermark, .bmpui-ui-uicontainer.bmpui-layout-max-width-600 .bmpui-ui-hugeplaybacktogglebutton, .bmpui-ui-uicontainer.bmpui-layout-max-width-600 .bmpui-ui-watermark { font-size: .7em } +@media (max-width: 767px) { + .bmpui-ui-buffering-overlay, + .bmpui-ui-cast-status-overlay, + .bmpui-ui-container, + .bmpui-ui-controlbar, + .bmpui-ui-errormessage-overlay, + .bmpui-ui-listbox, + .bmpui-ui-playbacktoggle-overlay, + .bmpui-ui-recommendation-overlay, + .bmpui-ui-seekbar-label, + .bmpui-ui-settings-panel, + .bmpui-ui-subtitle-overlay.bmpui-fontsize-100 .bmpui-ui-subtitle-label, + .bmpui-ui-titlebar, + .bmpui-ui-uicontainer, + .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay, + .bmpui-ui-volumecontrolbutton { + font-size: 0.7em; + } +} + +@media (max-width: 767px) { + .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay { + bottom: 0; + font-size: 1em; + left: 0; + pointer-events: none; + position: absolute; + right: 0; + text-align: center; + top: 0; + -webkit-transition: bottom .15s ease-out; + transition: bottom .15s ease-out + } +} \ No newline at end of file From 693c1c5b5404dac56e533aa127002c007960afda Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Tue, 5 Nov 2024 10:32:18 +0000 Subject: [PATCH 08/11] CSS fixes --- .../Scripts/vuesrc/content/pageSectionToolbar.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue index 45eddd45b..52202c8ec 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue +++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue @@ -219,7 +219,6 @@ left:10px; top: 2px; z-index: 1; - width:fit-content; } .warningTriangle { @@ -271,4 +270,14 @@ .toolBarButton i .fa, .fas { font-weight: 100; } + @media(max-width: 767px) { + .toolBarBox { + position: absolute; + right: 12px; + left: 10px; + top: 2px; + z-index: 1; + width: fit-content; + } + } \ No newline at end of file From 289181831e48b54e839177d152867dc751e3f810 Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Tue, 5 Nov 2024 10:32:43 +0000 Subject: [PATCH 09/11] Revert "CSS fixes" This reverts commit 693c1c5b5404dac56e533aa127002c007960afda. --- .../Scripts/vuesrc/content/pageSectionToolbar.vue | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue index 52202c8ec..45eddd45b 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue +++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue @@ -219,6 +219,7 @@ left:10px; top: 2px; z-index: 1; + width:fit-content; } .warningTriangle { @@ -270,14 +271,4 @@ .toolBarButton i .fa, .fas { font-weight: 100; } - @media(max-width: 767px) { - .toolBarBox { - position: absolute; - right: 12px; - left: 10px; - top: 2px; - z-index: 1; - width: fit-content; - } - } \ No newline at end of file From b33c73798c281db21448b3cb74196b5d221b5975 Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Tue, 5 Nov 2024 10:37:50 +0000 Subject: [PATCH 10/11] Design fixes for the admin UI --- .../Scripts/vuesrc/content/pageSectionToolbar.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue index 45eddd45b..a23c8be3e 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue +++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue @@ -219,7 +219,6 @@ left:10px; top: 2px; z-index: 1; - width:fit-content; } .warningTriangle { @@ -270,5 +269,15 @@ .toolBarButton i .fa, .fas { font-weight: 100; + } + @media (max-width: 767px) { + .toolBarBox { + position: absolute; + right: 12px; + left: 10px; + top: 2px; + z-index: 1; + width: fit-content; + } } \ No newline at end of file From 3339cff3231e80a4ae02212962461f3d8f83741a Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Tue, 5 Nov 2024 10:54:26 +0000 Subject: [PATCH 11/11] Footer design fixes --- .../Scripts/vuesrc/content/pageSectionToolbar.vue | 4 ++-- .../Styles/Layout/_footer.scss | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue index a23c8be3e..4d1faf9b0 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue +++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue @@ -269,8 +269,8 @@ .toolBarButton i .fa, .fas { font-weight: 100; - } - @media (max-width: 767px) { + } + @media (max-width: 420px) { .toolBarBox { position: absolute; right: 12px; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Styles/Layout/_footer.scss b/AdminUI/LearningHub.Nhs.AdminUI/Styles/Layout/_footer.scss index 3423503ae..c372b4b21 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Styles/Layout/_footer.scss +++ b/AdminUI/LearningHub.Nhs.AdminUI/Styles/Layout/_footer.scss @@ -28,9 +28,13 @@ .footer-primary, .footer-secondary { - font-size: 17px; - line-height: 28px; - padding-top: 30px; + font-size: 17px; + line-height: 28px; + padding-top: 30px; + + @media (max-width: 420px) { + padding-top: 20px !important; + } } .footer-primary { @@ -63,7 +67,7 @@ padding-right: 15px; @media (max-width: 420px) { - padding-top: 10px !important; + padding-top: 0px !important; text-align: left !important; } }