Skip to content

Commit

Permalink
- Implement bespoke content in govuk-markdown replacing govspeak (#739)
Browse files Browse the repository at this point in the history
- Fix porting analytics partials to slim
  • Loading branch information
peterdavidhamilton authored Mar 13, 2024
1 parent 39b6431 commit 7e18709
Show file tree
Hide file tree
Showing 22 changed files with 244 additions and 403 deletions.
23 changes: 3 additions & 20 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ $light-blue: tint($department-for-education-websafe, 90%);
@import 'dfe-header';
@import 'hfeyp-v2';

@import 'video';
@import 'page-contents';

@import 'dfe/print';
@import 'dfe/about';
@import 'dfe/card';
Expand Down Expand Up @@ -57,20 +60,6 @@ main img {
max-width: 100%;
}

/*
Default layout
-----------------------------------------------
*/

#default-layout {
// noop
}

/*
Hero layout
-----------------------------------------------
*/

#hero-layout {
.govuk-notification-banner {
margin-top: govuk-spacing(6);
Expand Down Expand Up @@ -161,12 +150,6 @@ ul>li>ul>li {
background: #f3f2f1;
}

#js-timeout-warning:focus {
outline: 3px solid #ffdd00;
outline-offset: 0;
box-shadow: inset 0 0 0 2px;
}

.white-space-pre-wrap {
white-space: pre-wrap;
}
Expand Down
76 changes: 0 additions & 76 deletions app/assets/stylesheets/dfe/prompt.scss

This file was deleted.

162 changes: 1 addition & 161 deletions app/assets/stylesheets/hfeyp-v2.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,159 +59,6 @@ a:hover .hf-card-container .hf-card-details h3 {
fill: #347CA9;
}

.contents-list__list-item--numbered .contents-list__link {
display: table
}

.contents-list__number,
.contents-list__numbered-text {
display: table-cell
}

.contents-list__number {
min-width: 1.5em
}

.contents-list__numbered-text {
padding-left: .3em
}

.direction-rtl .contents-list__numbered-text {
padding-left: 0;
padding-right: .3em
}

.contents-list {
position: relative;
margin: 0;
z-index: 1;
background: #fff;
box-shadow: 0 20px 15px -10px #fff
}

.contents-list__title {
color: #0b0c0c;
font-family: GDS Transport, arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-weight: 400;
font-size: 14px;
font-size: .875rem;
line-height: 1.5;
margin: 0
}

@media print {
.contents-list__title {
color: #000;
font-family: sans-serif
}
}

@media(min-width: 40.0625em) {
.contents-list__title {
font-size: 16px;
font-size: 1rem;
line-height: 1.5
}
}

@media print {
.contents-list__title {
font-size: 14pt;
line-height: 1.5
}
}

.contents-list__list,
.contents-list__nested-list {
color: #0b0c0c;
font-family: GDS Transport, arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-weight: 400;
font-size: 14px;
font-size: .875rem;
line-height: 1.1428571429;
margin: 0;
padding: 0;
list-style-type: none
}

.contents-list__list ol,
.contents-list__list ul,
.contents-list__nested-list ol,
.contents-list__nested-list ul {
margin: 0
}

@media print {

.contents-list__list,
.contents-list__nested-list {
color: #000;
font-family: sans-serif
}
}

@media(min-width: 40.0625em) {

.contents-list__list,
.contents-list__nested-list {
font-size: 16px;
font-size: 1rem;
line-height: 1.25
}
}

@media print {

.contents-list__list,
.contents-list__nested-list {
font-size: 14pt;
line-height: 1.2
}
}

.contents-list__list-item--parent>.contents-list__link {
font-weight: 700
}

.contents-list__list-item {
padding-top: 10px;
line-height: 1.3;
list-style-type: none
}

@media(min-width: 40.0625em) {
.contents-list__list-item {
padding-top: 7.5px
}
}

.contents-list__list-item--dashed {
position: relative;
padding-left: 25px;
padding-right: 25px
}

.contents-list__list-item--dashed:before {
content: "";
position: absolute;
left: 0;
width: 20px;
overflow: hidden
}

.direction-rtl .contents-list__list-item--dashed:before {
left: auto;
right: 0
}

.lte-ie8 .contents-list__list-item--dashed .contents-list__link {
display: inline-block;
vertical-align: top
}

.cta-banner {
display: flex;
Expand Down Expand Up @@ -332,13 +179,6 @@ a:hover .hf-card-container .hf-card-details h3 {
height: 100%
}

.contents-on-page {
padding: 40px;
border: 1px solid #b1b4b6;
border-radius: 6px;
background-color: #F3F2F150;
}

.app-back-to-top {
margin-top: govuk-spacing(9);
}
Expand Down Expand Up @@ -594,4 +434,4 @@ ul li ul,
ol li ul,
ol li ol {
margin-top: govuk-spacing(3);
}
}
Loading

0 comments on commit 7e18709

Please sign in to comment.