From 189b12d0319ae8ac7f79fc3e0b4cc7c2d7f11d61 Mon Sep 17 00:00:00 2001 From: Zachary Porter Date: Mon, 11 Jan 2016 12:54:48 -0500 Subject: [PATCH] Add `!default` flag to `$am-theme-error-400` color; release 1.4.1 --- CHANGELOG.md | 4 ++++ app/assets/stylesheets/active_material/values/colors.scss | 2 +- docs/api/index.html | 2 +- lib/active_material/version.rb | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4873119..b5b783f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/app/assets/stylesheets/active_material/values/colors.scss b/app/assets/stylesheets/active_material/values/colors.scss index 43d149c..528f39b 100644 --- a/app/assets/stylesheets/active_material/values/colors.scss +++ b/app/assets/stylesheets/active_material/values/colors.scss @@ -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; diff --git a/docs/api/index.html b/docs/api/index.html index 4d4c126..29a392c 100644 --- a/docs/api/index.html +++ b/docs/api/index.html @@ -1,6 +1,6 @@ SassDoc

colors

variables

am-theme-primary

$am-theme-primary: #009688 !default;

Description

Primary theme color. This is the main admin theme color, showing itself on the main header, buttons, and other elements that command attention. If you want to change the main theme colors, this is the value you want.

am-theme-primary-700

$am-theme-primary-700: #0D3C55 !default;

Description

A darker primary theme color for contrast when overlaying important items containers that are already treated with primary color.

am-theme-accent

$am-theme-accent: #cddc39 !default;

Description

Used for primary action button and components like switches or sliders.

am-theme-error

$am-theme-error: #f44336 !default;

Description

The color treatment of error messages.

am-theme-error-400

$am-theme-error-400: #FF695E;

Description

A lighter treatment for errors to draw contrast to the main error color.

am-theme-backdrop

$am-theme-backdrop: #eeeeee !default;

Description

The background color of the document.

am-theme-paper

$am-theme-paper: white !default;

Description

The background color of Material Design "paper" elements such as cards. And other elements that overlap content.

am-theme-divider

$am-theme-divider: #efefef !default;

Description

The color of tooling lines used to aid the eye when breaking down content.

am-theme-hint-text

$am-theme-hint-text: rgba(black, 0.26) !default;

Description

The text color for hints. Displays itself in helper text under inputs and other guiding copy.

am-theme-secondary-text

$am-theme-secondary-text: rgba(black, 0.54) !default;

Description

A lighter text color for less important content.

am-theme-secondary-text-reverse

$am-theme-secondary-text-reverse: rgba(white, 0.54) !default;

Description

A lighter text color for less important content on dark backgrounds.

am-theme-tertiary-text

$am-theme-tertiary-text: rgba(black, 0.4) !default;

Description

An even lighter text treatment for content less important than secondary text.

am-theme-icon

$am-theme-icon: $am-theme-secondary-text !default;

Description

The default color of icons.

am-theme-text

$am-theme-text: rgba(black, 0.70) !default;

Description

The default color for all text.

am-theme-text-reverse

$am-theme-text-reverse: white !default;

Description

The default color for all text on dark backgrounds.

am-state-focus

