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

fix(): allow overriding variables #11779

Merged
merged 19 commits into from
May 26, 2017
Merged

fix(): allow overriding variables #11779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e1c521c
fix(card): allow overriding variables
Manduro May 24, 2017
7f414c1
fix(card): allow overriding variables
Manduro May 24, 2017
39ed33d
fix(alert): allow overriding variables
Manduro May 24, 2017
9027e13
fix(card): allow overriding variables
Manduro May 24, 2017
7a42e8b
fix(datetime): allow overriding variables
Manduro May 24, 2017
c5ab803
fix(datetime): allow overriding variables
Manduro May 24, 2017
5b0e160
fix(datetime): allow overriding variables
Manduro May 24, 2017
174a552
fix(input): allow overriding variables
Manduro May 24, 2017
1d6f2c9
fix(list): allow overriding variables
Manduro May 24, 2017
44b1ce3
fix(list): allow overriding variables
Manduro May 24, 2017
9e63f27
fix(list): allow overriding variables
Manduro May 24, 2017
a730175
fix(select): allow overriding variables
Manduro May 24, 2017
9bb2b49
fix(select): allow overriding variables
Manduro May 24, 2017
0029be2
fix(theme): allow overriding variables
Manduro May 24, 2017
65889bc
fix(theme): allow overriding variables
Manduro May 24, 2017
86cf70a
fix(theme): allow overriding variables
Manduro May 24, 2017
34f44f8
fix(theme): allow overriding variables
Manduro May 24, 2017
10f7c0b
fix(theme): allow overriding variables
Manduro May 24, 2017
867481f
fix(theme): allow overriding variables
Manduro May 24, 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
2 changes: 1 addition & 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 @@ -117,7 +117,7 @@ $alert-md-input-margin-bottom: 5px !default;
// deprecated
$alert-md-input-margin-left: 0 !default;
/// @prop - Margin start of the alert input
$alert-md-input-margin-start: $alert-md-input-margin-left;
$alert-md-input-margin-start: $alert-md-input-margin-left !default;

/// @prop - Flex wrap of the alert button group
$alert-md-button-group-flex-wrap: wrap-reverse !default;
Expand Down
6 changes: 3 additions & 3 deletions src/components/card/card.ios.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ $card-ios-margin-bottom: 12px !default;
// deprecated
$card-ios-margin-left: 12px !default;
/// @prop - Margin start of the card
$card-ios-margin-start: $card-ios-margin-left;
$card-ios-margin-start: $card-ios-margin-left !default;

/// @prop - Padding top of the card
$card-ios-padding-top: 13px !default;

// deprecated
$card-ios-padding-right: 16px !default;
/// @prop - Padding end of the card
$card-ios-padding-end: $card-ios-padding-right;
$card-ios-padding-end: $card-ios-padding-right !default;

/// @prop - Padding bottom of the card
$card-ios-padding-bottom: 14px !default;

// deprecated
$card-ios-padding-left: 16px !default;
/// @prop - Padding start of the card
$card-ios-padding-start: $card-ios-padding-left;
$card-ios-padding-start: $card-ios-padding-left !default;

/// @prop - Padding top of the media on the card
$card-ios-padding-media-top: 10px !default;
Expand Down
6 changes: 3 additions & 3 deletions src/components/card/card.md.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ $card-md-margin-bottom: 10px !default;
// deprecated
$card-md-margin-left: 10px !default;
/// @prop - Margin start of the card
$card-md-margin-start: $card-md-margin-left;
$card-md-margin-start: $card-md-margin-left !default;


/// @prop - Padding top of the card
Expand All @@ -26,15 +26,15 @@ $card-md-padding-top: 13px !default;
// deprecated
$card-md-padding-right: 16px !default;
/// @prop - Padding right of the card
$card-md-padding-end: $card-md-padding-right;
$card-md-padding-end: $card-md-padding-right !default;

/// @prop - Padding bottom of the card
$card-md-padding-bottom: 13px !default;

// deprecated
$card-md-padding-left: 16px !default;
/// @prop - Padding start of the card
$card-md-padding-start: $card-md-padding-left;
$card-md-padding-start: $card-md-padding-left !default;

