Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

fix(): refactor rtl-prop mixin to add less CSS #9218

Closed
wants to merge 1 commit into from
Closed

fix(): refactor rtl-prop mixin to add less CSS #9218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/components/card/card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ md-card {

&:first-child {
md-card-avatar {
@include rtl-prop(margin-right, margin-left, 12px);
@include rtl-prop(margin-right, margin-left, 12px, auto);
}
}

&:last-child {
md-card-avatar {
@include rtl-prop(margin-left, margin-right, 12px);
@include rtl-prop(margin-left, margin-right, 12px, auto);
}
}

Expand Down Expand Up @@ -169,11 +169,11 @@ md-card {
margin: 0 $baseline-grid * .5;

&:first-of-type {
@include rtl-prop(margin-left, margin-right, 0);
@include rtl-prop(margin-left, margin-right, 0, auto);
}

&:last-of-type {
@include rtl-prop(margin-right, margin-left, 0);
@include rtl-prop(margin-right, margin-left, 0, auto);
}
}

Expand All @@ -182,11 +182,11 @@ md-card {
margin-right: 3 * $baseline-grid / 4;

&:first-of-type {
@include rtl-prop(margin-left, margin-right, 3 * $baseline-grid / 2);
@include rtl-prop(margin-left, margin-right, 3 * $baseline-grid / 2, auto);
}

&:last-of-type {
@include rtl-prop(margin-right, margin-left, 3 * $baseline-grid / 2);
@include rtl-prop(margin-right, margin-left, 3 * $baseline-grid / 2, auto);
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/components/chips/chips.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $contact-chip-name-width: rem(12) !default;
.md-contact-name {
display: inline-block;
height: $chip-height;
@include rtl-prop(margin-left, margin-right, rem(0.8));
@include rtl-prop(margin-left, margin-right, rem(0.8), auto);
}
}
}
Expand All @@ -39,7 +39,7 @@ $contact-chip-name-width: rem(12) !default;
margin-top: $contact-chip-suggestion-margin;
}
.md-contact-name {
@include rtl-prop(margin-left, margin-right, $contact-chip-suggestion-margin);
@include rtl-prop(margin-left, margin-right, $contact-chip-suggestion-margin, auto);
width: $contact-chip-name-width;
}
.md-contact-name, .md-contact-email {
Expand Down Expand Up @@ -71,10 +71,10 @@ $contact-chip-name-width: rem(12) !default;
&.md-removable {

md-chip {
@include rtl-prop(padding-right, padding-left, $chip-remove-padding-right);
@include rtl-prop(padding-right, padding-left, $chip-remove-padding-right, 0);

.md-chip-content {
@include rtl-prop(padding-right, padding-left, rem(0.4));
@include rtl-prop(padding-right, padding-left, rem(0.4), 0);
}
}

Expand Down Expand Up @@ -112,7 +112,7 @@ $contact-chip-name-width: rem(12) !default;
}
.md-chip-remove-container {
position: absolute;
@include rtl-prop(right, left, 0);
@include rtl-prop(right, left, 0, auto);
line-height: $chip-remove-line-height;
}
.md-chip-remove {
Expand Down
4 changes: 2 additions & 2 deletions src/components/datepicker/calendar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ $md-calendar-height:
// because we want the header background and the month dividing border to
// extend the entire width of the calendar.
&:first-child {
@include rtl-prop(padding-left, padding-right, $md-calendar-side-padding);
@include rtl-prop(padding-left, padding-right, $md-calendar-side-padding, 0);
}

&:last-child {
@include rtl-prop(padding-right, padding-left, $md-calendar-side-padding);
@include rtl-prop(padding-right, padding-left, $md-calendar-side-padding, 0);
}
}

Expand Down
14 changes: 7 additions & 7 deletions src/components/datepicker/datePicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ md-datepicker {

// Leave room for the down-triangle button to "overflow" it's parent without modifying scrollLeft.
// This prevents the element from shifting right when opening via the triangle button.
@include rtl-prop(padding-right, padding-left, $md-datepicker-triangle-button-width / 2);
@include rtl-prop(margin-right, margin-left, -$md-datepicker-triangle-button-width / 2);
@include rtl-prop(padding-right, padding-left, $md-datepicker-triangle-button-width / 2, 0);
@include rtl-prop(margin-right, margin-left, -$md-datepicker-triangle-button-width / 2, auto);

vertical-align: middle;
}
Expand Down Expand Up @@ -83,7 +83,7 @@ md-datepicker {

.md-input-message-animation {
$margin: $md-datepicker-triangle-button-width + $md-datepicker-button-padding * 2 + $md-datepicker-button-gap;
@include rtl-prop(margin-left, margin-right, $margin);
@include rtl-prop(margin-left, margin-right, $margin, auto);
}
}
}
Expand All @@ -102,7 +102,7 @@ md-datepicker {
width: auto;

.md-icon-button + & {
@include rtl-prop(margin-left, margin-right, $md-datepicker-button-gap);
@include rtl-prop(margin-left, margin-right, $md-datepicker-button-gap, auto);
}

&.md-datepicker-focused {
Expand Down Expand Up @@ -200,7 +200,7 @@ md-datepicker {
// Button containing the down "disclosure" triangle/arrow.
.md-datepicker-triangle-button {
position: absolute;
@include rtl-prop(right, left, 0);
@include rtl-prop(right, left, 0, auto);
top: $md-date-arrow-size;

// TODO(jelbourn): This position isn't great on all platforms.
Expand Down Expand Up @@ -238,7 +238,7 @@ md-datepicker[disabled] {
}

.md-icon-button + .md-datepicker-input-container {
@include rtl-prop(margin-left, margin-right, -$md-datepicker-button-gap);
@include rtl-prop(margin-left, margin-right, -$md-datepicker-button-gap, auto);
}

.md-datepicker-input,
Expand All @@ -249,7 +249,7 @@ md-datepicker[disabled] {
// This needs some extra specificity in order to override
// the focused/invalid border colors.
input.md-datepicker-input {
@include rtl-prop(margin-left, margin-right, 24px);
@include rtl-prop(margin-left, margin-right, 24px, auto);
height: $md-datepicker-input-mask-height;
border-bottom-color: transparent;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/divider/divider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ md-divider {
margin: 0;

&[md-inset] {
@include rtl-prop(margin-left, margin-right, $baseline-grid * 10);
@include rtl-prop(margin-left, margin-right, $baseline-grid * 10, auto);
}
}

Expand All @@ -20,4 +20,4 @@ md-divider {
border-right-width: 1px;
border-right-style: solid;
}
}
}
10 changes: 5 additions & 5 deletions src/components/fabToolbar/fabToolbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,31 +51,31 @@ md-fab-toolbar {

&.md-left {
md-fab-trigger {
@include rtl-prop(right, left, 0);
@include rtl-prop(right, left, 0, auto);
}

.md-toolbar-tools {
flex-direction: row-reverse;

> .md-button:first-child {
@include rtl-prop(margin-right, margin-left, 0.6rem)
@include rtl-prop(margin-right, margin-left, 0.6rem, auto)
}

> .md-button:first-child {
@include rtl-prop(margin-left, margin-right, -0.8rem);
@include rtl-prop(margin-left, margin-right, -0.8rem, auto);
}


> .md-button:last-child {
@include rtl-prop(margin-right, margin-left, 8px);
@include rtl-prop(margin-right, margin-left, 8px, auto);
}

}
}

&.md-right {
md-fab-trigger {
@include rtl-prop(left, right, 0);
@include rtl-prop(left, right, 0, auto);
}

.md-toolbar-tools {
Expand Down
24 changes: 12 additions & 12 deletions src/components/list/list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ md-list {
}

> md-icon:first-child:not(.md-avatar-icon) {
@include rtl-prop(margin-right, margin-left, $list-item-primary-width - $list-item-dense-primary-icon-width);
@include rtl-prop(margin-right, margin-left, $list-item-primary-width - $list-item-dense-primary-icon-width, auto);
}
.md-avatar, .md-avatar-icon {
@include rtl-prop(margin-right, margin-left, $list-item-primary-width - $list-item-dense-primary-avatar-width);
@include rtl-prop(margin-right, margin-left, $list-item-primary-width - $list-item-dense-primary-avatar-width, auto);
}
.md-avatar {
flex: none;
Expand All @@ -81,7 +81,7 @@ md-list {
&, & > .md-no-style {
.md-list-item-text {
&.md-offset {
@include rtl-prop(margin-left, margin-right, $list-item-primary-width);
@include rtl-prop(margin-left, margin-right, $list-item-primary-width, auto);
}

h3,
Expand Down Expand Up @@ -111,7 +111,7 @@ md-list {

&.md-3-line {
&, & > .md-no-style {

min-height: $list-item-dense-three-line-height;
@include ie11-min-height-flexbug($list-item-dense-three-line-height);

Expand Down Expand Up @@ -208,10 +208,10 @@ md-list-item {
md-divider {
position: absolute;
bottom: 0;
@include rtl-prop(left, right, 0);
@include rtl-prop(left, right, 0, auto);
width: 100%;
&[md-inset] {
@include rtl-prop(left, right, $list-item-inset-divider-offset);
@include rtl-prop(left, right, $list-item-inset-divider-offset, auto);
width: calc(100% - #{$list-item-inset-divider-offset});
margin: 0 !important;
}
Expand Down Expand Up @@ -251,13 +251,13 @@ md-list-item {
}

& > md-icon:first-child:not(.md-avatar-icon) {
@include rtl-prop(margin-right, margin-left, $list-item-primary-width - $list-item-primary-icon-width);
@include rtl-prop(margin-right, margin-left, $list-item-primary-width - $list-item-primary-icon-width, auto);
}

& .md-avatar, .md-avatar-icon {
margin-top: $baseline-grid;
margin-bottom: $baseline-grid;
@include rtl-prop(margin-right, margin-left, $list-item-primary-width - $list-item-primary-avatar-width);
@include rtl-prop(margin-right, margin-left, $list-item-primary-width - $list-item-primary-avatar-width, auto);
border-radius: 50%;
box-sizing: content-box;
}
Expand Down Expand Up @@ -303,7 +303,7 @@ md-list-item {
.md-button, .md-icon-button {
&:last-of-type {
// Reset 6px margin for the button.
@include rtl-prop(margin-right, margin-left, 0px);
@include rtl-prop(margin-right, margin-left, 0, auto);
}
}

Expand All @@ -313,15 +313,15 @@ md-list-item {

&:last-child {
width: 3 * $baseline-grid;
@include rtl-prop(margin-right, margin-left, 0);
@include rtl-prop(margin-right, margin-left, 0, auto);
}
}

md-switch {
margin-top: 0;
margin-bottom: 0;

@include rtl-prop(margin-right, margin-left, -6px);
@include rtl-prop(margin-right, margin-left, -6px, auto);
}
}

Expand Down Expand Up @@ -349,7 +349,7 @@ md-list-item {
overflow: hidden;

&.md-offset {
@include rtl-prop(margin-left, margin-right, $list-item-primary-width);
@include rtl-prop(margin-left, margin-right, $list-item-primary-width, auto);
}

h3 {
Expand Down
6 changes: 3 additions & 3 deletions src/components/menuBar/menu-bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ md-menu-content.md-menu-bar-menu.md-dense {
padding: 0;
width: 24px;
top: 0.75 * $baseline-grid;
@include rtl-prop(left, right, 3 * $baseline-grid);
@include rtl-prop(left, right, 3 * $baseline-grid, auto);
}
> .md-button, .md-menu > .md-button {
@include rtl(padding, 0 4 * $baseline-grid 0 8 * $baseline-grid, 0 8 * $baseline-grid 0 4 * $baseline-grid);
Expand Down Expand Up @@ -78,15 +78,15 @@ md-menu-content.md-menu-bar-menu.md-dense {
text-transform: none;
font-weight: normal;
border-radius: 0px;
@include rtl-prop(padding-left, padding-right, 2 * $baseline-grid);
@include rtl-prop(padding-left, padding-right, 2 * $baseline-grid, 0);
&:after {
display: block;
content: '\25BC';
position: absolute;
top: 0px;
speak: none;
@include rtl(transform, rotate(270deg) scaleY(0.45) scaleX(0.9), rotate(90deg) scaleY(0.45) scaleX(0.9));
@include rtl-prop(right, left, 3.5 * $baseline-grid);
@include rtl-prop(right, left, 3.5 * $baseline-grid, auto);
}
}
}
Expand Down
Loading