Skip to content

Commit

Permalink
Merge pull request #28 from NHSLeadership/develop
Browse files Browse the repository at this point in the history
Release 2023052501
  • Loading branch information
AndyMCole authored May 31, 2023
2 parents 5dde89d + 9e2dc8a commit 939f71e
Show file tree
Hide file tree
Showing 6 changed files with 106 additions and 35 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "nhsla/moodle-nhse",
"type": "moodle-theme",
"version": "2023052401",
"version": "2023052501",
"require": {
"composer/installers": "~1.0"
},
Expand Down
103 changes: 85 additions & 18 deletions scss/nhse.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,18 @@ $btn-secondary-text: $color_nhsuk-white;
$btn-secondary-background: $color_nhsuk-dark-blue;
$btn-secondary-border: $color_nhsuk-dark-blue;

/**
* Generic style tweaks
*/

h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
font-weight: 600
}

/**
* Page and headings
*/

#page-wrapper {
height: 100%;
display: flex;
Expand All @@ -25,13 +37,33 @@ $btn-secondary-border: $color_nhsuk-dark-blue;
}
}

body.limitedwidth #page.drawers .main-inner {
max-width: 960px;
body.limitedwidth {
#page.drawers .main-inner {
max-width: 960px;
}
}

.header-maxwidth {
max-width: 960px;
}

@media (min-width: 768px) {
#page.drawers {
.main-inner {
padding: 1.5rem 1.5rem;
}

div[role="main"] {
padding-left: 0;
padding-right: 0;
}
}

.header-maxwidth {
padding-left: 0;
}
}

#page.drawers {
margin-top: 0;
.main-inner {
Expand Down Expand Up @@ -63,7 +95,9 @@ body.limitedwidth #page.drawers .main-inner {
}
}

// Header navigation and tabs
/**
* Header navigation and tabs
*/

.nhsuk-header__navigation-link {
color: $color_nhsuk-white;
Expand All @@ -82,7 +116,9 @@ body.limitedwidth #page.drawers .main-inner {
}
}

// Header navigation tabs only
/**
* Header navigation tabs only
*/

.nav-tabs {
.nhsuk-header__navigation-link {
Expand Down Expand Up @@ -115,7 +151,9 @@ body.limitedwidth #page.drawers .main-inner {
}
}

// Header navigation light variation
/**
* Header navigation light variation
*/

.nhsuk-header__light {
background-color: $color_nhsuk-white;
Expand Down Expand Up @@ -146,6 +184,10 @@ body.limitedwidth #page.drawers .main-inner {
height: 2.0em;
}

.navbar-expand .navbar-nav .nav-link {
padding-top: 15px;
}

.icon {
font-size: 20px;
width: 20px;
Expand All @@ -154,10 +196,6 @@ body.limitedwidth #page.drawers .main-inner {
padding-bottom:0;
}

.navbar-expand .navbar-nav .nav-link {
padding-top: 15px;
}

.popover-region-header-container {
height: 50px;
padding-top: 10px;
Expand All @@ -175,6 +213,10 @@ body.limitedwidth #page.drawers .main-inner {
}
}

.nav {
margin-left: 0;
}

.navbar {
color: $btn-primary-text;
background-color: $btn-primary-background;
Expand Down Expand Up @@ -348,18 +390,22 @@ body.limitedwidth #page.drawers .main-inner {
}
}

.btn-primary {
color: $btn-primary-text;
background-color: $btn-primary-background;
border-color: $btn-primary-border;
border-radius: 0;
/**
* Button styles
*/

&:hover {
background-color: $btn-secondary-background;
border-color: $btn-secondary-border;
}
.btn-primary:not(.search-icon),
.btn-secondary:not(.search-icon) {
@extend .nhsuk-button;
}

.btn-secondary:not(.search-icon) {
@extend .nhsuk-button--secondary;
}

/**
* Cards and drawers
*/
.card {
border: none;
border-radius: 0;
Expand Down Expand Up @@ -485,3 +531,24 @@ body.limitedwidth #page.drawers .main-inner {
}
}
}

