diff --git a/app/views/uvod/instalacia-pomocou-dist/index.njk b/app/views/uvod/instalacia-pomocou-dist/index.njk index ac6566a618..6ed0875556 100644 --- a/app/views/uvod/instalacia-pomocou-dist/index.njk +++ b/app/views/uvod/instalacia-pomocou-dist/index.njk @@ -59,16 +59,16 @@ <head> <title>Ukážka</title> <!--[if !IE 8]><!--> - <link rel="stylesheet" href="stylesheets/govuk-frontend-[latest version].min.css"> + <link rel="stylesheet" href="stylesheets/idsk-frontend-[latest version].min.css"> <!--<![endif]--> <!--[if IE 8]> - <link rel="stylesheet" href="stylesheets/govuk-frontend-ie8-[latest-version].min.css"> + <link rel="stylesheet" href="stylesheets/idsk-frontend-ie8-[latest-version].min.css"> <![endif]--> </head> <body> <!-- Copy and paste component HTML--> <button class="govuk-button">Toto je komponent tlačidlo</button> - <script src="javascript/govuk-frontend-[latest version].min.js"></script> + <script src="javascript/idsk-frontend-[latest version].min.js"></script> <script>window.GOVUKFrontend.initAll()</script> </body> </html> diff --git a/docs/installation/installing-from-dist.md b/docs/installation/installing-from-dist.md index 43ef2e7ef4..4384c79a3f 100644 --- a/docs/installation/installing-from-dist.md +++ b/docs/installation/installing-from-dist.md @@ -34,16 +34,16 @@ Podľa nižšie uvedeného príkladu pridajte súbory CSS a JavaScript do šabl Ukážka - + - + diff --git a/package-lock.json b/package-lock.json index 983528b53e..05491bf948 100644 --- a/package-lock.json +++ b/package-lock.json @@ -759,6 +759,11 @@ "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==" }, + "@types/expect": { + "version": "1.20.4", + "resolved": "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz", + "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==" + }, "@types/glob": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", @@ -811,6 +816,15 @@ "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz", "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==" }, + "@types/vinyl": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.7.tgz", + "integrity": "sha512-4UqPv+2567NhMQuMLdKAyK4yzrfCqwaTt6bLhHEs8PFcxbHILsrxaY63n4wgE/BRLDWDQeI+WcTmkXKExh9hQg==", + "requires": { + "@types/expect": "^1.20.4", + "@types/node": "*" + } + }, "@types/yargs": { "version": "13.0.8", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.8.tgz", @@ -1541,6 +1555,11 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==" }, + "binaryextensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.3.0.tgz", + "integrity": "sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==" + }, "bindings": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", @@ -5750,6 +5769,18 @@ "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.4.0.tgz", "integrity": "sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg==" }, + "gulp-replace": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.4.tgz", + "integrity": "sha512-SVSF7ikuWKhpAW4l4wapAqPPSToJoiNKsbDoUnRrSgwZHH7lH8pbPeQj1aOVYQrbZKhfSVBxVW+Py7vtulRktw==", + "requires": { + "@types/node": "*", + "@types/vinyl": "^2.0.4", + "istextorbinary": "^3.0.0", + "replacestream": "^4.0.3", + "yargs-parser": ">=5.0.0-security.0" + } + }, "gulp-sass": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-4.0.2.tgz", @@ -6899,6 +6930,15 @@ "html-escaper": "^2.0.0" } }, + "istextorbinary": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-3.3.0.tgz", + "integrity": "sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==", + "requires": { + "binaryextensions": "^2.2.0", + "textextensions": "^3.2.0" + } + }, "jest": { "version": "24.8.0", "resolved": "https://registry.npmjs.org/jest/-/jest-24.8.0.tgz", @@ -7556,7 +7596,8 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", @@ -7577,7 +7618,8 @@ }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", @@ -12597,6 +12639,45 @@ "remove-trailing-separator": "^1.1.0" } }, + "replacestream": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz", + "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==", + "requires": { + "escape-string-regexp": "^1.0.3", + "object-assign": "^4.0.1", + "readable-stream": "^2.0.2" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "request": { "version": "2.88.0", "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", @@ -15172,6 +15253,11 @@ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" }, + "textextensions": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-3.3.0.tgz", + "integrity": "sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==" + }, "throat": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz", diff --git a/package.json b/package.json index 624a8e5f8d..fc21ca4a9b 100644 --- a/package.json +++ b/package.json @@ -35,9 +35,9 @@ "express-validator": "5.3.1", "front-matter": "3.0.2", "glob": "7.1.4", + "govuk-elements-sass": "3.1.3", "govuk_frontend_toolkit": "8.1.0", "govuk_template_jinja": "0.25.0", - "govuk-elements-sass": "3.1.3", "gulp": "4.0.2", "gulp-better-rollup": "3.1.0", "gulp-changed": "4.0.0", @@ -50,6 +50,7 @@ "gulp-plumber": "1.2.1", "gulp-postcss": "8.0.0", "gulp-rename": "1.4.0", + "gulp-replace": "^1.1.4", "gulp-sass": "4.0.2", "gulp-sass-lint": "1.4.0", "gulp-sourcemaps": "^3.0.0", diff --git a/src/idsk/components/footer-extended/footer-extended.js b/src/idsk/components/footer-extended/footer-extended.js index 17f211dbc5..f85e912278 100644 --- a/src/idsk/components/footer-extended/footer-extended.js +++ b/src/idsk/components/footer-extended/footer-extended.js @@ -95,7 +95,7 @@ FooterExtended.prototype.handleSubmitButtonClick = function (e) { var subject = $feedbackInfo.getAttribute("data-subject"); var emailBody = $feedbackInfo.textContent; emailBody = emailBody.replace("%issue%", selectedOption).replace("%description%", issueText); - document.location = "mailto:"+email+"?subject="+subject+"&body="+emailBody; + document.location = "mailto:"+email+"?subject="+subject+"&body="+encodeURIComponent(emailBody); } } diff --git a/src/idsk/components/footer/_footer.scss b/src/idsk/components/footer/_footer.scss index 693ca273d0..1bdff075ff 100644 --- a/src/idsk/components/footer/_footer.scss +++ b/src/idsk/components/footer/_footer.scss @@ -12,8 +12,8 @@ $govuk-footer-link-hover: $govuk-focus-text-colour; // Footer logo size - $idsk-footer-logo-width: 218px; - $idsk-footer-logo-height: 47px; + $idsk-footer-logo-width: 218px !default; + $idsk-footer-logo-height: 47px !default; @if ($govuk-use-legacy-palette) { // sass-lint:disable no-color-literals diff --git a/src/idsk/components/header-web/header-web.js b/src/idsk/components/header-web/header-web.js index 661c02b8b9..46f84440a2 100644 --- a/src/idsk/components/header-web/header-web.js +++ b/src/idsk/components/header-web/header-web.js @@ -284,7 +284,7 @@ HeaderWeb.prototype.checkBlurMenuItemClick = function (e) { * @param {object} e */ HeaderWeb.prototype.showMobileMenu = function () { - var closeText = this.menuBtnText ? 'Zavrieť' : ''; + var closeText = this.$menuButton.getAttribute('data-text-for-close') ? this.$menuButton.getAttribute('data-text-for-close') : ''; var $mobileMenu = this.$module.querySelector('.idsk-header-web__nav'); toggleClass($mobileMenu, 'idsk-header-web__nav--mobile'); toggleClass(this.$menuButton, 'idsk-header-web__main-headline-menu-button--active'); diff --git a/src/idsk/components/header-web/template.njk b/src/idsk/components/header-web/template.njk index 333cb897e9..f5eb20fea8 100644 --- a/src/idsk/components/header-web/template.njk +++ b/src/idsk/components/header-web/template.njk @@ -22,6 +22,7 @@ {% set hideLanguageMenu = "Skryť jazykové menu" %} {% set showMenu = "Rozbaliť menu" %} {% set closeMenu = "Zavrieť menu" %} +{% set closeMenuButton = "Zavrieť" %} {% set showLogin = "Rozbaliť menu prihlásenia do Ministerstva investícií" %} {% set hideLogin = "Skryť menu prihlásenia do Ministerstva investícií" %} {% set innerNavigation = "Vnútorná navigácia" %} @@ -71,7 +72,7 @@

