Skip to content

Commit

Permalink
fix(tab-indicator): Remove child selector (#4676)
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickrodee authored May 3, 2019
1 parent 252009f commit edbe0ba
Show file tree
Hide file tree
Showing 5 changed files with 138 additions and 101 deletions.
97 changes: 67 additions & 30 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"stylelint-config-standard": "^18.0.0",
"stylelint-order": "^2.0.0",
"stylelint-scss": "^3.0.0",
"stylelint-selector-bem-pattern": "^1.0.0",
"stylelint-selector-bem-pattern": "^2.1.0",
"testdouble": "^3.2.4",
"to-slug-case": "^1.0.0",
"ts-loader": "^3.5.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/mdc-tab-indicator/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,32 +28,32 @@
}

@mixin mdc-tab-indicator-underline-color($color) {
> .mdc-tab-indicator__content--underline {
.mdc-tab-indicator__content--underline {
@include mdc-theme-prop(background-color, $color);
}
}

@mixin mdc-tab-indicator-underline-height($height) {
> .mdc-tab-indicator__content--underline {
.mdc-tab-indicator__content--underline {
height: $height;
}
}

@mixin mdc-tab-indicator-underline-top-corner-radius($radius) {
> .mdc-tab-indicator__content--underline {
.mdc-tab-indicator__content--underline {
border-top-left-radius: $radius;
border-top-right-radius: $radius;
}
}

@mixin mdc-tab-indicator-icon-color($color) {
> .mdc-tab-indicator__content--icon {
.mdc-tab-indicator__content--icon {
@include mdc-theme-prop(color, $color);
}
}

@mixin mdc-tab-indicator-icon-height($height) {
> .mdc-tab-indicator__content--icon {
.mdc-tab-indicator__content--icon {
height: $height;
font-size: $height;
}
Expand Down
10 changes: 5 additions & 5 deletions packages/mdc-tab-indicator/mdc-tab-indicator.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,26 +57,26 @@
margin: 0 auto;
}

.mdc-tab-indicator--active > .mdc-tab-indicator__content {
.mdc-tab-indicator--active .mdc-tab-indicator__content {
opacity: 1;
}

// Slide by default
.mdc-tab-indicator > .mdc-tab-indicator__content {
.mdc-tab-indicator .mdc-tab-indicator__content {
transition: 250ms transform $mdc-animation-standard-curve-timing-function;
}

// --no-transition is applied in cases where styles need to be applied immediately to set up a transition
.mdc-tab-indicator--no-transition > .mdc-tab-indicator__content {
.mdc-tab-indicator--no-transition .mdc-tab-indicator__content {
transition: none;
}

.mdc-tab-indicator--fade > .mdc-tab-indicator__content {
.mdc-tab-indicator--fade .mdc-tab-indicator__content {
transition: 150ms opacity linear;
}

// postcss-bem-linter: ignore
.mdc-tab-indicator--active.mdc-tab-indicator--fade > .mdc-tab-indicator__content {
.mdc-tab-indicator--active.mdc-tab-indicator--fade .mdc-tab-indicator__content {
transition-delay: 100ms;
}

Expand Down
Loading

0 comments on commit edbe0ba

Please sign in to comment.