diff --git a/www/assets/css/style.css b/www/assets/css/style.css index 3a865c6..1671477 100644 --- a/www/assets/css/style.css +++ b/www/assets/css/style.css @@ -1,107 +1,5 @@ @import url("https://fonts.googleapis.com/css2?family=Open+Sans&family=Source+Sans+Pro:wght@400;700&display=swap"); -h1, -.headline-1, -.heading-1 { - font-size: 6rem; - font-weight: 300; - letter-spacing: -0.015625em; - line-height: 6rem; -} - -h2, -.headline-2, -.heading-2 { - font-size: 3.75rem; - font-weight: 300; - letter-spacing: -0.0083333333em; - line-height: 3.75rem; -} - -h3, -.headline-3, -.heading-3 { - font-size: 3rem; - font-weight: 400; - letter-spacing: normal; - line-height: 3.125rem; -} - -h4, -.headline-4, -.heading-4 { - font-size: 2.125rem; - font-weight: 400; - letter-spacing: 0.0073529412em; - line-height: 2.5rem; -} - -h5, -.headline-5, -.heading-5 { - font-size: 1.5rem; - font-weight: 400; - letter-spacing: normal; - line-height: 2rem; -} - -h6, -.headline-6, -.heading-6 { - font-size: 1.25rem; - font-weight: 500; - letter-spacing: 0.125em; - line-height: 2rem; -} - -.subtitle-1 { - font-size: 1rem; - font-weight: 400; - letter-spacing: 0.009375em; - line-height: 1.75rem; -} - -.subtitle-2 { - font-size: 0.875rem; - font-weight: 500; - letter-spacing: 0.0071428571em; - line-height: 1.375rem; -} - -.body-1 { - font-size: 1rem; - font-weight: 400; - letter-spacing: 0.03125em; - line-height: 1.5rem; -} - -.body-2 { - font-size: 0.875rem; - font-weight: 400; - letter-spacing: 0.0178571429em; - line-height: 1.25rem; -} - -.button { - font-size: 0.875rem; - font-weight: 500; - letter-spacing: 0.0892857143em; - line-height: 2.25rem; -} - -.caption { - font-size: 0.75rem; - font-weight: 400; - letter-spacing: 0.0333333333em; - line-height: 1.25rem; -} - -.overline { - font-size: 0.75rem; - font-weight: 500; - letter-spacing: 0.1666666667em; - line-height: 2rem; -} - +@import url("https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap"); aki-button, *[aki-button], *.aki-button { @@ -186,9 +84,8 @@ aki-toolbar, justify-content: flex-start; max-height: 5.5rem; min-width: 20rem; - text-transform: uppercase; width: 100%; - z-index: 1; + z-index: 2; } aki-toolbar a, *[aki-toolbar] a, @@ -223,31 +120,78 @@ aki-toolbar nav a[active], border-bottom: 0.25rem solid #ffc107; } -.text1 { - font-family: "Open Sans", sans-serif; - font-weight: 400; -} - -.text2 { - font-family: "Source Sans Pro", sans-serif; - font-weight: 700; -} - html { - font-family: "Source Sans Pro", sans-serif; - font-size: 16px; + font-size: 100%; } body { display: flex; flex-direction: column; + font-family: "Roboto", sans-serif; + font-weight: 400; height: 100vh; + line-height: 1.75; margin: 0; padding: 0; - position: absolute; width: 100vw; } +p { + margin-bottom: 1rem; +} + +h1, +h2, +h3, +h4, +h5 { + margin: 3rem 0 1.38rem; + font-family: "Roboto", sans-serif; + font-weight: 400; + line-height: 1.3; +} + +h1 { + font-size: 4.209rem; +} + +h2 { + font-size: 3.157rem; +} + +h3 { + font-size: 2.369rem; +} + +h4 { + font-size: 1.777rem; +} + +h5 { + font-size: 1.333rem; +} + +small, +.text_small { + font-size: 0.75rem; +} + +/* +html { + font-family: 'Source Sans Pro', sans-serif; + font-size: $base-font-size; +} + +body { + display: flex; + flex-direction: column; + height: 100vh; + margin: 0; + padding: 0; + position: absolute; + width: 100vw; +} +*/ header .left, header .center, header .right { diff --git a/www/assets/css/style.css.map b/www/assets/css/style.css.map index fd43fd2..840748e 100644 --- a/www/assets/css/style.css.map +++ b/www/assets/css/style.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../scss/utils/theme.scss","../scss/utils/typography.scss","../scss/components/aki-button.scss","../scss/utils/elevation.scss","../scss/components/aki-card.scss","../scss/components/aki-divider.scss","../scss/components/aki-toolbar.scss","../scss/style.scss"],"names":[],"mappings":"AAAQ;ACCR;AAAA;AAAA;EAGI;EACA;EACA;EACA;;;AAGJ;AAAA;AAAA;EAGI;EACA;EACA;EACA;;;AAGJ;AAAA;AAAA;EAGI;EACA;EACA;EACA;;;AAGJ;AAAA;AAAA;EAGI;EACA;EACA;EACA;;;AAGJ;AAAA;AAAA;EAGI;EACA;EACA;EACA;;;AAGJ;AAAA;AAAA;EAGI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;ACrGJ;AAAA;AAAA;EAGI,kBFQK;EEPL;EACA;EACA,YCJW;EDKX,OFKQ;EEJR;EACA;EACA;EACA;EACA;;AAGA;AAAA;AAAA;EACI;;AAGJ;AAAA;AAAA;EACI,YFfE;EEgBF,YCbO;EDcP,OFhBK;;;AINb;AAAA;AAAA;EAGI,YJEM;EIDN,YDHW;ECIX;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;EAGI;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;AAAA;AAAA;EACI,YDrBO;;;AERf;AAAA;EAEI,YLIS;EKHT;EACA;EACA;;;ACLJ;AAAA;AAAA;EAGI;EACA,kBNCM;EMCN,YHFW;EGGX,ONDS;EMET;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;AAAA;EACI,ONbK;EMcL;;AAGJ;AAAA;AAAA;EACI;EACA;;AAEA;AAAA;AAAA;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;AAAA;EACI;;AAGJ;AAAA;AAAA;EACI;;;AC/BhB;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA,WPLa;;;AOQjB;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKA;AAAA;AAAA;EAGI;EACA;EACA;EACA;;AAIA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;IACI;;;AAIR;EAfJ;IAgBQ;;;AAIR;EA5BJ;IA6BQ;IACA;IACA;;;AAIR;EACI;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAIR;EAlBJ;IAmBQ;IACA;;;AAKJ;EACI;;AAGJ;EACI;IACI;IACA;IACA;IACA;IACA;IAEA;IACA;;EAEA;IAEI,YPrHV;IOsHU;IACA;IACA;IACA;IACA;IACA;;EAGJ;IACI;;EAGJ;IACI;IACA;IACA;;;AAKZ;EAvCJ;IAwCQ;;;;AAKZ;EACI;EACA;EACA;EACA;;AAEA;EACI,kBP1JK;EO2JL;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI,kBP9JA;EO+JA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EATJ;IAUQ;;;;AAIR;EACI,OP3MK;EO4ML;;;AAGJ;EACI,kBPhNK;EOiNL;EACA,YJ7MY;EI8MZ,OPlNQ;EOmNR;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAEA;EACI;;AAIR;EACI;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;;AAGI;EACI;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AAIR;EAjBJ;IAmBQ;;;AAMR;EACI;;AAQJ;EACI;EACA;;AAEA;EACI;;AAMR;EACI;EACA;EACA;EACA","file":"style.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../scss/utils/theme.scss","../scss/style.scss","../scss/components/aki-button.scss","../scss/utils/elevation.scss","../scss/components/aki-card.scss","../scss/components/aki-divider.scss","../scss/components/aki-toolbar.scss"],"names":[],"mappings":"AAAQ;ACSA;ACTR;AAAA;AAAA;EAGI,kBFQK;EEPL;EACA;EACA,YCJW;EDKX,OFKQ;EEJR;EACA;EACA;EACA;EACA;;AAGA;AAAA;AAAA;EACI;;AAGJ;AAAA;AAAA;EACI,YFfE;EEgBF,YCbO;EDcP,OFhBK;;;AINb;AAAA;AAAA;EAGI,YJEM;EIDN,YDHW;ECIX;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;EAGI;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;AAAA;AAAA;EACI,YDrBO;;;AERf;AAAA;EAEI,YLIS;EKHT;EACA;EACA;;;ACLJ;AAAA;AAAA;EAGI;EACA,kBNCM;EMCN,YHFW;EGGX,ONDS;EMET;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;AAAA;EACI,ONZK;EMaL;;AAGJ;AAAA;AAAA;EACI;EACA;;AAEA;AAAA;AAAA;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;AAAA;EACI;;AAGJ;AAAA;AAAA;EACI;;;ALjBhB;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;AAAA;AAAA;AAAA;AAAA;EAKI;EACA;EACA;EACA;;;AAGJ;EAEI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;AAAA;EAEI;;;AAGJ;AAAA;AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAmBI;AAAA;AAAA;EAGI;EACA;EACA;EACA;;AAIA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;IACI;;;AAIR;EAfJ;IAgBQ;;;AAIR;EA5BJ;IA6BQ;IACA;IACA;;;AAIR;EACI;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAIR;EAlBJ;IAmBQ;IACA;;;AAKJ;EACI;;AAGJ;EACI;IACI;IACA;IACA;IACA;IACA;IAEA;IACA;;EAEA;IAEI,YDnLV;ICoLU;IACA;IACA;IACA;IACA;IACA;;EAGJ;IACI;;EAGJ;IACI;IACA;IACA;;;AAKZ;EAvCJ;IAwCQ;;;;AAKZ;EACI;EACA;EACA;EACA;;AAEA;EACI,kBDxNK;ECyNL;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI,kBD5NA;EC6NA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EATJ;IAUQ;;;;AAIR;EACI,ODzQK;EC0QL;;;AAGJ;EACI,kBD9QK;EC+QL;EACA,YE3QY;EF4QZ,ODhRQ;ECiRR;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAEA;EACI;;AAIR;EACI;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;;AAGI;EACI;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AAIR;EAjBJ;IAmBQ;;;AAMR;EACI;;AAQJ;EACI;EACA;;AAEA;EACI;;AAMR;EACI;EACA;EACA;EACA","file":"style.css"} \ No newline at end of file diff --git a/www/assets/scss/components/aki-toolbar.scss b/www/assets/scss/components/aki-toolbar.scss index 39c394b..b3aa389 100644 --- a/www/assets/scss/components/aki-toolbar.scss +++ b/www/assets/scss/components/aki-toolbar.scss @@ -12,9 +12,8 @@ aki-toolbar, justify-content: flex-start; max-height: 5.5rem; min-width: 20rem; - text-transform: uppercase; width: 100%; - z-index: 1; + z-index: 2; a { color: $on-primary; @@ -32,14 +31,14 @@ aki-toolbar, letter-spacing: .0178571429em; line-height: 1.25rem; transition: .25s ease-in-out; - + &:hover { filter: invert(.2); } - + &[active] { border-bottom: .25rem solid $accent; - } + } } } } \ No newline at end of file diff --git a/www/assets/scss/style.scss b/www/assets/scss/style.scss index cf99e42..65a2c46 100644 --- a/www/assets/scss/style.scss +++ b/www/assets/scss/style.scss @@ -1,22 +1,83 @@ @import './utils/theme.scss'; @import './utils/elevation.scss'; -@import './utils/typography.scss'; +// @import './utils/typography.scss'; @import './components/aki-button.scss'; @import './components/aki-card.scss'; @import './components/aki-divider.scss'; @import './components/aki-toolbar.scss'; -.text1 { - font-family: 'Open Sans', sans-serif; +@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap'); + + +// .text1 { +// font-family: 'Open Sans', sans-serif; +// font-weight: 400; +// } + +// .text2 { +// font-family: 'Source Sans Pro', sans-serif; +// font-weight: 700; +// } + +html { + font-size: 100%; // 16px +} + +body { + display: flex; + flex-direction: column; + font-family: 'Roboto', sans-serif; font-weight: 400; + height: 100vh; + line-height: 1.75; + margin: 0; + padding: 0; + width: 100vw; } -.text2 { - font-family: 'Source Sans Pro', sans-serif; - font-weight: 700; +p { + margin-bottom: 1rem; } +h1, +h2, +h3, +h4, +h5 { + margin: 3rem 0 1.38rem; + font-family: 'Roboto', sans-serif; + font-weight: 400; + line-height: 1.3; +} + +h1 { + // margin-top: 0; + font-size: 4.209rem; +} + +h2 { + font-size: 3.157rem; +} + +h3 { + font-size: 2.369rem; +} + +h4 { + font-size: 1.777rem; +} + +h5 { + font-size: 1.333rem; +} + +small, +.text_small { + font-size: 0.75rem; +} + +/* html { font-family: 'Source Sans Pro', sans-serif; font-size: $base-font-size; @@ -31,6 +92,7 @@ body { position: absolute; width: 100vw; } +*/ header {