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(label): RTL fix for label margin #11330

Closed
wants to merge 4 commits into from
Closed

fix(label): RTL fix for label margin #11330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b49a2f
fix(label): RTL fix for label margin
sijav Apr 23, 2017
3741676
refactor(label): add prop of margin of the label
sijav Apr 23, 2017
388d5b4
refactor(label): align with rest of the variable
sijav Apr 23, 2017
66ab321
add some missing margin rules for RTL
sijav Apr 25, 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
14 changes: 14 additions & 0 deletions src/components/label/label.ios.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
/// @prop - Margin of the label
$label-ios-margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0 !default;

/// @prop - Margin of the label for RTL
$label-ios-margin-rtl: $item-ios-padding-top 0 $item-ios-padding-bottom ($item-ios-padding-right / 2) !default;


// iOS Default Label
// --------------------------------------------------
Expand All @@ -14,6 +17,10 @@ $label-ios-margin: $item-ios-padding-top ($item-ios-padding-right /
margin: $label-ios-margin;
}

[dir="rtl"] .label-ios {
margin: $label-ios-margin-rtl;
}


// iOS Default Label Inside An Input/Select Item
// --------------------------------------------------
Expand All @@ -26,6 +33,13 @@ $label-ios-margin: $item-ios-padding-top ($item-ios-padding-right /
width: calc(100% - (#{$item-ios-padding-right} / 2) - #{$item-ios-padding-left});
}

[dir="rtl"] .label-ios + ion-input .text-input,
[dir="rtl"] .label-ios + ion-textarea .text-input,
[dir="rtl"] .label-ios + .input + .cloned-input {
margin-right: $item-ios-padding-left;
margin-left: 0;
}


// iOS Stacked & Floating Labels
// --------------------------------------------------
Expand Down
13 changes: 13 additions & 0 deletions src/components/label/label.md.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ $label-md-text-color-focused: color($colors-md, primary) !default;
/// @prop - Margin of the label
$label-md-margin: $item-md-padding-top ($item-md-padding-right / 2) $item-md-padding-bottom 0 !default;

/// @prop - Margin of the label for RTL
$label-md-margin-rtl: $item-md-padding-top 0 $item-md-padding-bottom ($item-md-padding-right / 2) !default;


// Material Design Default Label
// --------------------------------------------------
Expand All @@ -20,6 +23,10 @@ $label-md-margin: $item-md-padding-top ($item-md-padding-rig
margin: $label-md-margin;
}

[dir="rtl"] .label-md {
margin: $label-md-margin-rtl;
}

[text-wrap] .label-md {
font-size: $item-md-body-text-font-size;
line-height: $item-md-body-text-line-height;
Expand Down Expand Up @@ -54,6 +61,12 @@ $label-md-margin: $item-md-padding-top ($item-md-padding-rig
margin-left: 0;
}

[dir="rtl"] .label-md[stacked],
[dir="rtl"] .label-md[floating] {
margin-right: 0;
margin-left: ($item-md-padding-right / 2);
}

.input-has-focus .label-md[stacked],
.input-has-focus .label-md[floating] {
color: $label-md-text-color-focused;
Expand Down
18 changes: 17 additions & 1 deletion src/components/label/label.wp.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,22 @@ $label-wp-text-color: #999 !default;
/// @prop - Text color of the label when it has focused
$label-wp-text-color-focused: color($colors-wp, primary) !default;

/// @prop - Margin of the label
$label-wp-margin: $item-wp-padding-top ($item-wp-padding-right / 2) $item-wp-padding-bottom 0 !default;

/// @prop - Margin of the label for RTL
$label-wp-margin-rtl: $item-wp-padding-top 0 $item-wp-padding-bottom ($item-wp-padding-right / 2) !default;


// Windows Default Label
// --------------------------------------------------

.label-wp {
margin: $item-wp-padding-top ($item-wp-padding-right / 2) $item-wp-padding-bottom 0;
margin: $label-wp-margin;
}

[dir="rtl"] .label-wp {
margin: $label-wp-margin-rtl;
}


Expand Down Expand Up @@ -46,6 +56,12 @@ $label-wp-text-color-focused: color($colors-wp, primary) !default;
margin-left: 0;
}

[dir="rtl"] .label-wp[stacked],
[dir="rtl"] .label-wp[floating] {
margin-right: 0;
margin-left: ($item-wp-padding-right / 2);
}

.input-has-focus .label-wp[stacked],
.input-has-focus .label-wp[floating] {
color: $label-wp-text-color-focused;
Expand Down