Browse Source

Pixels to ems.

pull/9/head
Ned Zimmerman 7 years ago
parent
commit
4f07995586
No known key found for this signature in database
GPG Key ID: FF56334A013120CA
  1. 3
      resources/assets/styles/common/_functions.scss
  2. 15
      resources/assets/styles/common/_global.scss
  3. 5
      resources/assets/styles/common/_variables.scss
  4. 2
      resources/assets/styles/components/_buttons.scss
  5. 10
      resources/assets/styles/layouts/_footer.scss
  6. 14
      resources/assets/styles/layouts/_header.scss
  7. 22
      resources/assets/styles/layouts/_pages.scss
  8. 1
      resources/assets/styles/main.scss

3
resources/assets/styles/common/_functions.scss

@ -0,0 +1,3 @@
@function em($pixels, $context: $base-font-size) {
@return #{$pixels / $context}em;
}

15
resources/assets/styles/common/_global.scss

@ -5,7 +5,8 @@
body { body {
margin: 0; margin: 0;
color: $dark-grey; color: $dark-grey;
font-family: Spectral, serif; font-family: $font-family-serif;
font-size: #{$base-font-size}px;
} }
h1, h1,
@ -14,22 +15,22 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: Karla, sans-serif; font-family: $font-family-sans-serif;
} }
h1 { h1 {
font-size: 30px; font-size: em(30);
font-weight: 600; font-weight: 600;
text-transform: uppercase; text-transform: uppercase;
letter-spacing: 2px; letter-spacing: em(2);
line-height: 36px; line-height: (36/30);
margin: 0; margin: 0;
} }
h2 { h2 {
font-size: 16px; font-size: em(16);
font-weight: normal; font-weight: normal;
line-height: 30px; line-height: (30/16);
margin: 0; margin: 0;
} }

5
resources/assets/styles/common/_variables.scss

@ -13,3 +13,8 @@ $small: 768px;
$medium: 960px; $medium: 960px;
$large: 1200px; $large: 1200px;
$extra-large: 1650px; $extra-large: 1650px;
/** Fonts */
$font-family-sans-serif: 'Karla', sans-serif;
$font-family-serif: 'Spectral', serif;
$base-font-size: 18;

2
resources/assets/styles/components/_buttons.scss

@ -8,7 +8,7 @@
border-radius: 3px; border-radius: 3px;
background: $brand-primary; background: $brand-primary;
font-family: Karla, sans-serif; font-family: Karla, sans-serif;
font-size: 16px; font-size: em(16);
font-weight: 600; font-weight: 600;
color: $white; color: $white;
letter-spacing: 2px; letter-spacing: 2px;

10
resources/assets/styles/layouts/_footer.scss

@ -4,7 +4,7 @@
margin-bottom: 0; margin-bottom: 0;
padding: 60px 42.5px 40px; padding: 60px 42.5px 40px;
font-family: Karla, sans-serif; font-family: Karla, sans-serif;
font-size: 16px; font-size: em(16);
color: $white; color: $white;
ul { ul {
@ -13,7 +13,7 @@
list-style: none; list-style: none;
text-align: center; text-align: center;
font-weight: 600; font-weight: 600;
line-height: 36px; line-height: (36/16);
} }
a { a {
@ -59,7 +59,7 @@
margin-top: 1em; margin-top: 1em;
a { a {
font-size: 32px; font-size: em(32);
margin: 0 0.25em; margin: 0 0.25em;
transition: all 0.4s; transition: all 0.4s;
} }
@ -74,7 +74,7 @@
width: 100%; width: 100%;
height: 125px; height: 125px;
background-color: $dark-grey; background-color: $dark-grey;
font-size: 14px; font-size: em(14);
h1, h1,
li, li,
@ -87,7 +87,7 @@
} }
h1 { h1 {
font-size: 16px; font-size: em(16);
font-weight: normal; font-weight: normal;
margin-bottom: 0; margin-bottom: 0;

14
resources/assets/styles/layouts/_header.scss

@ -90,10 +90,10 @@
a { a {
font-family: Karla, sans-serif; font-family: Karla, sans-serif;
font-size: 24px; font-size: em(24);
color: $white; color: $white;
letter-spacing: 0; letter-spacing: 0;
line-height: 80px; line-height: (80/24);
text-decoration: none; text-decoration: none;
display: none; display: none;
} }
@ -181,7 +181,7 @@
align-items: center; align-items: center;
a { a {
font-size: 18px; font-size: em(18);
display: inline-block; display: inline-block;
line-height: normal; line-height: normal;
color: $black; color: $black;
@ -211,16 +211,16 @@
} }
h1 { h1 {
font-size: 72px; font-size: em(72);
letter-spacing: 1.8px; letter-spacing: 1.8px;
line-height: 40px; line-height: (40/72);
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
h2 { h2 {
font-size: 30px; font-size: em(30);
letter-spacing: 0.75px; letter-spacing: 0.75px;
line-height: 40px; line-height: (40/30);
} }
} }
} }

22
resources/assets/styles/layouts/_pages.scss

@ -10,12 +10,12 @@
background-color: $white; background-color: $white;
h3 { h3 {
font-size: 30px; font-size: em(30);
font-weight: 600; font-weight: 600;
text-align: center; text-align: center;
text-transform: uppercase; text-transform: uppercase;
letter-spacing: 2px; letter-spacing: 2px;
line-height: 36px; line-height: (36/30);
color: $brand-primary; color: $brand-primary;
margin: 0; margin: 0;
@ -30,8 +30,8 @@
} }
p { p {
font-size: 16px; font-size: em(16);
line-height: 32px; line-height: (32/16);
text-align: center; text-align: center;
} }
@ -74,14 +74,14 @@
display: block; display: block;
height: 91px; height: 91px;
margin-top: 22px; margin-top: 22px;
font-size: 24px; font-size: em(24);
text-align: center; text-align: center;
} }
.title { .title {
display: block; display: block;
height: 329px - 115px; height: 329px - 115px;
font-size: 30px; font-size: em(30);
font-weight: 500; font-weight: 500;
text-align: center; text-align: center;
} }
@ -89,7 +89,7 @@
.read-more { .read-more {
display: block; display: block;
height: auto; height: auto;
font-size: 18px; font-size: em(18);
text-align: left; text-align: left;
} }
} }
@ -151,8 +151,8 @@
box-shadow: -3px 5px 4px 2px rgba(135, 135, 135, 0.09); box-shadow: -3px 5px 4px 2px rgba(135, 135, 135, 0.09);
h3 { h3 {
font-size: 48px; font-size: em(48);
line-height: 56px; line-height: (56/48);
&::before { &::before {
width: 74px; width: 74px;
@ -160,8 +160,8 @@
} }
p { p {
font-size: 18px; font-size: em(18);
line-height: 32px; line-height: (32/18);
} }
.inside { .inside {

1
resources/assets/styles/main.scss

@ -12,6 +12,7 @@
// @import "~some-node-module"; // @import "~some-node-module";
/** Import theme styles */ /** Import theme styles */
@import "common/functions";
@import "common/global"; @import "common/global";
@import "components/buttons"; @import "components/buttons";
@import "components/comments"; @import "components/comments";

Loading…
Cancel
Save