Skip to content
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

Make build-release script work #138

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Make build-release script work #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c72e658
npm audit fix
filiplikavcan Feb 1, 2023
30547de
Add each-props module
filiplikavcan Feb 1, 2023
2e58f5e
Disable tests during package build
filiplikavcan Feb 1, 2023
427d318
Disable tests during package build
filiplikavcan Feb 1, 2023
ff9d309
Bump version
filiplikavcan Feb 1, 2023
d67047e
Change gulp sass import after upgrade
filiplikavcan Feb 1, 2023
7dc9a94
Release v0.1.9
filiplikavcan Feb 1, 2023
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
2 changes: 1 addition & 1 deletion bin/build-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if [[ $continue_prompt != 'y' ]]; then
exit 0
fi

npm run test
#npm run test
npm run build:package
npm run build:dist

Expand Down
2 changes: 1 addition & 1 deletion dist/VERSION.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.8
0.1.9
1 change: 0 additions & 1 deletion dist/navody-digital-0.1.8.min.css
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions dist/navody-digital-0.1.9.min.css
View file
Open in desktop

Large diffs are not rendered by default.

0 dist/navody-digital-0.1.8.min.js → dist/navody-digital-0.1.9.min.js
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion dist/navody-digital-ie8-0.1.8.min.css
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions dist/navody-digital-ie8-0.1.9.min.css
View file
Open in desktop

Large diffs are not rendered by default.

7,883 changes: 4,697 additions & 3,186 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 11 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"build-release": "node bin/check-nvmrc.js && ./bin/build-release.sh",
"publish-release": "node bin/check-nvmrc.js && ./bin/publish-release.sh",
"pre-release": "node bin/check-nvmrc.js && ./bin/pre-release.sh",
"build:package": "node bin/check-nvmrc.js && gulp build:package --destination 'package' && npm run test:build:package",
"build:dist": "node bin/check-nvmrc.js && gulp build:dist --destination 'dist' && npm run test:build:dist",
"build:package": "node bin/check-nvmrc.js && gulp build:package --destination 'package'",
"build:dist": "node bin/check-nvmrc.js && gulp build:dist --destination 'dist'",
"test": "standard && gulp test && gulp copy-assets && jest --testPathIgnorePatterns='after-*'",
"test:dependencies": "npm ls --depth=0",
"test:build:package": "jest tasks/gulp/__tests__/after-build-package.test.js",
Expand All @@ -25,14 +25,14 @@
"devDependencies": {
"acorn": "^7.4.0",
"autoprefixer": "^9.8.6",
"body-parser": "^1.18.3",
"cheerio": "^1.0.0-rc.3",
"body-parser": "^1.20.1",
"cheerio": "^1.0.0-rc.12",
"cookie-parser": "^1.4.5",
"cross-env": "^7.0.3",
"cssnano": "^4.1.10",
"del": "^5.0.0",
"eslint": "^6.8.0",
"express": "^4.16.4",
"express": "^4.18.2",
"express-validator": "^6.6.1",
"front-matter": "^4.0.2",
"glob": "^7.1.4",
Expand All @@ -49,7 +49,7 @@
"gulp-plumber": "^1.2.1",
"gulp-postcss": "^8.0.0",
"gulp-rename": "^2.0.0",
"gulp-sass": "^4.1.0",
"gulp-sass": "^5.1.0",
"gulp-stylelint": "^13.0.0",
"gulp-task-listing": "^1.1.0",
"gulp-uglify": "^3.0.2",
Expand All @@ -63,11 +63,11 @@
"map-stream": "0.0.7",
"marked": "^2.0.0",
"merge-stream": "^2.0.0",
"node-sass": "^4.14.1",
"nodemon": "^2.0.4",
"node-sass": "^7.0.0",
"nodemon": "^2.0.20",
"oldie": "^1.3.0",
"outdent": "^0.7.1",
"postcss-pseudo-classes": "0.2.0",
"postcss-pseudo-classes": "^0.3.0",
"postcss-scss": "^2.1.1",
"puppeteer": "^2.1.1",
"recursive-readdir": "^2.2.2",
Expand All @@ -83,7 +83,7 @@
"yargs": "^15.4.1"
},
"optionalDependencies": {
"fsevents": "*"
"fsevents": "^2.3.2"
},
"browserslist": [
">0.1%",
Expand Down Expand Up @@ -122,6 +122,7 @@
},
"dependencies": {
"accessible-autocomplete": "^1.6.2",
"each-props": "^3.0.0",
"express-writer": "0.0.4",
"popper.js": "^1.14.6"
}
Expand Down
29 changes: 8 additions & 21 deletions package/govuk/components/_custom/feedbackbar/_feedbackbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,11 @@

.sdn-feedbackbar__useful,
.sdn-feedbackbar__foundbug {
-webkit-flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
@include govuk-media-query($until: tablet) {
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
}
}

Expand Down Expand Up @@ -80,26 +76,17 @@

@include govuk-font($size: 16, $line-height: 1.5);

display: -webkit-box;