Deprecated!
$am-state-focus: rgba(#999, 0.2) !default;

Description

A color for focus states.

am-state-active

Deprecated!
$am-state-active: rgba(#999, 0.4) !default;

Description

A color for active states.

am-state-disabled

Deprecated!
$am-state-disabled: rgba(#999, 0.1) !default;

Description

A color for disabled states.

theme-primary

Deprecated!
$theme-primary: $am-theme-primary !default;

Description

An old variable for primary colors maintained for legacy support on other projects.

theme-divider

Deprecated!
$theme-divider: $am-theme-divider !default;

Description

An old variable for divider colors maintained for legacy support on other projects.

theme-accent

Deprecated!
$theme-accent: $am-theme-accent !default;

Description

An old variable for accent colors maintained for legacy support on other projects.

theme-error

Deprecated!
$theme-error: $am-theme-error !default;

Description

An old variable for error colors maintained for legacy support on other projects.

datepicker

variables

am-datepicker-width

$am-datepicker-width: am-unit(35) !default;

Description

The width of the datepicker.

am-datepicker-shadow

$am-datepicker-shadow: (0 1px 2px rgba(#000, 0.25), 0 -1px 1px rgba(#000, 0.12)) !default;

Description

The shadow cast below the datepicker.

am-datepicker-border-radius

$am-datepicker-border-radius: 2px !default;

Description

The border radius of the picker.

am-datepicker-cell-size

$am-datepicker-cell-size: am-unit(4) !default;

Description

The size of an individual cell in the calendar. Square.

fonts

variables

am-font-sans

$am-font-sans: 'RobotoDraft', sans-serif !default;

Description

The default sans-serif font

menu

variables

am-menu-background

$am-menu-background: #fff !default;

Description

Background color of the menu

am-menu-border-radius

$am-menu-border-radius: 2px !default;

Description

Border radious of the menu

am-menu-offset-x

$am-menu-offset-x: 0 !default;

Description

X-axis offset of opened menu

am-menu-offset-y

$am-menu-offset-y: am-unit(4) !default;

Description

Y-axis offset of opened menu

am-menu-padding

$am-menu-padding: am-unit(1) !default;

Description

Padding of opened menu's container

am-menu-item-padding

$am-menu-item-padding: am-type-unit(1) am-unit(2) !default;

Description

Padding of individual menu items

am-menu-transition

$am-menu-transition: 0.2s !default;

Description

Transition time of menu opening

am-menu-transition-delay

$am-menu-transition-delay: 0.2s !default;

Description

Transition delay when a menu opens

am-menu-min-width

$am-menu-min-width: am-unit(14) !default;

Description

Minimum allowable width of menu

am-menu-breakpoint

$am-menu-breakpoint: 1300px !default;

Description

Desktop breakpoint

am-menu-carat-size

$am-menu-carat-size: 5px !default;

Description

The size of the dropdown carot that displays next to the menu toggle

sortable

variables

am-sortable-icon

$am-sortable-icon: asset-url("active_material/icons/reorder.svg") !default;

Description

The icon displayed within a sortable element's drag handle

textfield

variables

am-textfield-input-type

$am-textfield-input-type: normal am-sp(14)/24px $am-font-sans !default;

Description

Textfield input typography.

am-textfield-label-type

$am-textfield-label-type: 400 am-sp(12)/am-unit(2) $am-font-sans !default;

Description

Textfield label typography.

am-textfield-margin

$am-textfield-margin: am-unit(1) 0 !default;

Description

Textfield margin.

am-textfield-padding

$am-textfield-padding: am-unit(1) am-unit(2) !default;

Description

Textfield padding.

am-textfield-error-color

$am-textfield-error-color: $am-theme-error !default;

Description

Textfield error color.

am-textfield-color

$am-textfield-color: rgba(#000, 0.70) !default;

Description

Textfield color.

am-textfield-primary

$am-textfield-primary: am-color(primary) !default;

Description

Textfield highlight color.

am-textfield-email-icon

$am-textfield-email-icon: asset-url("active_material/icons/email.svg") !default;

Description

Icon for email fields.

am-textfield-password-icon

$am-textfield-password-icon: asset-url("active_material/icons/secret.svg") !default;

Description

Icon for password fields.

am-textfield-date-icon

$am-textfield-date-icon: asset-url("active_material/icons/event.svg") !default;

Description

Icon for date fields.

General

mixins

am-clearfix

/// Applies rules for subheader text. @mixin am-type-subheader

colors

variables

am-theme-primary

$am-theme-primary: #009688 !default;

Description

Primary theme color. This is the main admin theme color, showing itself on the main header, buttons, and other elements that command attention. If you want to change the main theme colors, this is the value you want.

am-theme-primary-700

$am-theme-primary-700: #0D3C55 !default;

Description

A darker primary theme color for contrast when overlaying important items containers that are already treated with primary color.

am-theme-accent

$am-theme-accent: #cddc39 !default;

Description

Used for primary action button and components like switches or sliders.

am-theme-error

$am-theme-error: #f44336 !default;

Description

The color treatment of error messages.

am-theme-error-400

$am-theme-error-400: #FF695E !default;

Description

A lighter treatment for errors to draw contrast to the main error color.

am-theme-backdrop

$am-theme-backdrop: #eeeeee !default;

Description

The background color of the document.

am-theme-paper

$am-theme-paper: white !default;

Description

The background color of Material Design "paper" elements such as cards. And other elements that overlap content.

am-theme-divider

$am-theme-divider: #efefef !default;

Description

The color of tooling lines used to aid the eye when breaking down content.

am-theme-hint-text

$am-theme-hint-text: rgba(black, 0.26) !default;

Description

The text color for hints. Displays itself in helper text under inputs and other guiding copy.

am-theme-secondary-text

$am-theme-secondary-text: rgba(black, 0.54) !default;

Description

A lighter text color for less important content.

am-theme-secondary-text-reverse

$am-theme-secondary-text-reverse: rgba(white, 0.54) !default;

Description

A lighter text color for less important content on dark backgrounds.

am-theme-tertiary-text

$am-theme-tertiary-text: rgba(black, 0.4) !default;

Description

An even lighter text treatment for content less important than secondary text.

am-theme-icon

$am-theme-icon: $am-theme-secondary-text !default;

Description

The default color of icons.

am-theme-text

$am-theme-text: rgba(black, 0.70) !default;

Description

The default color for all text.

am-theme-text-reverse

$am-theme-text-reverse: white !default;

Description

The default color for all text on dark backgrounds.

am-state-focus

Deprecated!
$am-state-focus: rgba(#999, 0.2) !default;

Description

A color for focus states.

am-state-active

Deprecated!
$am-state-active: rgba(#999, 0.4) !default;

Description

A color for active states.

am-state-disabled

Deprecated!
$am-state-disabled: rgba(#999, 0.1) !default;

Description

A color for disabled states.

theme-primary

Deprecated!
$theme-primary: $am-theme-primary !default;

Description

An old variable for primary colors maintained for legacy support on other projects.

theme-divider

Deprecated!
$theme-divider: $am-theme-divider !default;

Description

An old variable for divider colors maintained for legacy support on other projects.

theme-accent

Deprecated!
$theme-accent: $am-theme-accent !default;

Description

An old variable for accent colors maintained for legacy support on other projects.

theme-error

Deprecated!
$theme-error: $am-theme-error !default;

Description

An old variable for error colors maintained for legacy support on other projects.

datepicker

variables

am-datepicker-width

$am-datepicker-width: am-unit(35) !default;

Description

The width of the datepicker.

am-datepicker-shadow

$am-datepicker-shadow: (0 1px 2px rgba(#000, 0.25), 0 -1px 1px rgba(#000, 0.12)) !default;

Description

The shadow cast below the datepicker.

am-datepicker-border-radius

$am-datepicker-border-radius: 2px !default;

Description

The border radius of the picker.

am-datepicker-cell-size

$am-datepicker-cell-size: am-unit(4) !default;

Description

The size of an individual cell in the calendar. Square.

fonts

variables

am-font-sans

$am-font-sans: 'RobotoDraft', sans-serif !default;

Description

The default sans-serif font

menu

variables

am-menu-background

$am-menu-background: #fff !default;

Description

Background color of the menu

am-menu-border-radius

$am-menu-border-radius: 2px !default;

Description

Border radious of the menu

am-menu-offset-x

$am-menu-offset-x: 0 !default;

Description

X-axis offset of opened menu

am-menu-offset-y

$am-menu-offset-y: am-unit(4) !default;

Description

Y-axis offset of opened menu

am-menu-padding

$am-menu-padding: am-unit(1) !default;

Description

Padding of opened menu's container

am-menu-item-padding

$am-menu-item-padding: am-type-unit(1) am-unit(2) !default;

Description

Padding of individual menu items

am-menu-transition

$am-menu-transition: 0.2s !default;

Description

Transition time of menu opening

am-menu-transition-delay

$am-menu-transition-delay: 0.2s !default;

Description

Transition delay when a menu opens

am-menu-min-width

$am-menu-min-width: am-unit(14) !default;

Description

Minimum allowable width of menu

am-menu-breakpoint

$am-menu-breakpoint: 1300px !default;

Description

Desktop breakpoint

am-menu-carat-size

$am-menu-carat-size: 5px !default;

Description

The size of the dropdown carot that displays next to the menu toggle

sortable

variables

am-sortable-icon

$am-sortable-icon: asset-url("active_material/icons/reorder.svg") !default;

Description

The icon displayed within a sortable element's drag handle

textfield

variables

am-textfield-input-type

$am-textfield-input-type: normal am-sp(14)/24px $am-font-sans !default;

Description

Textfield input typography.

am-textfield-label-type

$am-textfield-label-type: 400 am-sp(12)/am-unit(2) $am-font-sans !default;

Description

Textfield label typography.

am-textfield-margin

$am-textfield-margin: am-unit(1) 0 !default;

Description

Textfield margin.

am-textfield-padding

$am-textfield-padding: am-unit(1) am-unit(2) !default;

Description

Textfield padding.

am-textfield-error-color

$am-textfield-error-color: $am-theme-error !default;

Description

Textfield error color.

am-textfield-color

$am-textfield-color: rgba(#000, 0.70) !default;

Description

Textfield color.

am-textfield-primary

$am-textfield-primary: am-color(primary) !default;

Description

Textfield highlight color.

am-textfield-email-icon

$am-textfield-email-icon: asset-url("active_material/icons/email.svg") !default;

Description

Icon for email fields.

am-textfield-password-icon

$am-textfield-password-icon: asset-url("active_material/icons/secret.svg") !default;

Description

Icon for password fields.

am-textfield-date-icon

$am-textfield-date-icon: asset-url("active_material/icons/event.svg") !default;

Description

Icon for date fields.

General

mixins

am-clearfix