Skip to content

Fixes following testing on TD-6226 #1887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AnjuJose011 merged 2 commits into from
Aug 12, 2026
Merged

Fixes following testing on TD-6226 #1887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
799a73e
Fixes following testing on TD-6226
frank-hee Aug 11, 2026
8ba6e1a
update to footer padding and margins
frank-hee Aug 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 17 additions & 24 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/catalogue/managecatalogue.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,24 @@

<div v-if="catalogue && !isLoading">
<div class="lh-padding-fluid">
<div class="lh-container-xl">
<div class="nhsuk-back-link">

<a :href="'/catalogue/' + reference" class="nhsuk-back-link__link" id="goBackLink">
<svg class="nhsuk-icon nhsuk-icon__chevron-left"
xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>
Go back
</a>
</div>
<h1>Catalogue Management</h1>
<div class="nhsuk-grid-row" v-if="(catalogue.restrictedAccess || catalogue.hidden)">
<div class="nhsuk-grid-column-full">
<p>You are managing the following catalogue and can invite users to request access.</p>
<input type="button" class="nhsuk-button" @click="inviteUserModal()" value="Invite Users" v-if="(catalogue.restrictedAccess || catalogue.hidden)" />

</div>
</div>
<div class="row pt-4">
<div class="col">
<h2>{{catalogue.name}}</h2>
</div>
</div>
<div class="lh-container-xl">
<a :href="'/catalogue/' + reference" class="nhsuk-back-link" id="goBackLink">
Go back
</a>
<h1>Catalogue Management</h1>
<div class="nhsuk-grid-row" v-if="(catalogue.restrictedAccess || catalogue.hidden)">
<div class="nhsuk-grid-column-full">
<p>You are managing the following catalogue and can invite users to request access.</p>
<input type="button" class="nhsuk-button" @click="inviteUserModal()" value="Invite Users" v-if="(catalogue.restrictedAccess || catalogue.hidden)" />

</div>
</div>
<div class="row pt-4">
<div class="col">
<h2>{{catalogue.name}}</h2>
</div>
</div>
</div>
</div>

<div class="lh-padding-fluid-md">
Expand Down
4 changes: 1 addition & 3 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResource.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
<div v-if="hierarchyEditLoaded && !catalogueLockedForEdit">
<div class="lh-padding-fluid grey-banner">
<div class="lh-container-xl">
<div class="nhsuk-back-link nhsuk-u-padding-bottom-3 nhsuk-u-padding-top-3">
<a v-bind:href="myContributionsPageUrl"> < My Contributions</a>
</div>
<a class="nhsuk-back-link" v-bind:href="myContributionsPageUrl">My Contributions</a>
<div class="py-3">
<h1 class="nhsuk-heading-xl nhsuk-u-margin-bottom-2">Contribute a resource</h1>
<div>Before you can continue, give this new resource a title and select a resource type.</div>
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</div>
<div class="col-12 input-with-button">
<input id="newKeyword" aria-labelledby="keyword-label" type="text" class="form-control nhsuk-input" maxlength="260" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
<button type="button" class="nhsuk-button nhsuk-button--secondary ml-3 button_width nhsuk-u-margin-bottom-0" @click="addKeyword">&nbsp;Add</button>
<button type="button" class="nhsuk-button nhsuk-button--secondary ml-3 button_width nhsuk-u-margin-bottom-0" @click="addKeyword">Add</button>
</div>
<div class="col-12 footer-text" id="keyword-label">
You can enter a maximum of 50 characters per keyword
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
</div>
<div class="col-12 mt-4 input-with-button">
<input id="newKeyword" aria-labelledby="keyword-label" aria-describedby="keyworddesc" type="text" class="form-control nhsuk-input" maxlength="260" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
<button type="button" class="nhsuk-button nhsuk-button--secondary ml-3 nhsuk-u-margin-bottom-0" @click="addKeyword">&nbsp;Add</button>
<button type="button" class="nhsuk-button nhsuk-button--secondary ml-3 nhsuk-u-margin-bottom-0" @click="addKeyword">Add</button>
</div>
<div class="col-12 footer-text" id="keyword-label">
You can enter a maximum of 50 characters per keyword
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notification.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</td>
<td class="px-sm-3 py-sm-3">
<div class="d-flex justify-content-between" v-if="notification.userDismissable">
<button data-target="#deleteModal" class="nhsuk-button nhsuk-u-margin-bottom-0" data-toggle="modal" @click="selectNotification(notification)">Delete</button>
<button data-target="#deleteModal" class="nhsuk-button nhsuk-button--secondary-solid nhsuk-u-margin-bottom-0" data-toggle="modal" @click="selectNotification(notification)">Delete</button>
</div>
</td>
</tr>
Expand Down
82 changes: 38 additions & 44 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notifications.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,58 +19,52 @@
</div>