- Doména gov.sk je oficálna + Doména gov.sk je oficiálna

Toto je oficiálna webová stránka orgánu verejnej moci Slovenskej republiky. Oficiálne stránky využívajú najmä doménu gov.sk. Odkazy na jednotlivé webové sídla orgánov verejnej moci nájdete na tomto odkaze. @@ -214,21 +215,22 @@ {% if params.navBar and params.headerType !== 'electronicService' %} {% elif params.headerType !== 'electronicService' and params.search %} {% elif main.loginButton %} diff --git a/src/idsk/components/header/_header.scss b/src/idsk/components/header/_header.scss index b1bc437222..27e6beda06 100644 --- a/src/idsk/components/header/_header.scss +++ b/src/idsk/components/header/_header.scss @@ -11,8 +11,8 @@ $idsk-header-link-active: #1d8feb; $idsk-header-nav-item-border-color: #2e3133; - $idsk-header-logo-width: 186px; - $idsk-header-logo-height: 30px; + $idsk-header-logo-width: 186px !default; + $idsk-header-logo-height: 30px !default; .idsk-header { @include govuk-font($size: 16); diff --git a/tasks/gulp/compile-assets.js b/tasks/gulp/compile-assets.js index c61b449c77..7010e00e7e 100644 --- a/tasks/gulp/compile-assets.js +++ b/tasks/gulp/compile-assets.js @@ -22,6 +22,7 @@ const postcsspseudoclasses = require('postcss-pseudo-classes')({ // :not(:whatever) pseudo selectors blacklist: [':not(', ':disabled)', ':last-child)', ':focus)', ':active)', ':hover)'] }) +const replace = require('gulp-replace') // Compile CSS and JS task -------------- // -------------------------------------- @@ -77,6 +78,7 @@ gulp.task('scss:compile', () => { extname: '.min.css' }) )) + .pipe(replace('\/assets', 'assets')) .pipe(gulp.dest(taskArguments.destination + '/')) const compileOldIe = gulp.src(compileOldIeStyleshet) @@ -113,6 +115,7 @@ gulp.task('scss:compile', () => { extname: '.min.css' }) )) + .pipe(replace('\/assets', 'assets')) .pipe(gulp.dest(taskArguments.destination + '/')) let compileLegacy, compileLegacyIE8