aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Brattlof <hello@bryanbrattlof.com>2020-04-25 18:11:58 -0400
committerBryan Brattlof <hello@bryanbrattlof.com>2020-04-25 18:16:02 -0400
commit0cd228bb9f25fd6103b2e97063ca3bbb367c2695 (patch)
tree0712299adf1e7642cc0e07151ffd80533a78d3ec
parent437f133721bf1186408f03973c0b22cb02c7fa07 (diff)
downloadbryanbrattlof.com-0cd228bb9f25fd6103b2e97063ca3bbb367c2695.tar.gz
bryanbrattlof.com-0cd228bb9f25fd6103b2e97063ca3bbb367c2695.tar.bz2
remove 'alert.scss'
the only pages that use the alert.scss styles are the articles and pages templates and even those only use the 'note' and 'sidebar' elements. It makes life much more simple to remove the excess elements
-rw-r--r--stylesheets/article.scss39
-rw-r--r--stylesheets/base.scss1
-rw-r--r--stylesheets/base/alerts.scss74
3 files changed, 36 insertions, 78 deletions
diff --git a/stylesheets/article.scss b/stylesheets/article.scss
index 3cda69c..461dc19 100644
--- a/stylesheets/article.scss
+++ b/stylesheets/article.scss
@@ -114,9 +114,42 @@ em {
font-style: italic;
}
-/* notes & warnings */
-@include note-alert;
-@include warning-alert;
+.sidebar, .note {
+ border-left: 3px solid $display-font-color;
+ margin: 0 0 $default-spacing;
+ padding: 15px $default-spacing;
+
+ background-color: lighten($display-font-color, 65);
+ color: $display-font-color;
+
+ .sidebar-title, .admonition-title {
+ font-family: $title-font;
+ font-weight: bold;
+ margin: 0;
+ }
+ .sidebar-subtitle {
+ font-style: italic;
+ }
+
+ p {
+ color: inherit;
+
+ &.last{
+ margin: 0;
+ }
+ }
+
+ @include print {
+ color: $print-font-color;
+ border-color: $print-font-color;
+ background-color: white;
+
+ a {
+ border-bottom-color: $print-font-color;
+ }
+ }
+}
+
blockquote {
border-left: 5px solid lighten($secondary-color, 10);
diff --git a/stylesheets/base.scss b/stylesheets/base.scss
index 0f94da3..aa6ec27 100644
--- a/stylesheets/base.scss
+++ b/stylesheets/base.scss
@@ -6,7 +6,6 @@
@import 'base/typography';
@import 'base/links';
@import 'base/lists';
-@import 'base/alerts';
@import 'base/flex';
@import 'base/base';
diff --git a/stylesheets/base/alerts.scss b/stylesheets/base/alerts.scss
deleted file mode 100644
index 32fe916..0000000
--- a/stylesheets/base/alerts.scss
+++ /dev/null
@@ -1,74 +0,0 @@
-%note-box {
- border-left: 3px solid transparent;
- margin: 0 0 20px;
- padding: 15px 20px;
-
- p {
- color: inherit;
-
- &.last{
- margin: 0;
- }
- }
-}
-%note-box-title {
- font-family: $title-font;
- margin: 0;
- font-weight: bold;
-
- &::after {
- content: ':';
- }
-}
-@mixin _alert($color, $percentage) {
- color: $color;
- border-color: $color;
- background-color: lighten($color, $percentage);
-
- @include print {
- color: $print-font-color;
- border-color: $print-font-color;
- background-color: white;
-
- a {
- border-bottom-color: $print-font-color;
- }
- }
-}
-
-@mixin note-alert {
- .note {
- @extend %note-box;
- @include _alert(rgb(49, 112, 143), 60);
-
- .admonition-title { @extend %note-box-title; }
- }
-}
-@mixin warning-alert {
- .warning {
- @extend %note-box;
- @include _alert(rgb(169, 68, 66), 50 );
-
- .admonition-title { @extend %note-box-title; }
- }
-}
-@mixin topic-alert {
- .topic {
- @extend %note-box;
- @include _alert($display-font-color, 65);
-
- .topic-title { @extend %note-box-title; }
- }
-}
-@mixin sidebar-alert {
- .sidebar {
- @extend %note-box;
- @include _alert($display-font-color, 65);
-
- .sidebar-title { @extend %note-box-title; }
- .sidebar-subtitle {
- font-style: italic;
- margin: 0 0 20px;
- }
- }
-}