Skip to content
GitLab
Commit 2d5ab9a2 authored by Mark Otto's avatar Mark Otto
Browse files

Make alerts use variables better

parent dc4436db
10 merge requests!8635ignore Gruntfile.js in jekyll,!8339Fix broken links to navbar component in docs examples,!7674Clear float on all when navbar is collapsed - v3,!7775added some tests for tooltip title setter,!8157Close Me: Docs "Customize and Download" button fix,!7964commit fixes #7792,!8656Added rel="stylesheet" to CDN-Examples,!8527Inner properties move 1,!8245Interactive color picker - Closed: request against wrong branch,!7865Patch 2
Hide whitespace changes
Inline Side-by-side
Showing
with 40 additions and 21 deletions
+40 -21
less/alerts.less
+ 21
- 21
View file @ 2d5ab9a2
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
.alert { .alert {
padding: 8px 35px 8px 14px; padding: 8px 35px 8px 14px;
margin-bottom: @line-height-base; margin-bottom: @line-height-base;
color: @state-warning-text; color: @alert-text;
background-color: @state-warning-bg; background-color: @alert-bg;
border: 1px solid @state-warning-border; border: 1px solid @alert-border;
border-radius: @border-radius-base; border-radius: @alert-border-radius;
// Headings for larger alerts // Headings for larger alerts
h4 { h4 {
...@@ -22,13 +22,13 @@ ...@@ -22,13 +22,13 @@
} }
// Match the hr to the border of the alert // Match the hr to the border of the alert
hr { hr {
border-top-color: darken(@state-warning-border, 5%); border-top-color: darken(@alert-border, 5%);
} }
// Inherit color for immediate links and bolden them some // Inherit color for immediate links and bolden them some
> a, > a,
> p > a { > p > a {
font-weight: 500; font-weight: 500;
color: darken(@state-warning-text, 10%); color: darken(@alert-text, 10%);
} }
// Adjust close link position // Adjust close link position
...@@ -44,39 +44,39 @@ ...@@ -44,39 +44,39 @@
// ------------------------- // -------------------------
.alert-success { .alert-success {
background-color: @state-success-bg; background-color: @alert-success-bg;
border-color: @state-success-border; border-color: @alert-success-border;
color: @state-success-text; color: @alert-success-text;
hr { hr {
border-top-color: darken(@state-success-border, 5%); border-top-color: darken(@alert-success-border, 5%);
} }
> a, > a,
> p > a { > p > a {
color: darken(@state-success-text, 10%); color: darken(@alert-success-text, 10%);
} }
} }
.alert-danger { .alert-danger {
background-color: @state-danger-bg; background-color: @alert-danger-bg;
border-color: @state-danger-border; border-color: @alert-danger-border;
color: @state-danger-text; color: @alert-danger-text;
hr { hr {
border-top-color: darken(@state-danger-border, 5%); border-top-color: darken(@alert-danger-border, 5%);
} }
> a, > a,
> p > a { > p > a {
color: darken(@state-danger-text, 10%); color: darken(@alert-danger-text, 10%);
} }
} }
.alert-info { .alert-info {
background-color: @state-info-bg; background-color: @alert-info-bg;
border-color: @state-info-border; border-color: @alert-info-border;
color: @state-info-text; color: @alert-info-text;
hr { hr {
border-top-color: darken(@state-info-border, 5%); border-top-color: darken(@alert-info-border, 5%);
} }
> a, > a,
> p > a { > p > a {
color: darken(@state-info-text, 10%); color: darken(@alert-info-text, 10%);
} }
} }
......
less/variables.less
+ 19
- 0
View file @ 2d5ab9a2
...@@ -277,6 +277,25 @@ ...@@ -277,6 +277,25 @@
@modal-title-padding: 15px; @modal-title-padding: 15px;
@modal-title-line-height: @line-height-base; @modal-title-line-height: @line-height-base;
// Alerts
// -------------------------
@alert-bg: @state-warning-bg;
@alert-text: @state-warning-text;
@alert-border: @state-warning-border;
@alert-border-radius: @border-radius-base;
@alert-success-bg: @state-success-bg;
@alert-success-text: @state-success-text;
@alert-success-border: @state-success-border;
@alert-danger-bg: @state-danger-bg;
@alert-danger-text: @state-danger-text;
@alert-danger-border: @state-danger-border;
@alert-info-bg: @state-info-bg;
@alert-info-text: @state-info-text;
@alert-info-border: @state-info-border;
// Progress bars // Progress bars
// ------------------------- // -------------------------
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment