Skip to content

Commit

Permalink
Fixed github issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarosVi
MarosVi committed May 18, 2023
1 parent 1217479 commit 5ae7d3d
Show file tree
Hide file tree
Showing 10 changed files with 111 additions and 19 deletions.
6 changes: 3 additions & 3 deletions app/views/uvod/instalacia-pomocou-dist/index.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
&lt;/html></code></pre>
Expand Down
6 changes: 3 additions & 3 deletions docs/installation/installing-from-dist.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ Podľa nižšie uvedeného príkladu pridajte súbory CSS a JavaScript do šabl
<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>
Expand Down
90 changes: 88 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/idsk/components/footer-extended/footer-extended.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/idsk/components/footer/_footer.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/idsk/components/header-web/header-web.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
10 changes: 6 additions & 4 deletions src/idsk/components/header-web/template.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" %}
Expand Down Expand Up @@ -71,7 +72,7 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-one-half">
<h3 class="govuk-body-s">
Doména gov.sk je oficálna
Doména gov.sk je oficiálna
</h3>
<p class="govuk-body-s">
Toto je oficiálna webová stránka orgánu verejnej moci Slovenskej republiky. Oficiálne stránky využívajú najmä doménu gov.sk. <a class="govuk-link" href="https://www.slovensko.sk/sk/agendy/agenda/_organy-verejnej-moci" target="_blank" title="odkazy na webové sídla orgánov verejnej moci">Odkazy na jednotlivé webové sídla orgánov verejnej moci nájdete na tomto odkaze</a>.
Expand Down Expand Up @@ -214,21 +215,22 @@

{% if params.navBar and params.headerType !== 'electronicService' %}
<button class="idsk-button idsk-header-web__main-headline-menu-button" aria-label="{{ showMenu }}" aria-expanded="false"
data-text-for-show="{{ showMenu }}" data-text-for-hide="{{ closeMenu }}">
data-text-for-show="{{ showMenu }}" data-text-for-hide="{{ closeMenu }}" data-text-for-close="{{ closeMenuButton }}">
{{ main.menuBtnText if main.menuBtnText else 'Menu' }}
<span class="idsk-header-web__menu-open"></span>
<span class="idsk-header-web__menu-close"></span>
</button>
{% elif params.headerType !== 'electronicService' and params.search %}
<button class="idsk-button idsk-header-web__main-headline-menu-button" aria-label="{{ showMenu }}" aria-expanded="false"
data-text-for-show="{{ showMenu }}" data-text-for-hide="{{ closeMenu }}">
data-text-for-show="{{ showMenu }}" data-text-for-hide="{{ closeMenu }}" data-text-for-close="{{ closeMenuButton }}">
{{ main.menuBtnText if main.menuBtnText else 'Hľadaj' }}
<span class="idsk-header-web__menu-open"></span>
<span class="idsk-header-web__menu-close"></span>
</button>
{% elif main.loginButton %}
<button class="idsk-button idsk-header-web__main-headline-menu-button idsk-header-web__main-headline-menu-button-service"
aria-label="{{ showLogin }}" aria-expanded="false" data-text-for-show="{{ showLogin }}" data-text-for-hide="{{ hideLogin }}">
aria-label="{{ showLogin }}" aria-expanded="false" data-text-for-show="{{ showLogin }}" data-text-for-hide="{{ hideLogin }}"
data-text-for-close="{{ closeMenuButton }}">
<img src="{{ params.assetsPath | default('/assets/images/header-web/') }}/profile.svg" alt="Ikona elektronického servisného menu">
<span class="idsk-header-web__menu-close"></span>
</button>
Expand Down
4 changes: 2 additions & 2 deletions src/idsk/components/header/_header.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions tasks/gulp/compile-assets.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 --------------
// --------------------------------------
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -113,6 +115,7 @@ gulp.task('scss:compile', () => {
extname: '.min.css'
})
))
.pipe(replace('\/assets', 'assets'))
.pipe(gulp.dest(taskArguments.destination + '/'))

let compileLegacy, compileLegacyIE8
Expand Down

0 comments on commit 5ae7d3d

Please sign in to comment.