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

Use margin variable #11980

Merged
merged 2 commits into from
Jun 12, 2017
Merged

Use margin variable #11980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3a9de9
Use margin variable
trumbitta Jun 8, 2017
e62fd3f
feat(loading): add sass variable to override content margin
trumbitta Jun 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
5 changes: 4 additions & 1 deletion src/components/loading/loading.ios.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ $loading-ios-background: #f8f8f8 !default;
/// @prop - Font weight of the loading content
$loading-ios-content-font-weight: bold !default;

/// @prop - Margin start of the loading content next to a spinner
$loading-ios-content-margin-start: $content-ios-margin !default;

/// @prop - Color of the loading spinner
$loading-ios-spinner-color: #69717d !default;

Expand Down Expand Up @@ -78,7 +81,7 @@ $loading-ios-spinner-dots-color: $loading-ios-spinner-color !default;
}

.loading-ios .loading-spinner + .loading-content {
@include margin-horizontal(16px, null);
@include margin-horizontal($loading-ios-content-margin-start, null);
}


Expand Down
5 changes: 4 additions & 1 deletion src/components/loading/loading.md.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ $loading-md-box-shadow-color: rgba(0, 0, 0, .4) !default;
/// @prop - Box shadow of the loading wrapper
$loading-md-box-shadow: 0 16px 20px $loading-md-box-shadow-color !default;

/// @prop - Margin start of the loading content next to a spinner
$loading-md-content-margin-start: $content-md-margin !default;

/// @prop - Color of the loading spinner
$loading-md-spinner-color: color($colors-md, primary) !default;

Expand Down Expand Up @@ -79,7 +82,7 @@ $loading-md-spinner-dots-color: $loading-md-spinner-color !default;
// -----------------------------------------

.loading-md .loading-spinner + .loading-content {
@include margin-horizontal(16px, null);
@include margin-horizontal($loading-md-content-margin-start, null);
}


Expand Down
5 changes: 4 additions & 1 deletion src/components/loading/loading.wp.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ $loading-wp-text-color: #fff !default;
/// @prop - Background of the loading wrapper
$loading-wp-background: #000 !default;

/// @prop - Margin start of the loading content next to a spinner
$loading-wp-content-margin-start: $content-wp-margin !default;

/// @prop - Color of the loading spinner
$loading-wp-spinner-color: $loading-wp-text-color !default;

Expand Down Expand Up @@ -71,7 +74,7 @@ $loading-wp-spinner-dots-color: $loading-wp-spinner-color !default;
// -----------------------------------------

.loading-wp .loading-spinner + .loading-content {
@include margin-horizontal(16px, null);
@include margin-horizontal($loading-wp-content-margin-start, null);
}


Expand Down