diff --git a/src/components/Page.js b/src/components/Page.js index 74083141..f3a33210 100644 --- a/src/components/Page.js +++ b/src/components/Page.js @@ -3,8 +3,10 @@ const Share = require('./Share') const getHtml = require('../lib/component').getHtml const Page = ({children, shareable}) => ( -
- {getHtml(children)} +
+
+ {getHtml(children)} +
{!shareable ? null : ( diff --git a/src/style/body-wrapper.scss b/src/style/body-wrapper.scss index 9d133367..4af8c9c9 100644 --- a/src/style/body-wrapper.scss +++ b/src/style/body-wrapper.scss @@ -7,7 +7,7 @@ background-color: white; font-family: $text-font; - font-size: $default-font-size; + font-size: var(--font-size-default); } .body-wrapper__content { diff --git a/src/style/components/Article.scss b/src/style/components/Article.scss index 775f0c53..fa5407ee 100644 --- a/src/style/components/Article.scss +++ b/src/style/components/Article.scss @@ -4,6 +4,7 @@ --article-line-height: 1.75em; --article-quote-padding: 1em; --article-quote-font-size: 1.25em; + --article-head-margin-bottom: var(--small-margin); hyphens: auto; @@ -13,12 +14,7 @@ margin-bottom: 1.25em; h1 { - text-align: center; - margin-bottom: $small-margin; - } - - h2 { - text-align: center; + margin-bottom: var(--article-head-margin-bottom); } .date { @@ -38,6 +34,10 @@ ul, ol{ margin-left: $half-margin; margin-bottom: $single-margin; + + li { + margin-bottom: var(--half-margin); + } } ul{ @@ -83,6 +83,13 @@ background: var(--dark-color); } } + + &--cloud { + h1 { + --article-head-margin-bottom: var(--single-margin); + margin-bottom: var(--article-head-margin-bottom); + } + } } @media (max-width: $mobile-width) { @@ -97,6 +104,10 @@ img { max-height: 20em; } + + ul, ol { + margin-left: var(--single-margin); + } } } } diff --git a/src/style/components/cloud-page.scss b/src/style/components/cloud-page.scss deleted file mode 100644 index 1e585b04..00000000 --- a/src/style/components/cloud-page.scss +++ /dev/null @@ -1,66 +0,0 @@ -@import "../variables"; - -.cloud-page { - margin-bottom: $post-margin; - - &__body{ - h1{ - text-align: center; - margin-bottom: $single-margin; - } - - h2 { - text-align: left; - margin-top: $double-margin; - font-family: $text-font; - } - - ul, ol{ - margin-left: $half-margin; - margin-bottom: $single-margin; - padding-left: $single-margin; - } - - ul{ - list-style: disc; - } - - p{ - margin-bottom: 1.25em; - } - - img { - width: 100%; - } - - blockquote { - background-color: hsl(215, 10%, 96%); - padding: 1em 1em .5em; - margin: $single-margin 0; - font-family: $title-font; - font-style: italic; - font-weight: normal; - font-size: 1.25em; - - cite { - margin-top: $single-margin; - display: block; - color: #aaa; - font-size: initial; - font-family: $text-font; - text-align: right; - margin-right: $single-margin; - } - } - } -} - -@media (max-width: $mobile-width) { - .cloud-page { - &__body { - img { - max-height: 20em; - } - } - } -} diff --git a/src/style/main.scss b/src/style/main.scss index 1deaf7b3..b2fb398d 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -1,5 +1,3 @@ -@import "variables"; - * { margin: 0; padding: 0; @@ -16,20 +14,25 @@ body { } h1 { + text-align: center; font-size: var(--font-size-h1); + + hyphens: none; } h2{ - text-align: center; - margin-bottom: $single-margin; - + margin: var(--single-margin) 0; font-size: var(--font-size-h2); + + hyphens: none; } h3{ - margin-bottom: $single-margin / 2; + margin: var(--single-margin) 0; font-size: var(--font-size-h3); + + hyphens: none; } .actor { diff --git a/src/style/style.scss b/src/style/style.scss index f058c1a9..4088cf76 100644 --- a/src/style/style.scss +++ b/src/style/style.scss @@ -12,7 +12,6 @@ @import "components/timeline-record-instagram"; @import "components/schedule-table"; @import "components/footer-links"; -@import "components/cloud-page"; @import "components/Article"; @import "components/Paginator"; @import "components/album"; diff --git a/src/style/variables.scss b/src/style/variables.scss index 1f3e2600..72583650 100644 --- a/src/style/variables.scss +++ b/src/style/variables.scss @@ -46,7 +46,6 @@ $white-shadow: 0 .1em 0.3em rgba(0, 0, 0, 0.2); $title-font: "PT Serif", Georgia, serif; $text-font: "PT Sans", Arial, sans-serif; -$default-font-size: 14pt; $smaller-font-size: 0.9rem; $normal-font-size: 1.0rem; $bigger-font-size: 1.2rem; @@ -64,7 +63,6 @@ $short-duration: 0.3s; @media (max-width: $mobile-width) { //FONTS - $default-font-size: 14pt; $smaller-font-size: 0.9rem; $normal-font-size: 1.0rem; $bigger-font-size: 1.1rem; @@ -76,11 +74,14 @@ $short-duration: 0.3s; --text-color: #303030; --text-color-second: #ccc; - --font-size-h1: 2.0rem; - --font-size-h2: 1.3rem; - --font-size-h3: 1.1rem; + //FONTS + --font-size-default: 14pt; --font-size-second: 0.9rem; + --font-size-h1: 3.0rem; + --font-size-h2: 2.0rem; + --font-size-h3: 1.5rem; + //COLOR --dark-color: $dark-color; --darker-color: $darker-color; @@ -100,8 +101,8 @@ $short-duration: 0.3s; @media (max-width: $mobile-width) { :root { - --font-size-h1: 1.5rem; - --font-size-h2: 1.25rem; - --font-size-h3: 1rem; + --font-size-h1: 1.75rem; + --font-size-h2: 1.50rem; + --font-size-h3: 1.25rem; } }