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.

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

Webtilgængelighed Første Udkast #83

Merged
merged 8 commits into from
Jan 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,13 @@ package-lock.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-snippets
!.vscode/*.code-snippets
Dockerfile-prod
Dockerfile-test
Jenkinsfile.prod
Jenkinsfile.test
nginx.prod.conf
nginx.test.conf
swarm.prod.yml
SecHeaders.conf
swarm.test.yml
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!DOCTYPE html>
<html lang="">
<html lang="da">
<head data-theme="light">
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=5.0, user-scalable=yes">
<link rel="shortcut icon" type="image/png" href="./KroneLogo Alle.png"/>
<title>SDFI Koordinattransformation</title>
<script defer id="CookieConsent" src=https://policy.app.cookieinformation.com/uc.js data-culture="DA" type="text/javascript"></script>
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"ol": "6.14.1",
"proj4": "2.8.0",
"sanitize.css": "13.0.0",
"sass": "^1.69.7",
"skraafoto-saul": "^2.1.0",
"vue": "3.2.31",
"vue-router": "4.0.14",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class="input-segment"
:class="{degreesInput: CrsIsDegrees}">

<input id="degreesInput"
<input name="degreesInput"
class="coordinate-input"
:class="{degreesInput: props.format == 'degrees', metresInput: props.format == 'minutes', secondsInput: props.format == 'seconds'}"
step="0.0001"
Expand All @@ -26,7 +26,7 @@
<span class="input-segment"
:class="{degreesInput: CrsIsDegrees}"
v-show="props.CrsIsDegrees && (props.format == 'minutes' || props.format == 'seconds')">
<input id="minutesInput"
<input name="minutesInput"
class="coordinate-input"
:class="{degreesInput: props.format == 'degrees', metresInput: props.format == 'minutes', secondsInput: props.format == 'seconds'}"
v-model=props.minutes[element]
Expand All @@ -37,7 +37,7 @@
</span>

<span class="input-segment" :class="{degreesInput: props.CrsIsDegrees}" v-show="props.CrsIsDegrees && props.format == 'seconds'">
<input id="secondsInput"
<input name="secondsInput"
class="coordinate-input"
:class="{degreesInput: props.format == 'degrees', metresInput: props.format == 'minutes', secondsInput: props.format == 'seconds'}"
v-model=props.seconds[element]
Expand Down
1 change: 1 addition & 0 deletions src/components/coordinatetransformation/CrsSelector.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<template>
<div class="crs-selection-wrapper">
<select id='crs-select'
name='crs-select'
:class="{ isSelected: outputSelected }"
v-model="currentlySelected"
@change="emit('crsSelected', currentlySelected)">
Expand Down
8 changes: 6 additions & 2 deletions src/components/coordinatetransformation/InputCard.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template >
<div class="input-card">
<section>
<h3>Input</h3>
<h3 class="InputTitle">Input</h3>

<CrsSelector :inOrOut="'in'" @crs-selected="inputCrsChanged"/>

Expand Down Expand Up @@ -40,6 +40,7 @@
<ArrowIcon :direction="'angle'"/>
<span class="height-field">
<input
name="degreesInput"
:class="{degreesInput: false}"
v-model=heightInMeters
step="0.0001"
Expand All @@ -52,7 +53,7 @@
<div class="footer">
<!-- DAWA -->
<div class="searchbar">
<input class="searchbar-input" id="dawa-autocomplete-input"/>
<input class="searchbar-input" id="dawa-autocomplete-input" name="dawa-autocomplete-input"/>
<SearchIcon/>
</div>
<!-- DMS selector, bør komme i sin egen komponent -->
Expand Down Expand Up @@ -424,6 +425,9 @@ input:focus {
display: inline-flex;
align-items: center;
}
.InputTitle{
color: var(--sort)
}
@media screen and (max-width: 1180px) {
.footer {
display: inline-flex;
Expand Down
5 changes: 4 additions & 1 deletion src/components/coordinatetransformation/OutputCard.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<section class="output-card">
<h3>Output</h3>
<h3 class="OutputTitle">Output</h3>
<CrsSelector :inOrOut="'out'" @crsSelected="onCrsSelect"/>

<div class="transformed-coordinates" :class="{ hasTransformed: hasTransformed }">
Expand Down Expand Up @@ -302,6 +302,9 @@ input[type='radio'] {
display: inline-flex;
flex-grow: 1;
}
.OutputTitle{
color: var(--sort)
}
.radiogroup {
display: inline-flex;
flex-wrap: nowrap;
Expand Down
19 changes: 15 additions & 4 deletions src/components/shared/header/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<nav v-if='width > minWidth'>
<ul >
<li>
<router-link to='/Denmark'>Danmark</router-link>
<router-link class='Denmark' to='/Denmark'>Danmark</router-link>
</li>
<li>
<router-link to='/Greenland'>Grønland</router-link>
<router-link class='Greenland' to='/Greenland'>Grønland</router-link>
</li>
<li>
<router-link to='/About'>Om Koordinattransformation</router-link>
<router-link class='About' to='/About'>Om Koordinattransformation</router-link>
</li>
</ul>
</ul>r
</nav>
<!-- VERTICAL NAVBAR (NÅR SKÆRMEN ER MEGET SMAL) -->
<nav class="ds-nav-vertical" v-if='verticalMenuIsOpen'>
Expand Down Expand Up @@ -52,3 +52,14 @@ const handleResize = () => { width.value = window.innerWidth }

onMounted(() => window.addEventListener('resize', handleResize))
</script>

<style scoped>
.nav-container {
/* Add any other styles for nav-container as needed */
}

.nav-container ul li a {
color: black;
opacity: 1; /* Set opacity to 1 for no transparency */
}
</style>
2 changes: 1 addition & 1 deletion src/views/About.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ h1, h2, h3, h4, h5, h6 {
margin: 1.25rem;
}
h1 {
font-size: 30px;
font-size: 1.875rem;
}
h3 {
margin: 1.5rem 1.25rem;
Expand Down
Loading