Skip to content

Commit 8393ce8

Browse files
danfun-kitdanfun-kit
committed
1.9.0
1 parent b5bc506 commit 8393ce8

File tree

11 files changed

+69
-58
lines changed

11 files changed

+69
-58
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
"sitemap": "^6.2.0",
149149
"ssri": "8.0.1",
150150
"style-loader": "^1.0.0",
151-
"tar": "4.4.15",
151+
"tar": "4.4.18",
152152
"terser-webpack-plugin": "^2.3.2",
153153
"trim-newlines": "3.0.1",
154154
"ua-parser-js": "0.7.24",
@@ -164,7 +164,7 @@
164164
"**/**/serialize-javascript": "^3.1.0",
165165
"**/**/node-fetch": "^2.6.1",
166166
"**/**/trim-newlines": "^3.0.1",
167-
"**/**/tar": "^4.4.15",
167+
"**/**/tar": "^4.4.18",
168168
"**/**/glob-parent": "^5.1.2",
169169
"@digg/react-ideal-image": "file:local_modules/digg_react-ideal-image-1.0.2.tgz"
170170
},

‎src/components/Header/Header.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export const Header: React.FC<HeaderProps> = ({ env, activeLink }) => {
126126
{i18n.t('common|search-data')}
127127
</Link>
128128

129-
{i18n.language === 'sv' ? (
129+
{i18n.language.toLowerCase() === 'sv' || i18n.language.toLowerCase() === 'sv-se' ? (
130130
<Link
131131
onClick={closeMenu}
132132
to={`/${i18n.languages[0]}/${i18n.t('routes|news|path')}`}

‎src/pages/DetailPages/ConceptPage.tsx‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export const ConceptPage: React.FC<PageProps> = ({ env, match }) => {
131131
}
132132
133133
134-
window.__entryscape_config = {
134+
window.__entryscape_config = [{
135135
block: 'config',
136136
page_language: '${i18n.languages[0]}',
137137
routes: [
@@ -590,15 +590,18 @@ export const ConceptPage: React.FC<PageProps> = ({ env, match }) => {
590590
type2template: {
591591
'skos:Concept': 'skosmos:concept',
592592
},
593-
};
593+
}];
594594
595595
</script>
596596
597+
<script src="${
598+
i18n.languages[0] == 'sv'
599+
? env.ENTRYSCAPE_OPENDATA_SV_URL
600+
: env.ENTRYSCAPE_OPENDATA_EN_URL
601+
}"></script>
597602
<script src="${
598603
env.ENTRYSCAPE_BLOCKS_URL
599-
? env.ENTRYSCAPE_BLOCKS_URL
600-
: 'https://dataportal.azureedge.net/cdn/blocks.0.18.2.app.js'
601-
}"></script>
604+
}"></script>
602605
`,
603606
{
604607
done: function () {},

‎src/pages/DetailPages/DataSetPage.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,13 @@ export const DataSetPage: React.FC<PageProps> = ({ env, location, match }) => {
135135
'pages|datasetpage|several_links'
136136
)}{{/ifprop}}' +
137137
'{{#ifprop "dcat:downloadURL" min="2" invert="true"}}' +
138-
'<a href="{{prop "dcat:downloadURL"}}" class="text-5 distribution__link" target="_blank">${i18n.t(
138+
'<a href="{{prop "dcat:downloadURL"}}" class="text-5 matomo_download distribution__link" target="_blank">${i18n.t(
139139
'pages|datasetpage|download_link'
140140
)}</a>' +
141141
'{{/ifprop}}' +
142142
'{{/ifprop}}' +
143143
'{{#ifprop "dcat:downloadURL" invert="true"}}' +
144-
'<a href="{{prop "dcat:accessURL"}}" class="text-5 distribution__link" target="_blank">' +
144+
'<a href="{{prop "dcat:accessURL"}}" class="text-5 matomo_download distribution__link" target="_blank">' +
145145
'${i18n.t('pages|datasetpage|download_link_adress')}' +
146146
'{{/ifprop}}',
147147
},
@@ -499,8 +499,7 @@ export const DataSetPage: React.FC<PageProps> = ({ env, location, match }) => {
499499
__html: `{{viewMetadata
500500
relationinverse="dcat:dataset"
501501
onecol=true
502-
template="dcat:OnlyCatalog"
503-
use="cat"
502+
template="dcat:OnlyCatalog"
504503
filterpredicates="dcterms:issued,dcterms:language,dcterms:modified,dcterms:spatial,dcterms:license,dcat:themeTaxonomi"
505504
}}`,
506505
}}

‎src/pages/DetailPages/SpecificationPage.tsx‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { StaticBreadcrumb } from 'components/Breadcrumb';
1313

1414
export const SpecificationPage: React.FC<PageProps> = ({
1515
env,
16+
location,
1617
match,
1718
}) => {
1819
let postscribe: any;
@@ -65,11 +66,9 @@ export const SpecificationPage: React.FC<PageProps> = ({
6566
</script>
6667
6768
<script>
68-
window.__entryscape_config = {
69+
window.__entryscape_config = [{
6970
block: 'config',
70-
page_language: '${i18n.languages[0]}',
71-
//entry: '${match.params.eid}',
72-
//context: '${match.params.cid}',
71+
page_language: '${i18n.languages[0]}',
7372
routes: [
7473
{
7574
regex:new RegExp('(\/*\/specifications\/)(.+)'),
@@ -158,13 +157,17 @@ export const SpecificationPage: React.FC<PageProps> = ({
158157
'</a>',
159158
},
160159
],
161-
};
160+
}];
162161
</script>
162+
163+
<script src="${
164+
i18n.languages[0] == 'sv'
165+
? env.ENTRYSCAPE_OPENDATA_SV_URL
166+
: env.ENTRYSCAPE_OPENDATA_EN_URL
167+
}"></script>
163168
<script src="${
164169
env.ENTRYSCAPE_BLOCKS_URL
165-
? env.ENTRYSCAPE_BLOCKS_URL
166-
: 'https://dataportal.azureedge.net/cdn/blocks.0.18.2.app.js'
167-
}"></script>
170+
}"></script>
168171
`,
169172
{
170173
done: function () {},

‎src/pages/SearchPage/SearchResults.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const SortingOptions: React.FC<{
112112
? `${i18n.t('pages|search|compact-list')}`
113113
: `${i18n.t('pages|search|compact-list-active')}`
114114
}
115-
className={isCompact ? '' : 'active'}
115+
className={isCompact ? ' ' : 'active'}
116116
onClick={() => {
117117
clearCurrentScrollPos();
118118
search.set({compact:true}).then(() => {search.setStateToLocation();setCompact(false);});
@@ -139,7 +139,7 @@ const SortingOptions: React.FC<{
139139
search.request.sortOrder &&
140140
search.request.sortOrder == SearchSortOrder.score_desc
141141
? 'text-7 sort-active'
142-
: 'text-7'
142+
: 'text-7 '
143143
}
144144
>
145145
{i18n.t('pages|search|relevance')}
@@ -160,7 +160,7 @@ const SortingOptions: React.FC<{
160160
search.request.sortOrder &&
161161
search.request.sortOrder == SearchSortOrder.modified_desc
162162
? 'text-7 sort-active'
163-
: 'text-7'
163+
: 'text-7 '
164164
}
165165
>
166166
{i18n.t('pages|search|date')}

‎src/scss/blockspage/blockspage.scss‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
margin: 0 64px;
1616
padding: 0 16px;
1717
@include Layout;
18-
1918
//Window 800px
2019
@media screen and (max-width: 50rem) {
2120
flex-direction: column;
@@ -119,6 +118,7 @@
119118
}
120119

121120
.rdformsFields {
121+
122122
.rdformsField,
123123
.rdformsRepeatedValue {
124124
border: none;
@@ -328,6 +328,7 @@
328328
flex-direction: column;
329329

330330
.rdformsFields {
331+
331332
.rdformsGroup,
332333
.rdforms,
333334
.rdformsPresenter {
@@ -618,6 +619,7 @@
618619
margin-top: $space-32;
619620

620621
.rdforms {
622+
621623
.rdformsRow,
622624
.rdformsTopLevel,
623625
.notCompact {
@@ -817,6 +819,7 @@ html:lang(en) {
817819
}
818820

819821
span {
822+
820823
.entryscape,
821824
.btn {
822825
padding: 0rem;
@@ -977,7 +980,7 @@ html:lang(en) {
977980
}
978981

979982
i {
980-
font-family: Font Awesome\5 Free !important;
983+
font-family: "FontAwesome" !important;
981984
color: $green100;
982985
}
983986
}
@@ -1096,7 +1099,7 @@ html:lang(en) {
10961099
}
10971100

10981101
i {
1099-
font-family: Font Awesome\5 Free !important;
1102+
font-family: "FontAwesome" !important;
11001103
color: $green100;
11011104
}
11021105
}
@@ -1284,7 +1287,7 @@ html:lang(en) {
12841287
}
12851288

12861289
i {
1287-
font-family: Font Awesome\5 Free !important;
1290+
font-family: "FontAwesome" !important;
12881291
color: $green100;
12891292
}
12901293
}

‎src/scss/general/general.scss‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,16 @@
8181
width: max-content;
8282
}
8383

84+
//Remove focus before tabbing..
85+
.no-focus-outline a:focus,
86+
.no-focus-outline button:focus,
87+
.no-focus-outline input:focus,
88+
.no-focus-outline input[type="radio"]:focus,
89+
.no-focus-outline textarea:focus,
90+
.no-focus-outline select:focus {
91+
outline: none !important;
92+
}
93+
8494
//Focus for most elements
8595
html a:focus,
8696
html button:focus,
@@ -92,16 +102,6 @@ html select:focus {
92102
outline-offset: $focus-offset !important;
93103
}
94104

95-
//Remove focus before tabbing..
96-
.no-focus-outline a:focus,
97-
.no-focus-outline button:focus,
98-
.no-focus-outline input:focus,
99-
.no-focus-outline input[type="radio"]:focus,
100-
.no-focus-outline textarea:focus,
101-
.no-focus-outline select:focus {
102-
outline: none !important;
103-
}
104-
105105
//Skip to content without js.
106106
.skiptocontent_nojs {
107107
display: none;

‎src/scss/search/search_filter.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,7 @@
419419
opacity: 0;
420420
height: 0px;
421421
overflow: hidden;
422+
border-radius: 2px;
422423

423424
&.show-tip {
424425
display: block;

‎src/scss/search/search_result.scss‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@
6464
border-color: $green25;
6565
background-color: $white;
6666
color: $black100;
67-
transition: ease-in-out .1s;
67+
transition: border-color ease .1s;
68+
transition: background-color ease .1s;
6869

6970
&:hover {
7071
border-color: $green50;
@@ -393,7 +394,8 @@
393394
width: 2rem;
394395
border-color: $green25;
395396
background-color: $white;
396-
transition: ease-in-out .1s;
397+
transition: background-color ease .1s;
398+
transition: border-color ease .1s;
397399

398400
&:hover {
399401
border-color: $green50;

0 commit comments

Comments
 (0)