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

Commit

Permalink
Update to latest RTL mixin changes and improve RTL consistency for se…
Browse files Browse the repository at this point in the history
…condary items.
  • Loading branch information
devversion committed Aug 5, 2016
1 parent 8369c2f commit 1a49b9e
Showing 1 changed file with 32 additions and 18 deletions.
50 changes: 32 additions & 18 deletions src/components/list/list-base.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** External component calculations */
$md-checkbox-width: 3 * $baseline-grid !default;
//TODO(devversion): use shared variable from buttons.scss - See #9196
$md-button-spacing: $button-left-right-padding + rem(0.800) !default;
$md-button-margin: rem(0.800) !default;
$md-button-spacing: $button-left-right-padding + $md-button-margin !default;

/** Static List Item Variables */
$md-list-item-indention: $baseline-grid * 7 !default;
Expand Down Expand Up @@ -30,7 +30,7 @@ $md-list-item-subheader-height: 6 * $baseline-grid !default;
margin-top: 0;
margin-bottom: 0;

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

Expand Down Expand Up @@ -99,38 +99,41 @@ $md-list-item-subheader-height: 6 * $baseline-grid !default;
margin-top: $baseline-grid;
margin-bottom: $baseline-grid;
border-radius: 50%;
@include rtl-prop(margin-left, margin-right, 0);
}

.md-avatar {
width: $list-avatar-width;
height: $list-avatar-width;
@include rtl-prop(margin-right, margin-left, $md-list-item-indention - $list-avatar-width);

@include rtl(margin-right, $md-list-item-indention - $list-avatar-width, 0);
@include rtl(margin-left, 0, $md-list-item-indention - $list-avatar-width);
}

.md-avatar-icon {
$avatar-icon-width: $list-icon-width + ($list-avatar-padding-dense * 2);
padding: $list-avatar-padding-dense;

@include md-icon-size($list-icon-width);
@include rtl-prop(margin-right, margin-left, $md-list-item-indention - $avatar-icon-width);

@include rtl(margin-right, $md-list-item-indention - $avatar-icon-width, 0);
@include rtl(margin-left, 0, $md-list-item-indention - $avatar-icon-width);
}

/* Primary elements at start of the list item content. */
> md-icon:first-child:not(.md-avatar-icon) {
@include md-icon-size($list-icon-width);
@include rtl-prop(margin-right, margin-left, $md-list-item-indention - $list-icon-width);
}

md-checkbox {
width: $md-checkbox-width;
@include rtl(margin-right, $md-list-item-indention - $list-icon-width, 0);
@include rtl(margin-left, 0, $md-list-item-indention - $list-icon-width);
}

> md-checkbox:first-child {
@include rtl-prop(margin-right, margin-left, $md-list-item-indention - $md-checkbox-width);
@include rtl(margin-right, $md-list-item-indention - $md-checkbox-width, 0);
@include rtl(margin-left, 0, $md-list-item-indention - $md-checkbox-width);
}

.md-button:last-of-type {
@include rtl-prop(margin-right, margin-left, 0px);
md-checkbox {
width: $md-checkbox-width;
}

md-divider {
Expand All @@ -140,7 +143,7 @@ $md-list-item-subheader-height: 6 * $baseline-grid !default;
width: 100%;

&[md-inset] {
@include rtl-prop(left, right, $md-list-item-indention + $md-list-item-padding);
@include rtl-prop(left, right, $md-list-item-indention + $md-list-item-padding, auto);
width: calc(100% - #{$md-list-item-indention + $md-list-item-padding});
margin: 0 !important;
}
Expand Down Expand Up @@ -177,7 +180,7 @@ $md-list-item-subheader-height: 6 * $baseline-grid !default;
overflow: hidden;

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

&.md-long-text {
Expand Down Expand Up @@ -266,15 +269,26 @@ $md-list-item-subheader-height: 6 * $baseline-grid !default;
@include rtl(margin-right, 0, auto);
@include rtl(margin-left, auto, 0);

/** Reset component styles */
@include md-reset-switch();

// md-checkbox should have same spacing as other secondary buttons.
md-checkbox:not(:last-child) {
@include rtl-prop(margin-right, margin-left, $md-button-spacing);
md-checkbox {
margin: 0 $md-button-spacing;

&:last-child {
@include rtl-prop(margin-right, margin-left, 0, $md-button-spacing);
}
}

// md-button should not have any margin when being the last secondary item.
.md-button:last-child, md-menu:last-child > .md-button {
@include rtl-prop(margin-right, margin-left, 0, $md-button-margin);
}
}

@include md-button-wrap();
@include md-reset-checkbox();
@include md-reset-switch();
@include md-reset-paragraph();
@include md-list-item-multi-line(
$list-height-2, $list-height-3, $list-title-font-size, $list-title-line-height,
Expand Down

0 comments on commit 1a49b9e

Please sign in to comment.