.nhsuk-list--number, ol {
padding-left: 32px;
}

/**
* Calendar styles
*/

.maincalendar {
.calendarmonth {
td {
.day-number-circle {
.day-number {
padding: 50% 0;
}
}
}
}
}

2 changes: 1 addition & 1 deletion templates/core/full_header.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<div class="d-flex flex-wrap">
{{#hasnavbar}}
<div id="page-navbar">
{{{navbar}}}
{{{ navbar }}}
</div>
{{/hasnavbar}}
<div class="ml-auto d-flex">
Expand Down
21 changes: 14 additions & 7 deletions templates/core/navbar.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,24 @@
]
}
}}
<nav aria-label="{{#str}}breadcrumb, access{{/str}}">
<ol class="breadcrumb">{{!
}}{{#get_items}}
<nav class="nhsuk-breadcrumb header-maxwidth d-print-none" aria-label="{{#str}}breadcrumb, access{{/str}}">
<ol class="nhsuk-breadcrumb__list">
<li class="nhsuk-breadcrumb__item">
<a href="{{home_url}}" class="nhsuk-breadcrumb__link"><span class="media-left">
<i class="icon fa fa-home fa-fw " aria-hidden="true"></i>
</span>Home</a>
</li>
{{#get_items}}
{{#has_action}}
<li class="breadcrumb-item{{#is_hidden}} dimmed_text{{/is_hidden}}">
<li class="nhsuk-breadcrumb__item">
<a href="{{{action}}}" {{#is_last}}aria-current="page"{{/is_last}} {{#get_title}}title="{{get_title}}"{{/get_title}}>{{{get_content}}}</a>
</li>
{{/has_action}}
{{^has_action}}
<li class="breadcrumb-item{{#is_hidden}} dimmed_text{{/is_hidden}}"><span>{{{text}}}</span></li>
<li class="nhsuk-breadcrumb__item{{#is_hidden}} dimmed_text{{/is_hidden}}">
<span>{{{text}}}</span>
</li>
{{/has_action}}
{{/get_items}}{{!
}}</ol>
{{/get_items}}
</ol>
</nav>
11 changes: 4 additions & 7 deletions templates/drawers.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@
{{/hasblocks}}
</div>
{{{ output.full_header }}}
{{{ output.breadcrumbs }}}
{{#secondarymoremenu}}
<div class="secondary-navigation d-print-none">
{{> core/moremenu}}
Expand All @@ -138,19 +137,17 @@
<div id="page-content" class="pb-3 d-print-block">
<div id="region-main-box">
{{#hasregionmainsettingsmenu}}
<div id="region-main-settings-menu" class="d-print-none">
<div> {{{ regionmainsettingsmenu }}} </div>
</div>
<div id="region-main-settings-menu" class="d-print-none">
<div> {{{ regionmainsettingsmenu }}} </div>
</div>
{{/hasregionmainsettingsmenu}}

<section id="region-main" aria-label="{{#str}}content{{/str}}">

{{#hasregionmainsettingsmenu}}
<div class="region_main_settings_menu_proxy"></div>
{{/hasregionmainsettingsmenu}}
{{{ output.course_content_header }}}
{{#headercontent}}
{{> core/activity_header }}
{{/headercontent}}
{{#overflow}}
<div class="container-fluid tertiary-navigation">
<div class="navitem">
Expand Down
2 changes: 1 addition & 1 deletion version.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
defined('MOODLE_INTERNAL') || die();

// This is the version of the plugin.
$plugin->version = 2023052401;
$plugin->version = 2023052501;
$plugin->release = '401.0.1';
$plugin->maturity = MATURITY_BETA;

Expand Down

0 comments on commit 939f71e

Please sign in to comment.