/// @prop - Padding top of the media on the card
$card-md-padding-media-top: 10px !default;
Expand Down
6 changes: 3 additions & 3 deletions src/components/card/card.wp.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ $card-wp-margin-bottom: 8px !default;
// deprecated
$card-wp-margin-left: 8px !default;
/// @prop - Margin start of the card
$card-wp-margin-start: $card-wp-margin-left;
$card-wp-margin-start: $card-wp-margin-left !default;

/// @prop - Padding top of the card
$card-wp-padding-top: 13px !default;

// deprecated
$card-wp-padding-right: 16px !default;
/// @prop - Padding end of the card
$card-wp-padding-end: $card-wp-padding-right;
$card-wp-padding-end: $card-wp-padding-right !default;

/// @prop - Padding bottom of the card
$card-wp-padding-bottom: 13px !default;

// deprecated
$card-wp-padding-left: 16px !default;
/// @prop - Padding start of the card
$card-wp-padding-start: $card-wp-padding-left;
$card-wp-padding-start: $card-wp-padding-left !default;

/// @prop - Padding top of the media on the card
$card-wp-padding-media-top: 10px !default;
Expand Down
4 changes: 2 additions & 2 deletions src/components/datetime/datetime.ios.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ $datetime-ios-padding-top: $item-ios-padding-top !default;
// deprecated
$datetime-ios-padding-right: ($item-ios-padding-end / 2) !default;
/// @prop - Padding end of the DateTime component
$datetime-ios-padding-end: $datetime-ios-padding-right;
$datetime-ios-padding-end: $datetime-ios-padding-right !default;

/// @prop - Padding bottom of the DateTime component
$datetime-ios-padding-bottom: $item-ios-padding-bottom !default;

// deprecated
$datetime-ios-padding-left: $item-ios-padding-start !default;
/// @prop - Padding start of the DateTime component
$datetime-ios-padding-start: $datetime-ios-padding-left;
$datetime-ios-padding-start: $datetime-ios-padding-left !default;

/// @prop - Color of the DateTime placeholder
$datetime-ios-placeholder-color: #999 !default;
Expand Down
4 changes: 2 additions & 2 deletions src/components/datetime/datetime.md.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ $datetime-md-padding-top: $item-md-padding-top !default;
// deprecated
$datetime-md-padding-right: ($item-md-padding-end / 2) !default;
/// @prop - Padding end of the DateTime component
$datetime-md-padding-end: $datetime-md-padding-right;
$datetime-md-padding-end: $datetime-md-padding-right !default;

/// @prop - Padding bottom of the DateTime component
$datetime-md-padding-bottom: $item-md-padding-bottom !default;

// deprecated
$datetime-md-padding-left: $item-md-padding-start !default;
/// @prop - Padding start of the DateTime component
$datetime-md-padding-start: $datetime-md-padding-left;
$datetime-md-padding-start: $datetime-md-padding-left !default;

/// @prop - Color of the DateTime placeholder
$datetime-md-placeholder-color: #999 !default;
Expand Down
4 changes: 2 additions & 2 deletions src/components/datetime/datetime.wp.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ $datetime-wp-padding-top: $item-wp-padding-top !default;
// deprecated
$datetime-wp-padding-right: ($item-wp-padding-end / 2) !default;
/// @prop - Padding end of the DateTime component
$datetime-wp-padding-end: $datetime-wp-padding-right;
$datetime-wp-padding-end: $datetime-wp-padding-right !default;

/// @prop - Padding bottom of the DateTime component
$datetime-wp-padding-bottom: $item-wp-padding-bottom !default;

// deprecated
$datetime-wp-padding-left: $item-wp-padding-start !default;
/// @prop - Padding start of the DateTime component
$datetime-wp-padding-start: $datetime-wp-padding-left;
$datetime-wp-padding-start: $datetime-wp-padding-left !default;