display: -webkit-flex;

display: -ms-flexbox;

display: flex;
color: $sdn-feedbackbar-text-color;
background: $sdn-feedbackbar-right-background;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;

@include govuk-media-query($until: desktop) {
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
}

@include govuk-media-query($from: desktop) {
Expand Down
87 changes: 22 additions & 65 deletions package/govuk/components/_custom/footer/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ $icon-youtube: url("../../../assets/images/icon-youtube.svg");
@include govuk-responsive-padding(7, "top");
@include govuk-responsive-padding(7, "bottom");

display: -webkit-box;

display: -webkit-flex;

display: -ms-flexbox;

display: flex;
Expand All @@ -81,25 +77,18 @@ $icon-youtube: url("../../../assets/images/icon-youtube.svg");
}

@include govuk-media-query($until: desktop) {
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
}
}

.sdn-footer__donate {
@include govuk-font($size: 19);
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
padding-left: govuk-spacing(3);
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
-ms-flex-align: center;
align-items: center;

@include govuk-media-query($until: desktop) {
padding-top: govuk-spacing(6);
Expand Down Expand Up @@ -140,23 +129,17 @@ $icon-youtube: url("../../../assets/images/icon-youtube.svg");
}

.sdn-footer__heart-wrapper {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
width: 40px;
min-width: 40px;
height: 40px;
border-radius: 20px;
background: $sdn-footer-heart-background;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
-ms-flex-align: center;
align-items: center;
-ms-flex-pack: center;
justify-content: center;
}

.sdn-footer__donate-text {
Expand All @@ -173,10 +156,8 @@ $icon-youtube: url("../../../assets/images/icon-youtube.svg");
padding-top: govuk-spacing(6);
@include govuk-media-query($from: desktop) {
padding-top: 0;
-webkit-box-flex: 0;
-webkit-flex: 0 0 $sdn-footer-newsletter-size;
-ms-flex: 0 0 $sdn-footer-newsletter-size;
flex: 0 0 $sdn-footer-newsletter-size;
-ms-flex: 0 0 $sdn-footer-newsletter-size;
flex: 0 0 $sdn-footer-newsletter-size;
}
}

Expand All @@ -187,14 +168,10 @@ $icon-youtube: url("../../../assets/images/icon-youtube.svg");
}

.sdn-footer__newsletter-form-group {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
-ms-flex-align: center;
align-items: center;
}

.sdn-footer__newsletter-input {
Expand Down Expand Up @@ -226,10 +203,6 @@ $icon-youtube: url("../../../assets/images/icon-youtube.svg");
color: $sdn-footer-input-placeholder-color;
}

&::-ms-input-placeholder {
color: $sdn-footer-input-placeholder-color;
}

&::placeholder {
color: $sdn-footer-input-placeholder-color;
}
Expand Down Expand Up @@ -259,29 +232,21 @@ $icon-youtube: url("../../../assets/images/icon-youtube.svg");
height: 100%;

body {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
height: 100%;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
}

.navody-template__content {
-webkit-box-flex: 1;
-webkit-flex: 1 0 auto;
-ms-flex: 1 0 auto;
flex: 1 0 auto;
-ms-flex: 1 0 auto;
flex: 1 0 auto;
}

.navody-template__footer {
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
}
}

Expand Down Expand Up @@ -351,22 +316,14 @@ $icon-youtube: url("../../../assets/images/icon-youtube.svg");
}

.sdn-footer__bottom-columns {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
-ms-flex-direction: row;
flex-direction: row;
-ms-flex-direction: row;
flex-direction: row;

@include govuk-media-query($until: desktop) {
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
}
}

Expand Down
22 changes: 6 additions & 16 deletions package/govuk/components/_custom/header/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
.sdn-header {
@include govuk-font($size: 14);
border-bottom: 1px solid $sdn-header-border-color;
background: -webkit-gradient(linear, left top, right top, from($sdn-header-background-from), to($sdn-header-background-to));
background: linear-gradient(90deg, $sdn-header-background-from 0%, $sdn-header-background-to 100%);
}

Expand All @@ -34,25 +33,17 @@
}

.sdn-header__container {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
position: relative;
height: $sdn-header-height;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
-ms-flex-align: center;
align-items: center;
-ms-flex-pack: justify;
justify-content: space-between;

&--logo {
> a {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;

Expand Down Expand Up @@ -305,9 +296,8 @@
.sdn-header__container {
height: auto;
padding: 5px 0;
-webkit-flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
}

.sdn-header__menu-button {
Expand Down
24 changes: 8 additions & 16 deletions package/govuk/components/_custom/headline/_headline.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,22 @@
color: $sdn-headline-text-color;

@include mq ($from: tablet) {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
-webkit-flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
-ms-flex-pack: justify;
justify-content: space-between;
-ms-flex-align: center;
align-items: center;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
}
}

.sdn-headline__part {
@include govuk-responsive-padding(5, "bottom");
max-width: 100%;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;

&--right {
@include mq ($from: tablet) {
Expand Down
Loading