Skip to content

Commit

Permalink
Add !default flag to $am-theme-error-400 color; release 1.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
zporter committed Jan 11, 2016
1 parent d0e1bea commit 189b12d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 1.4.1

- Add `!default` flag to `$am-theme-error-400` color

## 1.4.0

- Enhance dialog styles. These are viewable when conducting batch operations
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/active_material/values/colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $am-theme-accent: #cddc39 !default;
$am-theme-error: #f44336 !default;

/// A lighter treatment for errors to draw contrast to the main error color.
$am-theme-error-400: #FF695E;
$am-theme-error-400: #FF695E !default;

/// The background color of the document.
$am-theme-backdrop: #eeeeee !default;
Expand Down
2 changes: 1 addition & 1 deletion docs/api/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/active_material/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module ActiveMaterial
VERSION = "1.4.0"
VERSION = "1.4.1"
end

0 comments on commit 189b12d

Please sign in to comment.