Merge pull request #34 from Programvareverkstedet/linkdash
Add wrapper to services page, fix css and favicon
This commit was merged in pull request #34.
	This commit is contained in:
		@@ -1,12 +1,16 @@
 | 
			
		||||
main {
 | 
			
		||||
  display: grid;
 | 
			
		||||
  margin: 0px !important;
 | 
			
		||||
  padding: 0px !important;
 | 
			
		||||
  width: 100vw;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
  width: 80vw;
 | 
			
		||||
.serviceWrapper {
 | 
			
		||||
  width: 80%;
 | 
			
		||||
  display: grid;
 | 
			
		||||
  grid-template-columns:  1fr 1fr;
 | 
			
		||||
  grid-gap: 1em;
 | 
			
		||||
 | 
			
		||||
  margin: auto auto;
 | 
			
		||||
 | 
			
		||||
  margin-top: 4em;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -79,9 +83,8 @@ main {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@media (max-width: 800px) {
 | 
			
		||||
  main {
 | 
			
		||||
  .serviceWrapper {
 | 
			
		||||
    grid-template-columns: 1fr;
 | 
			
		||||
    margin: auto !important;
 | 
			
		||||
  }
 | 
			
		||||
  .categoryContainer {
 | 
			
		||||
    width: 100%;
 | 
			
		||||
 
 | 
			
		||||
@@ -5,10 +5,10 @@ require_once dirname(dirname(__DIR__)) . implode(DIRECTORY_SEPARATOR, ['', 'inc'
 | 
			
		||||
<html lang="no">
 | 
			
		||||
<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">
 | 
			
		||||
<link rel="shortcut icon" href="favicon.ico">
 | 
			
		||||
<link rel="stylesheet" href="../css/normalize.css">
 | 
			
		||||
<link rel="stylesheet" href="../css/style.css">
 | 
			
		||||
<link rel="stylesheet" href="../css/services.css">
 | 
			
		||||
<link rel="shortcut icon" href="/favicon.ico">
 | 
			
		||||
<link rel="stylesheet" href="/css/normalize.css">
 | 
			
		||||
<link rel="stylesheet" href="/css/style.css">
 | 
			
		||||
<link rel="stylesheet" href="/css/services.css">
 | 
			
		||||
<meta name="theme-color" content="#024" />
 | 
			
		||||
<title>Tjenesteverkstedet</title>
 | 
			
		||||
 | 
			
		||||
@@ -21,6 +21,8 @@ require_once dirname(dirname(__DIR__)) . implode(DIRECTORY_SEPARATOR, ['', 'inc'
 | 
			
		||||
        </nav>
 | 
			
		||||
        <main>
 | 
			
		||||
 | 
			
		||||
        <div class="serviceWrapper">
 | 
			
		||||
 | 
			
		||||
          <div class="categoryContainer">
 | 
			
		||||
            <div class="categoryLabel">Versjonskontroll og utvikling</div>
 | 
			
		||||
            <div class="categoryContent">
 | 
			
		||||
@@ -195,12 +197,12 @@ require_once dirname(dirname(__DIR__)) . implode(DIRECTORY_SEPARATOR, ['', 'inc'
 | 
			
		||||
                </div>
 | 
			
		||||
                <img class="serviceImage" src="img/gallery.png" alt="RSS-Ikon">
 | 
			
		||||
              </div>
 | 
			
		||||
            
 | 
			
		||||
 | 
			
		||||
              <!-- Bokhylle /brzeczyszczykiewicz ? -->              
 | 
			
		||||
 | 
			
		||||
            </div>
 | 
			
		||||
          </div>
 | 
			
		||||
        </div>
 | 
			
		||||
      </main>
 | 
			
		||||
</body>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user