fixed conflict

This commit is contained in:
Kasper Friis Christensen 2018-01-23 23:45:06 +01:00
parent b85b1e94bb
commit 47f7d18a8c
2 changed files with 19 additions and 6 deletions

View file

@ -1,11 +1,17 @@
html { html {
font-family: 'Open Sans', sans-serif;
font-size: 16px; font-size: 16px;
} }
body {
font-family: 'Open Sans', sans-serif;
font-family: 'Roboto', sans-serif;
}
h1, h2, h3, h4, h5, h6 { h1, h2 {
font-family: 'Montserrat', sans-serif; font-family: 'Montserrat', sans-serif;
font-family: 'Eczar', serif;
}
h3, h4, h5, h6 {
font-family: 'Roboto', sans-serif;
} }
h1 { h1 {

View file

@ -25,12 +25,19 @@ section {
} }
} }
.paragraphs { .paragraphs {
column-count: 2; column-count: 2;
margin: 1rem 1rem 200px; text-justify: distribute;
text-justify: inter-character;
column-gap: 2rem;
}
}
.paragraphs {
margin-bottom: 3rem;
h3, p { h3, p {
max-width: 300px; max-width: 300px;
font-family: 'Roboto', sans-serif;
} }
p + h3 { p + h3 {
margin-top: 50px; margin-top: 50px;