/// @prop - Border width of the DateTime component
$datetime-wp-border-width: 2px !default;
Expand Down
2 changes: 1 addition & 1 deletion src/components/input/input.ios.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $text-input-ios-margin-bottom: $item-ios-padding-bottom !default;
// deprecated
$text-input-ios-margin-left: 0 !default;
/// @prop - Margin start of the input
$text-input-ios-margin-start: $text-input-ios-margin-left;
$text-input-ios-margin-start: $text-input-ios-margin-left !default;

/// @prop - Width of the icon used to clear the input
$text-input-ios-input-clear-icon-width: 30px !default;
Expand Down
2 changes: 1 addition & 1 deletion src/components/list/list.ios.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $list-inset-ios-border-radius: 4px !default;
// deprecated
$list-ios-header-padding-left: $item-ios-padding-start !default;
/// @prop - Padding start of the header in a list
$list-ios-header-padding-start: $list-ios-header-padding-left;
$list-ios-header-padding-start: $list-ios-header-padding-left !default;

/// @prop - Border bottom of the header in a list
$list-ios-header-border-bottom: $hairlines-width solid $list-ios-border-color !default;
Expand Down
2 changes: 1 addition & 1 deletion src/components/list/list.md.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ $list-md-header-margin-bottom: 13px !default;
// deprecated
$list-md-header-padding-left: $item-md-padding-start !default;
/// @prop - Padding start of the header in a list
$list-md-header-padding-start: $list-md-header-padding-left;
$list-md-header-padding-start: $list-md-header-padding-left !default;

/// @prop - Minimum height of the header in a list
$list-md-header-min-height: 4.5rem !default;
Expand Down
2 changes: 1 addition & 1 deletion src/components/list/list.wp.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $list-inset-wp-border-radius: 2px !default;
// deprecated
$list-wp-header-padding-left: $item-wp-padding-start !default;
/// @prop - Padding start of the header in a list
$list-wp-header-padding-start: $list-wp-header-padding-left;
$list-wp-header-padding-start: $list-wp-header-padding-left !default;

/// @prop - Border bottom of the header in a list
$list-wp-header-border-bottom: 1px solid $list-wp-border-color !default;
Expand Down
4 changes: 2 additions & 2 deletions src/components/select/select.ios.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ $select-ios-padding-top: $item-ios-padding-top !default;
// deprecated
$select-ios-padding-right: ($item-ios-padding-end / 2) !default;
/// @prop - Padding end of the select
$select-ios-padding-end: $select-ios-padding-right;
$select-ios-padding-end: $select-ios-padding-right !default;

/// @prop - Padding bottom of the select
$select-ios-padding-bottom: $item-ios-padding-bottom !default;

// deprecated
$select-ios-padding-left: $item-ios-padding-start !default;
/// @prop - Padding start of the select
$select-ios-padding-start: $select-ios-padding-left;
$select-ios-padding-start: $select-ios-padding-left !default;

/// @prop - Color of the select icon
$select-ios-icon-color: #999 !default;
Expand Down
4 changes: 2 additions & 2 deletions src/components/select/select.md.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ $select-md-padding-top: $item-md-padding-top !default;
// deprecated
$select-md-padding-right: ($item-md-padding-end / 2) !default;
/// @prop - Padding end of the select
$select-md-padding-end: $select-md-padding-right;
$select-md-padding-end: $select-md-padding-right !default;

/// @prop - Padding bottom of the select
$select-md-padding-bottom: $item-md-padding-bottom !default;

// deprecated
$select-md-padding-left: $item-md-padding-start !default;
/// @prop - Padding start of the select
$select-md-padding-start: $select-md-padding-left;
$select-md-padding-start: $select-md-padding-left !default;