<div v-if="showMessage" :class="[showMessage ? 'd-block' : 'd-none', 'nhsuk-u-margin-bottom-7']">
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" href="#" @click="showNotificationList($event)">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true">
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
</svg>
Back to: Notifications
</a>
<a class="nhsuk-back-link" href="#" @click="showNotificationList($event)">
Back to: Notifications
</a>
<div class="row">
<div class="col-md-8">
<h2>{{this.selectedNotification.title}}</h2>
</div>
</div>

<div class="row">
<div class="col-md-8">
<h2>{{this.selectedNotification.title}}</h2>
</div>
</div>
<div class="row nhsuk-u-font-size-19">
<div class="col-md-8" v-html="selectedNotification.body" />

<div class="row nhsuk-u-font-size-19">
<div class="col-md-8" v-html="selectedNotification.body" />
<div class="col-md-4">
<div class="d-block d-md-none mx-n4">
<hr class="mt-3" />
</div>

<div class="col-md-4">
<div class="d-block d-md-none mx-n4">
<hr class="mt-3" />
</div>

<div class="row">
<div class="col-4">Added on:</div>
<div class="col">
{{selectedNotification.date | formatDate('DD MMM YYYY')}}
</div>
<div class="w-100 py-2"></div>
<div class="col-4">Type:</div>
<div class="col" v-for="item in notificationTypeContent()">
<i :class="[item.className + ' pr-3']"></i>{{ item.text }}
</div>
<div class="w-100 py-2"></div>
<div class="col-4">Status:</div>
<div class="col">
<i class="fa-regular fa-envelope-open text-success pr-3"></i>Read
</div>
</div>
<div class="row">
<div class="col-4">Added on:</div>
<div class="col">
{{selectedNotification.date | formatDate('DD MMM YYYY')}}
</div>
<div class="w-100 py-2"></div>
<div class="col-4">Type:</div>
<div class="col" v-for="item in notificationTypeContent()">
<i :class="[item.className + ' pr-3']"></i>{{ item.text }}
</div>
<div class="w-100 py-2"></div>
<div class="col-4">Status:</div>
<div class="col">
<i class="fa-regular fa-envelope-open text-success pr-3"></i>Read
</div>
</div>

<div class="d-none d-md-block">
<hr class="py-2 mt-3" />
</div>
<div class="d-none d-md-block">
<hr class="py-2 mt-3" />
</div>

<template v-if="selectedNotification.userDismissable">
<div class="d-block d-md-none mx-n4">
<hr class="py-2 mt-4" />
</div>
<button data-target="#deleteModal" data-toggle="modal" class="nhsuk-button">Delete</button>
</template>
<template v-if="selectedNotification.userDismissable">
<div class="d-block d-md-none mx-n4">
<hr class="py-2 mt-4" />
</div>
<button data-target="#deleteModal" data-toggle="modal" class="nhsuk-button">Delete</button>
</template>
</div>
</div>
</div>

<div class="modal" tabindex="-1" role="dialog" id="deleteModalButton">
Expand Down
1 change: 1 addition & 0 deletions LearningHub.Nhs.WebUI/Styles/abstracts/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ $nhsuk-grey-divider: #D7D7D7;
$nhsuk-blue-divider: #4081C1;
$nhsuk-btn-blue-hover: #003f7b;
$nhsuk-btn-outline-hover: #E4F2FF;
$nhsuk-secondary-text-colour: #4C6272 ;
$twitter-blue: #29A3EF;
$govuk-focus-highlight-yellow: #fd0;
$font-stack: FrutigerLTW01-55Roman, Arial, sans-serif;
Expand Down
26 changes: 10 additions & 16 deletions LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,15 @@ body {
}

.nhsuk-width-container.app-width-container.beta-banner {
padding: px2rem(8) px2rem(32);
max-width: px2rem(1208);
margin: 0 auto;
padding: px2rem(8) px2rem(32);
max-width: px2rem(1208);
margin: 0 auto;
}

#nhsuk-cookie-banner .nhsuk-width-container {
padding: px2rem(8) px2rem(32);
max-width: px2rem(1208);
margin: 0 auto;
}

.nhsuk-header .nhsuk-header__container::after {
Expand Down Expand Up @@ -174,15 +180,7 @@ body {
}

button[data-toggle="modal"] {
color: #005eb8;
padding: 0;
border: none;
background: none;

&:focus {
background: yellow;
border-bottom: 4px solid;
}
padding: 0.25rem;
}

.autosuggestion-menu {
Expand Down Expand Up @@ -518,10 +516,6 @@ li.autosuggestion-option:last-of-type a:focus {
padding-right: px2rem(16);
}

.nhsuk-back-link {
padding: 0.5rem 0;
}

.nhsuk-width-container.nhsuk-header__container.app-width-container {
padding-bottom: 0;
}
Expand Down
Loading
Loading