aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Brattlof <hello@bryanbrattlof.com>2020-05-01 18:51:37 -0400
committerBryan Brattlof <hello@bryanbrattlof.com>2020-05-01 18:51:37 -0400
commitd82c72bf654445f55b8656314202c6c718729d7e (patch)
tree7ee05f531f7b981568eb16a4214dd032f9e99921
parentc05ee4cb945a7c97805d18c1d015c2cbad52269d (diff)
downloadbryanbrattlof.com-d82c72bf654445f55b8656314202c6c718729d7e.tar.gz
bryanbrattlof.com-d82c72bf654445f55b8656314202c6c718729d7e.tar.bz2
remove p mixin
because the footer is used in every template, we can safely put the default 'p' styling in the base template.
-rw-r--r--stylesheets/article.scss12
-rw-r--r--stylesheets/base/base.scss6
-rw-r--r--stylesheets/base/typography.scss14
-rw-r--r--stylesheets/footer.scss1
4 files changed, 14 insertions, 19 deletions
diff --git a/stylesheets/article.scss b/stylesheets/article.scss
index 672b396..3d9d1f4 100644
--- a/stylesheets/article.scss
+++ b/stylesheets/article.scss
@@ -15,7 +15,6 @@ header {
/* subtitle + metadata */
p {
- @include p;
color: $secondary-font-color;
margin: 0;
}
@@ -84,28 +83,33 @@ object {
h1 {
@extend %h12-extend;
}
+
h2 {
@extend %h12-extend;
}
+
h3 {
@extend %h34-extend;
font-size: 175%;
}
+
h4 {
@extend %h34-extend;
font-size: 150%;
}
+
h5 {
@extend %h56-extend;
font-size: 110%;
}
+
h6 {
@extend %h56-extend;
font-size: 100%;
}
-p {
- @include p;
-}
+
+p {}
+
strong {
@include strong;
}
diff --git a/stylesheets/base/base.scss b/stylesheets/base/base.scss
index 1fc26eb..9e37b51 100644
--- a/stylesheets/base/base.scss
+++ b/stylesheets/base/base.scss
@@ -50,6 +50,12 @@ a {
color: inherit;
}
+p {
+ display: block;
+ margin: 0 0 $default-spacing;
+ padding: 0;
+}
+
ul {
list-style: none;
margin: 0 0 $default-spacing;
diff --git a/stylesheets/base/typography.scss b/stylesheets/base/typography.scss
index feb0e4f..8d44acd 100644
--- a/stylesheets/base/typography.scss
+++ b/stylesheets/base/typography.scss
@@ -41,20 +41,6 @@
font-weight: $bold-font-weight;
}
-@mixin p {
- @if not(global-variable-exists(_p_import)) {
- $_p_import: true !global;
-
- @at-root {
- p {
- display: block;
- margin: 0 0 20px;
- padding: 0;
- }
- }
- }
-}
-
@mixin b {
@if not(global-variable-exists(_b_import)) {
$_b_import: true !global;
diff --git a/stylesheets/footer.scss b/stylesheets/footer.scss
index e0b4741..16e35b9 100644
--- a/stylesheets/footer.scss
+++ b/stylesheets/footer.scss
@@ -25,7 +25,6 @@ footer {
}
p {
- @include p;
font-size: 75%;
margin: (2 * $default-spacing) 0;