Projects/nettsiden
Projects
/
nettsiden
8
2
Fork 0
Code Issues 15 Pull Requests 2 Activity

Merge pull request #34 from Programvareverkstedet/linkdash 

Add wrapper to services page, fix css and favicon
This commit is contained in:
Bjornar Orjansen Kaarevik 2022-11-29 17:56:29 +01:00 committed by GitHub
parent 79ffb1fff5 d8f8aafdd9
commit 3a39ca0f73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
www/css/services.css
View File

@ -1,12 +1,16 @@
main { main {
display: grid; margin: 0px !important;
padding: 0px !important;
width: 100vw;
}
width: 80vw; .serviceWrapper {
width: 80%;
display: grid;
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
grid-gap: 1em; grid-gap: 1em;
margin: auto auto; margin: auto auto;
margin-top: 4em; margin-top: 4em;
} }
@ -79,9 +83,8 @@ main {
} }
@media (max-width: 800px) { @media (max-width: 800px) {
main { .serviceWrapper {
grid-template-columns: 1fr; grid-template-columns: 1fr;
margin: auto !important;
} }
.categoryContainer { .categoryContainer {
width: 100%; width: 100%;

12
www/tjenester/index.php
View File

@ -5,10 +5,10 @@ require_once dirname(dirname(__DIR__)) . implode(DIRECTORY_SEPARATOR, ['', 'inc'
<html lang="no"> <html lang="no">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
<link rel="shortcut icon" href="favicon.ico"> <link rel="shortcut icon" href="/favicon.ico">
<link rel="stylesheet" href="../css/normalize.css"> <link rel="stylesheet" href="/css/normalize.css">
<link rel="stylesheet" href="../css/style.css"> <link rel="stylesheet" href="/css/style.css">
<link rel="stylesheet" href="../css/services.css"> <link rel="stylesheet" href="/css/services.css">
<meta name="theme-color" content="#024" /> <meta name="theme-color" content="#024" />
<title>Tjenesteverkstedet</title> <title>Tjenesteverkstedet</title>
@ -21,6 +21,8 @@ require_once dirname(dirname(__DIR__)) . implode(DIRECTORY_SEPARATOR, ['', 'inc'
</nav> </nav>
<main> <main>
<div class="serviceWrapper">
<div class="categoryContainer"> <div class="categoryContainer">
<div class="categoryLabel">Versjonskontroll og utvikling</div> <div class="categoryLabel">Versjonskontroll og utvikling</div>
<div class="categoryContent"> <div class="categoryContent">
@ -195,12 +197,12 @@ require_once dirname(dirname(__DIR__)) . implode(DIRECTORY_SEPARATOR, ['', 'inc'
</div> </div>
<img class="serviceImage" src="img/gallery.png" alt="RSS-Ikon"> <img class="serviceImage" src="img/gallery.png" alt="RSS-Ikon">
</div> </div>
<!-- Bokhylle /brzeczyszczykiewicz ? --> <!-- Bokhylle /brzeczyszczykiewicz ? -->
</div> </div>
</div> </div>
</div>
</main> </main>
</body> </body>