Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(alert): add sass variables for checkbox and radio button text color #10331

Merged
merged 6 commits into from
Feb 10, 2017
Merged

feat(alert): add sass variables for checkbox and radio button text color #10331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ba020a
feat(alert): add sass variables for checkbox and radio button text color
alan-agius4 Feb 6, 2017
6deb34d
style(alert): remove extra spaces
alan-agius4 Feb 6, 2017
8439886
Replace initial value with `initial` instead of `null`
alan-agius4 Feb 10, 2017
2b1bd67
Remove submodule
alan-agius4 Feb 10, 2017
260c209
fix ios variable usage
alan-agius4 Feb 10, 2017
f414ca1
style(alert wp): remove whitespace
alan-agius4 Feb 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/components/alert/alert.ios.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ $alert-ios-list-border-top: $alert-ios-button-border-width $
/// @prop - Padding on the label for the radio alert
$alert-ios-radio-label-padding: 13px !default;

/// @prop - Text color of the label for the radio alert
$alert-ios-radio-label-text-color: initial !default;

/// @prop - Text color of the label for the checked radio alert
$alert-ios-radio-label-text-color-checked: $alert-ios-button-text-color !default;

Expand Down Expand Up @@ -153,6 +156,9 @@ $alert-ios-radio-icon-transform: rotate(45deg) !default;
/// @prop - Padding of the label for the checkbox in the alert
$alert-ios-checkbox-label-padding: 13px !default;

/// @prop - Text color of the label for the checkbox in the alert
$alert-ios-checkbox-label-text-color: initial !default;

/// @prop - Text color of the label for the checked checkbox in the alert
$alert-ios-checkbox-label-text-color-checked: initial !default;

Expand Down Expand Up @@ -314,6 +320,8 @@ $alert-ios-checkbox-icon-transform: rotate(45deg) !default;

text-overflow: ellipsis;
white-space: nowrap;

color: $alert-ios-radio-label-text-color;
}


Expand Down Expand Up @@ -369,6 +377,8 @@ $alert-ios-checkbox-icon-transform: rotate(45deg) !default;

text-overflow: ellipsis;
white-space: nowrap;

color: $alert-ios-checkbox-label-text-color;
}

.alert-ios [aria-checked=true] .alert-checkbox-label {
Expand Down
12 changes: 11 additions & 1 deletion src/components/alert/alert.md.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ $alert-md-list-border-bottom: $alert-md-list-border-top !default
/// @prop - Padding on the label for the radio alert
$alert-md-radio-label-padding: 13px 26px !default;

/// @prop - Text color of the label for the radio alert
$alert-md-radio-label-text-color: initial !default;

/// @prop - Text color of the label for the checked radio alert
$alert-md-radio-label-text-color-checked: $alert-md-button-text-color !default;

Expand Down Expand Up @@ -181,7 +184,10 @@ $alert-md-radio-icon-transition: transform 280ms cubic-bezier(.4, 0
/// @prop - Padding of the label for the checkbox in the alert
$alert-md-checkbox-label-padding: 13px 26px !default;

/// @prop - Text color of the label for the checked checkbox in the alert
/// @prop - Text color of the label for the checkbox in the alert
$alert-md-checkbox-label-text-color: initial !default;

/// @prop - Text color of the label for the checked checkbox in the alert
$alert-md-checkbox-label-text-color-checked: initial !default;


Expand Down Expand Up @@ -339,6 +345,8 @@ $alert-md-checkbox-icon-transform: rotate(45deg) !default;

text-overflow: ellipsis;
white-space: nowrap;

color: $alert-md-radio-label-text-color;
}

// Material Design Alert Radio Unchecked Circle
Expand Down Expand Up @@ -405,6 +413,8 @@ $alert-md-checkbox-icon-transform: rotate(45deg) !default;

text-overflow: ellipsis;
white-space: nowrap;

color: $alert-md-checkbox-label-text-color;
}

.alert-md [aria-checked=true] .alert-checkbox-label {
Expand Down
10 changes: 10 additions & 0 deletions src/components/alert/alert.wp.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ $alert-wp-radio-border-color: $input-wp-border-color !default;
/// @prop - Padding of the label for the radio alert
$alert-wp-radio-label-padding: 13px 26px !default;

/// @prop - Text color of the label for the radio alert
$alert-wp-radio-label-text-color: initial !default;

/// @prop - Text color of the label for the checked radio alert
$alert-wp-radio-label-text-color-checked: $alert-wp-button-text-color !default;

Expand Down Expand Up @@ -175,6 +178,9 @@ $alert-wp-radio-icon-border-radius: $alert-wp-radio-border-radius !de
/// @prop - Padding of the label for the checkbox in the alert
$alert-wp-checkbox-label-padding: 13px 26px !default;

/// @prop - Text color of the label for the checkbox in the alert
$alert-wp-checkbox-label-text-color: initial !default;

/// @prop - Text color of the label for the checked checkbox in the alert
$alert-wp-checkbox-label-text-color-checked: initial !default;

Expand Down Expand Up @@ -337,6 +343,8 @@ $alert-wp-checkbox-icon-transform: rotate(45deg) !default;

text-overflow: ellipsis;
white-space: nowrap;

color: $alert-wp-radio-label-text-color;
}

// Windows Alert Radio Unchecked Circle
Expand Down Expand Up @@ -403,6 +411,8 @@ $alert-wp-checkbox-icon-transform: rotate(45deg) !default;

text-overflow: ellipsis;
white-space: nowrap;

color: $alert-wp-checkbox-label-text-color;
}

.alert-wp [aria-checked=true] .alert-checkbox-label {
Expand Down