Skip to content

Commit

Permalink
Update prototypekit to v12
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesmking committed Feb 10, 2022
1 parent c521e36 commit 016d4bf
Show file tree
Hide file tree
Showing 95 changed files with 20,880 additions and 4,663 deletions.
114 changes: 12 additions & 102 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,103 +1,13 @@
node_modules/
/.DS_Store
# ignore tracking usage data config - we want a different one for each user
usage-data-config.json
# ignore extension SCSS because it's dynamically generated
lib/extensions/_extensions.scss
.env
.sass-cache
.DS_Store
.start.pid
.port.tmp
public
node_modules/*
.tmuxp.*
/.idea
public/stylesheets/application-ie8.css
public/stylesheets/application.css
*.css
public/stylesheets/unbranded.css
public/stylesheets/unbranded-ie8.css
public/stylesheets/application.css
public/stylesheets/application-ie8.css
public/stylesheets/application-ie8.css
public/stylesheets/application.css
public/stylesheets/unbranded-ie8.css
public/stylesheets/unbranded.css
public/images/add 3.svg
public/images/add-black 3.svg
public/images/add-white 3.svg
public/images/arrow-down 3.svg
public/images/arrow-down-white 3.svg
public/images/arrow-left 3.svg
public/images/arrow-right 3.svg
public/images/arrow-up 3.svg
public/images/arrow-white 3.svg
public/images/calendar 3.svg
public/images/cancel-red 3.svg
public/images/contact-blue 3.svg
public/images/contact-email 3.svg
public/images/contact-email-white 3.svg
public/images/contact-person 3.svg
public/images/contact-phone 3.svg
public/images/copy-blue 3.svg
public/images/cross 3.svg
public/images/cross-error 3.svg
public/images/cross-red 3.svg
public/images/csv 3.svg
public/images/delete 3.svg
public/images/delete-blue 3.svg
public/images/DFE-logo 3.png
public/images/docs/mac-home-folder-projects 2.png
public/images/docs/prototype-kit-homepage 3.png
public/images/docs/prototype-kit-tutorial-question-1 3.png
public/images/docs/prototype-kit-tutorial-question-2 3.png
public/images/download-blue 3.svg
public/images/edit-blue 3.svg
public/images/email-blue 3.svg
public/images/employer-example 3.png
public/images/ESFA-logo 3.jpg
public/images/excel 3.svg
public/images/excel-csv 3.svg
public/images/FIRE-IT-UP 3.png
public/images/fire-it-up-apprentices 3.png
public/images/fire-it-up-employer 3.png
public/images/help-black 3.svg
public/images/help-blue 3.svg
public/images/help-white 3.svg
public/images/info-black 3.svg
public/images/make-password-invisible 2.svg
public/images/make-password-visible 3.svg
public/images/marketo-csv 2.svg
public/images/menu-blue 3.svg
public/images/pdf-blue 3.svg
public/images/phone-blue 3.svg
public/images/plus-blue 3.svg
public/images/screenshot-ni 3.jpg
public/images/screenshot-scot 3.jpg
public/images/screenshot-wales 3.jpg
public/images/search-white 3.svg
public/images/separator 3.png
public/images/separator-2x 3.png
public/images/share-blue 3.svg
public/images/sort-blue 3.svg
public/images/tick-green 3.svg
public/images/tick-single-green 3.svg
public/images/tick-white 3.svg
public/images/unbranded 3.ico
public/images/website-blue 3.svg
public/javascripts/application 3.js
public/javascripts/auto-store-data 3.js
public/javascripts/autocomplete 3.js
public/javascripts/docs 2.js
public/javascripts/jquery-1.11.3 3.js
public/javascripts/jquery.autocomplete.min 3.js
public/javascripts/jquery.cookie 2.js
public/javascripts/my-cookies-RECEIVER 3.js
public/javascripts/my-cookies-SENDER 3.js
public/javascripts/step-by-step-nav 3.js
public/sass/application 2.scss
public/sass/components/_cookie-banner 3.scss
public/sass/components/_module-tracker 3.scss
public/sass/components/_pagination 3.scss
public/sass/components/_progress-tracker 3.scss
public/sass/docs-ie8 2.scss
public/sass/patterns/_navigation 3.scss
public/sass/patterns/_pledges 3.scss
public/sass/patterns/_related-items 3.scss
public/sass/patterns/_search-pledges 3.scss
public/sass/patterns/_step-by-step-header 3.scss
public/sass/patterns/_step-by-step-nav 3.scss
public/sass/patterns/_step-by-step-related 3.scss
public/sass/patterns/_task-list 3.scss
public/sass/patterns/_transfers 3.scss
public/sass/unbranded 3.scss
public/sass/unbranded-ie8 2.scss
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
audit=false
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
16.13.0
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.9.0
12.0.1
5 changes: 3 additions & 2 deletions app/assets/sass/patterns/_step-by-step-nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ $top-border: solid 2px govuk-colour("mid-grey", $legacy: "grey-3");

.app-step-nav__button--controls {
@include step-nav-font(14, $line-height: 1);
@include govuk-link-common;
position: relative;
z-index: 1; // this and relative position stops focus outline underlap with border of accordion
padding: .5em 0;
text-decoration: underline;

.app-step-nav--large & {
@include step-nav-font(14, $tablet-size: 16, $line-height: 1);
Expand Down Expand Up @@ -271,7 +271,8 @@ $top-border: solid 2px govuk-colour("mid-grey", $legacy: "grey-3");
}

.app-step-nav__toggle-link {
text-decoration: underline;
@include govuk-link-common;
@include govuk-link-hover-decoration;
}
}

Expand Down
154 changes: 39 additions & 115 deletions app/assets/sass/patterns/_task-list.scss
Original file line number Diff line number Diff line change
@@ -1,145 +1,69 @@
// Task list pattern

.app-task-list {
list-style-type: none;
padding-left: 0;
margin-top: 0;
margin-bottom: 0;
@include govuk-media-query($from: tablet) {
min-width: 550px;
}
.apprentice-section-one {
ul.app-task-list__items {
margin-bottom: 1.5em;
li {
&:first-of-type {
// padding-top: 0;
.govuk-heading-s {
margin-top: -0.5em;
background: govuk-colour("light-grey");
padding: 0.5em;
margin-bottom: 0.5em;
border-bottom: 1px solid $govuk-border-colour;
}
}
}
}
.govuk-button {
margin-left: 1.5em;
margin-bottom: 3em;
}
.apprenticeship-total {
float: right;
width: auto;
margin: 0.125em 0 0 0;
line-height: 0.75;
text-align: right;
strong {
color: $govuk-link-colour;
}
.small-text {
font-size: 16px;
font-weight: normal;
color: $govuk-secondary-text-colour;
strong {
color: black;
}
// display: inline-block;
// clear: both;
}
}
}
}


@media (max-width: 1024px) {

}

@media (max-width: 768px) {
.app-task-list {
.pledge-section-one {
&.apprentice-added {
.govuk-button {
margin-left: 0em;
margin-bottom: 1em;
}
.apprenticeship-total {
margin: 0.75em 0 2em 0;
font-size: 2rem;
float: left;
}
}
}
}
}

@media (max-width: 500px) {

list-style-type: none;
padding-left: 0;
margin-top: 0;
margin-bottom: 0;
@include govuk-media-query($from: tablet) {
min-width: 550px;
}
}

.app-task-list__section {
display: table;
@include govuk-font($size:24, $weight: bold);
display: table;
@include govuk-font($size:24, $weight: bold);
}

.app-task-list__section-number {
display: table-cell;
display: table-cell;

@include govuk-media-query($from: tablet) {
min-width: govuk-spacing(6);
padding-right: 0;
}
@include govuk-media-query($from: tablet) {
min-width: govuk-spacing(6);
padding-right: 0;
}
}

.app-task-list__items {
@include govuk-font($size: 19);
@include govuk-responsive-margin(9, "bottom");
list-style: none;
padding-left: 0;
@include govuk-media-query($from: tablet) {
padding-left: govuk-spacing(6);
}
@include govuk-font($size: 19);
@include govuk-responsive-margin(9, "bottom");
list-style: none;
padding-left: 0;
@include govuk-media-query($from: tablet) {
padding-left: govuk-spacing(6);
}
}

.app-task-list__item {
border-bottom: 1px solid $govuk-border-colour;
margin-bottom: 0 !important;
padding-top: govuk-spacing(2);
padding-bottom: govuk-spacing(2);
@include govuk-clearfix;
ul.govuk-list {
float: right;
margin-bottom: 0;
li {
list-style: none;
text-align: right;
}
}
border-bottom: 1px solid $govuk-border-colour;
margin-bottom: 0 !important;
padding-top: govuk-spacing(2);
padding-bottom: govuk-spacing(2);
@include govuk-clearfix;
}

.app-task-list__item:first-child {
border-top: 1px solid $govuk-border-colour;
border-top: 1px solid $govuk-border-colour;
}

.app-task-list__task-name {
display: block;
@include govuk-media-query($from: 450px) {
float: left;
}
display: block;
@include govuk-media-query($from: 450px) {
float: left;
}
}

// The `app-task-list__task-completed` class was previously used on the task
// list for the completed tag (changed in 86c90ec) – it's still included here to
// avoid breaking task lists in existing prototypes.
.app-task-list__tag,
.app-task-list__task-completed {
margin-top: govuk-spacing(2);
margin-bottom: govuk-spacing(1);

@include govuk-media-query($from: 450px) {
float: right;
margin-top: 0;
margin-bottom: 0;
}
margin-top: govuk-spacing(2);
margin-bottom: govuk-spacing(1);

@include govuk-media-query($from: 450px) {
float: right;
margin-top: 0;
margin-bottom: 0;
}
}
Loading

0 comments on commit 016d4bf

Please sign in to comment.