aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Brattlof <hello@bryanbrattlof.com>2020-05-01 18:43:03 -0400
committerBryan Brattlof <hello@bryanbrattlof.com>2020-05-01 18:43:03 -0400
commit698c0d8b8473dbcb21e214d217efbeb2cdd6f892 (patch)
tree565be55e7f4a9711cc4dcd9566ac584aceecf2fd
parentedd7fb35ca00cc2132aae4e1927d6a376fc79a6b (diff)
downloadbryanbrattlof.com-698c0d8b8473dbcb21e214d217efbeb2cdd6f892.tar.gz
bryanbrattlof.com-698c0d8b8473dbcb21e214d217efbeb2cdd6f892.tar.bz2
remove list.scss
Unordered Lists are in every page of the website thanks to the footer. Removing the li mixin and placed the default styling in the 'base.scss' file will simplify the stylesheet more. Ordered Lists are only used in the 'articles.scss' stylesheet. We can safely remove the ol mixin and place the default arguments inside the article's stylesheet.
-rw-r--r--stylesheets/article.scss7
-rw-r--r--stylesheets/base.scss1
-rw-r--r--stylesheets/base/base.scss17
-rw-r--r--stylesheets/base/lists.scss46
-rw-r--r--stylesheets/footer.scss5
5 files changed, 22 insertions, 54 deletions
diff --git a/stylesheets/article.scss b/stylesheets/article.scss
index 1ee5566..672b396 100644
--- a/stylesheets/article.scss
+++ b/stylesheets/article.scss
@@ -196,15 +196,16 @@ a {
/* lists */
li {
- @include li;
display: list-item;
}
ul {
- @include ul;
li { list-style: disc; }
}
ol {
- @include ol;
+ list-style: none;
+ margin: 0 0 $default-spacing;
+ padding: 0;
+
li { list-style: decimal; }
}
diff --git a/stylesheets/base.scss b/stylesheets/base.scss
index aa6ec27..75e3a07 100644
--- a/stylesheets/base.scss
+++ b/stylesheets/base.scss
@@ -5,7 +5,6 @@
@import 'base/typography';
@import 'base/links';
-@import 'base/lists';
@import 'base/flex';
@import 'base/base';
diff --git a/stylesheets/base/base.scss b/stylesheets/base/base.scss
index 098ff4e..1fc26eb 100644
--- a/stylesheets/base/base.scss
+++ b/stylesheets/base/base.scss
@@ -50,6 +50,23 @@ a {
color: inherit;
}
+ul {
+ list-style: none;
+ margin: 0 0 $default-spacing;
+ padding: 0;
+}
+
+li {
+ display: inline-block;
+ margin: ($default-spacing/2) $default-spacing;
+ padding: 0 ($default-spacing/4);
+
+ @include breakpoint-min(600px) {
+ margin: ($default-spacing/2) ($default-spacing*2);
+ padding: 0 ($default-spacing/2);
+ }
+}
+
/* Add the correct display in IE 10.*/
[hidden] {
display: none;
diff --git a/stylesheets/base/lists.scss b/stylesheets/base/lists.scss
deleted file mode 100644
index 9cb8fe8..0000000
--- a/stylesheets/base/lists.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-@mixin ul {
- @if not(global-variable-exists(_ul_reset)) {
- $_ul_reset: true !global;
-
- @at-root {
- ul {
- list-style: none;
- margin: 0 0 20px;
- padding: 0;
- }
- }
- }
-}
-
-@mixin ol {
- @if not(global-variable-exists(_ol_reset)) {
- $_ol_reset: true !global;
-
- @at-root {
- ol {
- list-style: none;
- margin: 0 0 20px 5px;
- padding: 0;
- }
- }
- }
-}
-
-@mixin li {
- @if not(global-variable-exists(_li_reset)) {
- $_li_reset: true !global;
-
- @at-root {
- li {
- display: inline-block;
- margin: 10px 20px;
- padding: 0 5px;
-
- @include breakpoint-min(600px) {
- margin: 10px 40px;
- padding: 0 10px;
- }
- }
- }
- }
-}
diff --git a/stylesheets/footer.scss b/stylesheets/footer.scss
index b9b6338..e0b4741 100644
--- a/stylesheets/footer.scss
+++ b/stylesheets/footer.scss
@@ -13,12 +13,9 @@ footer {
@extend %link;
}
- ul {
- @include ul;
- }
+ ul {}
li {
- @include li;
display: inline;
font-size: 90%;