From 41fa16b7cb026cb562cb1aa3fcf69f1a115da800 Mon Sep 17 00:00:00 2001 From: Dan Head Date: Mon, 14 Jan 2019 21:35:27 +0000 Subject: [PATCH] Use rems for grid sizes and logo size --- css/index.css | 4 ++++ css/logo.css | 10 +++++----- css/metadata.css | 2 +- css/page.css | 17 +++++++++-------- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/css/index.css b/css/index.css index 1e07e6a..76c81de 100644 --- a/css/index.css +++ b/css/index.css @@ -48,6 +48,10 @@ --size-body: 1rem; --size-body-small: 0.889rem; --size-body-extra-small: 0.79rem; + --logo-size-sm: 7rem; + --logo-size-md: 9rem; + --logo-size-lg: 10rem; + --logo-size-xl: 12rem; --transition-fs: 0.15s; --transition-md: 0.3s; --transition-sl: 0.6s; diff --git a/css/logo.css b/css/logo.css index ddf8211..5d66d89 100644 --- a/css/logo.css +++ b/css/logo.css @@ -2,24 +2,24 @@ width: 100%; } -@media (--viewport-lg) and (min-height: 540px) { +@media (--viewport-lg) and (min-height: 34rem) { .is-fixed .logo { position: fixed; - width: 168px; + width: var(--logo-size-lg); z-index: 10; } } -@media (--viewport-xl) and (min-height: 540px) { +@media (--viewport-xl) and (min-height: 34rem) { .is-fixed .logo { - width: 224px; + width: var(--logo-size-xl); } } .logo__link { display: block; margin: 0 auto; - max-width: 320px; + max-width: 16rem; position: relative; border-radius: 50%; transition: box-shadow var(--transition-fs) ease-out; diff --git a/css/metadata.css b/css/metadata.css index 58d1312..24ebd21 100644 --- a/css/metadata.css +++ b/css/metadata.css @@ -9,7 +9,7 @@ } } -@media (--viewport-lg) and (min-height: 540px) { +@media (--viewport-lg) and (min-height: 34rem) { .is-fixed .metadata { position: fixed; } diff --git a/css/page.css b/css/page.css index e70e259..b555b11 100644 --- a/css/page.css +++ b/css/page.css @@ -1,7 +1,7 @@ .page { display: grid; grid-auto-flow: dense; - grid-gap: var(--space-xs); + grid-gap: var(--space-sm); grid-template-columns: 1fr; max-width: 75rem; margin: var(--space-xs) var(--space-xs) 0; @@ -29,9 +29,8 @@ @media (--viewport-sm) { .page { - grid-template-columns: 112px 1fr; - grid-template-rows: 112px 1fr; - grid-gap: var(--space-sm); + grid-template-columns: var(--logo-size-sm) 1fr; + grid-template-rows: var(--logo-size-sm) 1fr; grid-auto-rows: auto; margin: var(--space-sm) var(--space-sm) 0; } @@ -54,6 +53,8 @@ @media (--viewport-md) { .page { + grid-template-columns: var(--logo-size-md) 1fr; + grid-template-rows: var(--logo-size-md) 1fr; grid-gap: var(--space-md); margin: var(--space-md) var(--space-md) 0; } @@ -70,8 +71,8 @@ @media (--viewport-lg) { .page { - grid-template-columns: 168px 1fr; - grid-template-rows: 32px 100px 1fr; + grid-template-columns: var(--logo-size-lg) 1fr; + grid-template-rows: 32px calc(var(--logo-size-lg) - var(--space-md) - 32px) 1fr; } .page__logo { @@ -91,8 +92,8 @@ @media (--viewport-xl) { .page { - grid-template-columns: 224px 1fr; - grid-template-rows: 32px 156px 1fr; + grid-template-columns: var(--logo-size-xl) 1fr; + grid-template-rows: 32px calc(var(--logo-size-xl) - var(--space-md) - 32px) 1fr; } .page__columns {