forked from City-of-Helsinki/varaamo
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changed error page font to be a web safe font (#277)
- Loading branch information
Showing
2 changed files
with
50 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,6 @@ | |
| <meta name="viewport" content="width=device-width, initial-scale=1" /> | ||
| <meta http-equiv="X-UA-Compatible" content="ie=edge" /> | ||
| <link rel="stylesheet" href="stylesheet.css"> | ||
| <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,800" rel="stylesheet"> | ||
| <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" | ||
| integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous"> | ||
| <title>Varaamo</title> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,92 +1,92 @@ | ||
| html { | ||
| height: 100%; | ||
| height: 100%; | ||
| } | ||
|
|
||
| body { | ||
| height: 100%; | ||
| display: flex; | ||
| flex-direction: column; | ||
| font-family: "Open Sans", sans-serif !important; | ||
| height: 100%; | ||
| display: flex; | ||
| flex-direction: column; | ||
| font-family: "Tahoma", "Arial", sans-serif !important; | ||
| } | ||
|
|
||
| .header-logo { | ||
| margin: 8px 0px 8px 0px | ||
| margin: 8px 0px 8px 0px | ||
| } | ||
|
|
||
|
|
||
| nav.main-nav { | ||
| background-color: #37475e !important; | ||
| height: 60px; | ||
| background-color: #37475e !important; | ||
| height: 60px; | ||
| } | ||
|
|
||
| .navbar-brand { | ||
| font-weight: bold; | ||
| font-size: 16px !important; | ||
| font-weight: bold; | ||
| font-size: 16px !important; | ||
| } | ||
|
|
||
| main { | ||
| flex-grow: 1; | ||
| flex-grow: 1; | ||
| } | ||
|
|
||
| .main-content-header { | ||
| font-weight: bolder; | ||
| font-size: 2em; | ||
| margin: 30px 0px 30px 0px; | ||
| font-weight: bolder; | ||
| font-size: 2em; | ||
| margin: 30px 0px 30px 0px; | ||
| } | ||
|
|
||
| footer { | ||
| background-color: #37475e; | ||
| color: white; | ||
| min-height: 230px; | ||
| width: 100%; | ||
| text-align: center; | ||
| background-color: #37475e; | ||
| color: white; | ||
| min-height: 230px; | ||
| width: 100%; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .footer-text { | ||
| display: block; | ||
| text-align: center; | ||
| position: relative; | ||
| top: 25%; | ||
| font-size: 16px; | ||
| display: block; | ||
| text-align: center; | ||
| position: relative; | ||
| top: 25%; | ||
| font-size: 16px; | ||
| } | ||
|
|
||
| footer a { | ||
| color: white; | ||
| display: block; | ||
| text-align: center; | ||
| position: relative; | ||
| top: 35%; | ||
| color: white; | ||
| display: block; | ||
| text-align: center; | ||
| position: relative; | ||
| top: 35%; | ||
| } | ||
|
|
||
| footer a:hover { | ||
| color: white; | ||
| color: white; | ||
| } | ||
|
|
||
| .footer-header { | ||
| font-weight: bolder; | ||
| font-size: 1.5rem; | ||
| font-weight: bolder; | ||
| font-size: 1.5rem; | ||
| } | ||
|
|
||
| .turku-logo-footer { | ||
| display: block; | ||
| position: absolute; | ||
| margin-top: 20px; | ||
| left: 10%; | ||
| display: block; | ||
| position: absolute; | ||
| margin-top: 20px; | ||
| left: 10%; | ||
| } | ||
|
|
||
| @media (max-width:600px) { | ||
| footer { | ||
| min-height: initial; | ||
| } | ||
|
|
||
| .turku-logo-footer { | ||
| display: initial; | ||
| position: initial; | ||
| margin-bottom: 12px; | ||
| } | ||
|
|
||
| .footer-text { | ||
| top: 0; | ||
| margin-bottom: 8px; | ||
| } | ||
| footer { | ||
| min-height: initial; | ||
| } | ||
|
|
||
| .turku-logo-footer { | ||
| display: initial; | ||
| position: initial; | ||
| margin-bottom: 12px; | ||
| } | ||
|
|
||
| .footer-text { | ||
| top: 0; | ||
| margin-bottom: 8px; | ||
| } | ||
| } |