Skip to content

Commit a4dfec9

Browse files
committed
adding MoJ styles and files
1 parent b82274f commit a4dfec9

14 files changed

+1247
-426
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
$moj-page-width: 1220px !default;
2+
$govuk-page-width: 1220px !default;
3+
$moj-assets-path: "../" !default;
4+
$govuk-assets-path: "../" !default;
5+
6+
7+
8+
// MOJ Frontend
9+
@import "src/moj/all";
10+
11+
// highlight.js
12+
@import "node_modules/highlight.js/scss/github.scss";
13+
14+
// Custom documentation components
15+
@import "./components/back-to-top";
16+
@import "./components/copy-button";
17+
@import "./components/example";
18+
@import "./components/flex-container";
19+
@import "./components/markdown";
20+
@import "./components/masthead";
21+
@import "./components/panel";
22+
@import "./components/tabs";
23+
@import "./components/header";

app/assets/sass/components/wide-layout-styles.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
.nhsuk-breadcrumb {
4949
background-color: #ffffff;
50-
padding-bottom: 12px;
50+
padding-bottom: 0px !important;
5151
padding-top: 12px;
5252
}
5353

app/assets/sass/components/wide-layout-styles.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/sass/components/wide-layout-styles.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
}
4141
.nhsuk-breadcrumb {
4242
background-color: #ffffff;
43-
padding-bottom: 12px;
43+
padding-bottom: 0px !important;
4444
padding-top: 12px;
4545
}
4646
.nhsuk-breadcrumb .nhsuk-back-link {

app/assets/sass/main.scss

+3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
// Import NHS.UK frontend library
22
@import 'node_modules/nhsuk-frontend/packages/nhsuk';
3+
@import "node_modules/@ministryofjustice/frontend/moj/all";
34

45
// Components that are not in the NHS.UK frontend library
56
@import 'components/list-border';
67
@import 'components/related-nav';
78
@import 'components/wide-layout-styles';
9+
@import "node_modules/@ministryofjustice/frontend/moj/components/button-menu/_button-menu.scss";
10+
811

912
///////////////////////////////////////////
1013
// Add your custom CSS/Sass styles below...

app/views/layout.html

+3-27
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<!-- Add your custom CSS or Sass in /app/assets/sass/main.scss -->
1111
{% block headCSS %}
1212
<link href="/css/main.css" rel="stylesheet">
13+
<link rel="stylesheet" href="assets/sass/compontents/application.css">
1314
{% endblock %}
1415

1516
<!-- Set the page title -->
@@ -54,33 +55,6 @@
5455

5556
</div>
5657

57-
58-
59-
60-
<!-- OLd code
61-
62-
63-
<div class="nhsuk-header__logo nhsuk-header__transactional--logo">
64-
<a class="nhsuk-header__link" href="index" aria-label="NHS homepage">
65-
<svg class="nhsuk-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 16" height="40" width="100">
66-
<path class="nhsuk-logo__background" fill="#005eb8" d="M0 0h40v16H0z"></path>
67-
<path class="nhsuk-logo__text" fill="#fff" d="M3.9 1.5h4.4l2.6 9h.1l1.8-9h3.3l-2.8 13H9l-2.7-9h-.1l-1.8 9H1.1M17.3 1.5h3.6l-1 4.9h4L25 1.5h3.5l-2.7 13h-3.5l1.1-5.6h-4.1l-1.2 5.6h-3.4M37.7 4.4c-.7-.3-1.6-.6-2.9-.6-1.4 0-2.5.2-2.5 1.3 0 1.8 5.1 1.2 5.1 5.1 0 3.6-3.3 4.5-6.4 4.5-1.3 0-2.9-.3-4-.7l.8-2.7c.7.4 2.1.7 3.2.7s2.8-.2 2.8-1.5c0-2.1-5.1-1.3-5.1-5 0-3.4 2.9-4.4 5.8-4.4 1.6 0 3.1.2 4 .6"></path>
68-
</svg>
69-
<span class="nhsuk-header__service-name">
70-
Overseas Healthcare Service RINA
71-
</span>
72-
</a>
73-
</div>
74-
75-
<div class="nhsuk-header__content" id="content-header">
76-
<p class="logged-in">Signed in as Isla Fields<br><a href="/alpha/version-02/sign-out">Sign out</a></p>
77-
<div class="nhsuk-header__menu nhsuk-header__menu--only">
78-
<button class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation" aria-expanded="false">Menu</button>
79-
</div>
80-
</div>
81-
82-
</div> -->
83-
8458
</header>
8559
{% endblock %}
8660

@@ -136,6 +110,8 @@ <h2 class="nhsuk-u-visually-hidden">Support links</h2>
136110
{% block bodyEnd %}
137111
{% block scripts %}
138112
<!-- Custom JavaScript files can be added to this file -->
113+
<script src="node_modules/@ministryofjustice/frontend/moj/jquery.js"></script>
114+
<script src="node_modules/@ministryofjustice/frontend/moj/application.js"></script>
139115
{% include "includes/scripts.html" %}
140116
<!-- For adding page specific JavsScript -->
141117
{% block pageScripts %}{% endblock %}

0 commit comments

Comments
 (0)