From 2392047a0ccc270897c3c451e9646e81a4ff3035 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 25 Jun 2017 18:22:51 -0700 Subject: [PATCH] update alert component to use theme sass map and add a ton of options in the process --- docs/4.0/components/alerts.md | 32 ++++++++------------------------ scss/_alert.scss | 15 ++++----------- scss/mixins/_alert.scss | 9 ++++----- 3 files changed, 16 insertions(+), 40 deletions(-) diff --git a/docs/4.0/components/alerts.md b/docs/4.0/components/alerts.md index 3acfd2a797..ed63da9525 100644 --- a/docs/4.0/components/alerts.md +++ b/docs/4.0/components/alerts.md @@ -11,18 +11,10 @@ toc: true Alerts are available for any length of text, as well as an optional dismiss button. For proper styling, use one of the four **required** contextual classes (e.g., `.alert-success`). For inline dismissal, use the [alerts jQuery plugin](#dismissing). {% example html %} - - - - +{% for color in site.data.theme-colors %} +{% endfor %} {% endexample %} {% capture callout-include %}{% include callout-warning-color-assistive-technologies.md %}{% endcapture %} @@ -33,18 +25,10 @@ Alerts are available for any length of text, as well as an optional dismiss butt Use the `.alert-link` utility class to quickly provide matching colored links within any alert. {% example html %} - - - - +{% for color in site.data.theme-colors %} +{% endfor %} {% endexample %} ### Additional content diff --git a/scss/_alert.scss b/scss/_alert.scss index 562821a58b..3dfd13f56a 100644 --- a/scss/_alert.scss +++ b/scss/_alert.scss @@ -41,15 +41,8 @@ // // Generate contextual modifier classes for colorizing the alert. -.alert-success { - @include alert-variant($alert-success-bg, $alert-success-border-color, $alert-success-text); -} -.alert-info { - @include alert-variant($alert-info-bg, $alert-info-border-color, $alert-info-text); -} -.alert-warning { - @include alert-variant($alert-warning-bg, $alert-warning-border-color, $alert-warning-text); -} -.alert-danger { - @include alert-variant($alert-danger-bg, $alert-danger-border-color, $alert-danger-text); +@each $color, $value in $theme-colors { + .alert-#{$color} { + @include alert-variant(theme-color-level($color, -10), theme-color-level($color, -9), theme-color-level($color, 6)); + } } diff --git a/scss/mixins/_alert.scss b/scss/mixins/_alert.scss index 1e9307ebbe..d938e89722 100644 --- a/scss/mixins/_alert.scss +++ b/scss/mixins/_alert.scss @@ -1,14 +1,13 @@ -// Alerts - -@mixin alert-variant($background, $border, $body-color) { - color: $body-color; +@mixin alert-variant($background, $border, $color) { + color: $color; background-color: $background; border-color: $border; hr { border-top-color: darken($border, 5%); } + .alert-link { - color: darken($body-color, 10%); + color: darken($color, 10%); } }