Skip to content

Commit

Permalink
fix(icon-placeholder): align icons on ie8 properly (#4174)
Browse files Browse the repository at this point in the history
Make sure that the button inside the menu button element isn't a
vjs-control but make sure that the icon-placeholder is sized properly.
  • Loading branch information
gkatsev committed Mar 7, 2017
1 parent 05e6494 commit 1770f00
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions src/css/components/_control.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
width: 4em;
@include flex(none);

& > .vjs-icon-placeholder:before {
font-size: 1.8em;
line-height: 1.67;
}
.vjs-button > .vjs-icon-placeholder:before {
font-size: 1.8em;
line-height: 1.67;

@extend %icon-default;
}
@extend %icon-default;
}

// Replacement for focus outline
Expand Down
1 change: 0 additions & 1 deletion src/js/control-bar/text-track-controls/subs-caps-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ class SubsCapsButton extends TextTrackButton {
this.label_ = 'captions';
}
this.menuButton_.controlText(toTitleCase(this.label_));

}

/**
Expand Down
1 change: 1 addition & 0 deletions src/js/menu/menu-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class MenuButton extends Component {
const buttonClass = Button.prototype.buildCSSClass();

this.menuButton_.el_.className = this.buildCSSClass() + ' ' + buttonClass;
this.menuButton_.removeClass('vjs-control');

this.addChild(this.menuButton_);

Expand Down

0 comments on commit 1770f00

Please sign in to comment.