/// @prop - Color of the select icon
$select-md-icon-color: #999 !default;
Expand Down
4 changes: 2 additions & 2 deletions src/themes/ionic.theme.dark.ios.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ $item-ios-divider-color: $text-color !default;
$item-ios-padding-top: 11px !default;
// deprecated
$item-ios-padding-right: 16px !default;
$item-ios-padding-end: $item-ios-padding-right;
$item-ios-padding-end: $item-ios-padding-right !default;
$item-ios-padding-bottom: 11px !default;
// deprecated
$item-ios-padding-left: 16px !default;
$item-ios-padding-start: $item-ios-padding-left;
$item-ios-padding-start: $item-ios-padding-left !default;
$item-ios-padding-media-top: 10px !default;
$item-ios-padding-media-bottom: 10px !default;
$item-ios-padding-icon-top: 9px !default;
Expand Down
4 changes: 2 additions & 2 deletions src/themes/ionic.theme.dark.md.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ $list-md-activated-background-color: #d9d9d9 !default;
$item-md-padding-top: 13px !default;
// deprecated
$item-md-padding-right: 16px !default;
$item-md-padding-end: $item-md-padding-right;
$item-md-padding-end: $item-md-padding-right !default;
$item-md-padding-bottom: 13px !default;
// deprecated
$item-md-padding-left: 16px !default;
$item-md-padding-start: $item-md-padding-left;
$item-md-padding-start: $item-md-padding-left !default;
$item-md-padding-media-top: 9px !default;
$item-md-padding-media-bottom: 9px !default;
$item-md-padding-icon-top: 11px !default;
Expand Down
4 changes: 2 additions & 2 deletions src/themes/ionic.theme.dark.wp.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ $list-wp-activated-background-color: #d9d9d9 !default;
$item-wp-padding-top: 13px !default;
// deprecated
$item-wp-padding-right: 16px !default;
$item-wp-padding-end: $item-wp-padding-right;
$item-wp-padding-end: $item-wp-padding-right !default;
$item-wp-padding-bottom: 13px !default;
// deprecated
$item-wp-padding-left: 16px !default;
$item-wp-padding-start: $item-wp-padding-left;
$item-wp-padding-start: $item-wp-padding-left !default;
$item-wp-padding-media-top: 9px !default;
$item-wp-padding-media-bottom: 9px !default;
$item-wp-padding-icon-top: 11px !default;
Expand Down
4 changes: 2 additions & 2 deletions src/themes/ionic.theme.default.ios.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ $list-ios-activated-background-color: #d9d9d9 !default;
$item-ios-padding-top: 11px !default;
// deprecated
$item-ios-padding-right: 16px !default;
$item-ios-padding-end: $item-ios-padding-right;
$item-ios-padding-end: $item-ios-padding-right !default;
$item-ios-padding-bottom: 11px !default;
// deprecated
$item-ios-padding-left: 16px !default;
$item-ios-padding-start: $item-ios-padding-left;
$item-ios-padding-start: $item-ios-padding-left !default;
$item-ios-padding-media-top: 8px !default;
$item-ios-padding-media-bottom: 8px !default;
$item-ios-padding-icon-top: 9px !default;
Expand Down
4 changes: 2 additions & 2 deletions src/themes/ionic.theme.default.md.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ $list-md-activated-background-color: #f1f1f1 !default;
$item-md-padding-top: 13px !default;
// deprecated
$item-md-padding-right: 16px !default;
$item-md-padding-end: $item-md-padding-right;
$item-md-padding-end: $item-md-padding-right !default;
$item-md-padding-bottom: 13px !default;
// deprecated
$item-md-padding-left: 16px !default;
$item-md-padding-start: $item-md-padding-left;
$item-md-padding-start: $item-md-padding-left !default;
$item-md-padding-media-top: 9px !default;
$item-md-padding-media-bottom: 9px !default;
$item-md-padding-icon-top: 11px !default;
Expand Down
4 changes: 2 additions & 2 deletions src/themes/ionic.theme.default.wp.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ $list-wp-activated-background-color: #aaa !default;
$item-wp-padding-top: 13px !default;
// deprecated
$item-wp-padding-right: 16px !default;
$item-wp-padding-end: $item-wp-padding-right;
$item-wp-padding-end: $item-wp-padding-right !default;
$item-wp-padding-bottom: 13px !default;
// deprecated
$item-wp-padding-left: 16px !default;
$item-wp-padding-start: $item-wp-padding-left;
$item-wp-padding-start: $item-wp-padding-left !default;
$item-wp-padding-media-top: 9px !default;
$item-wp-padding-media-bottom: 9px !default;
$item-wp-padding-icon-top: 11px !default;
Expand Down