Skip to content

Commit

Permalink
fix nested flexbox items chrome bug
Browse files Browse the repository at this point in the history
  • Loading branch information
OpenHypervideo committed Mar 22, 2017
1 parent 93a977c commit 634fe3c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion player/modules/ViewVideo/module.js
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ FrameTrail.defineModule('ViewVideo', function(){
- $('#Titlebar').height()
- editBorder,
_video = $(Video);

if (animate) {
VideoContainer.css({
'transition-duration': '',
Expand Down
7 changes: 3 additions & 4 deletions player/modules/ViewVideo/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ path {
justify-content: flex-start;
align-content: stretch;
align-items: flex-start;
position: relative;
position: absolute;
width: 100%;
height: 100%;
overflow: hidden;
Expand Down Expand Up @@ -648,7 +648,7 @@ path {
order: 0;
flex: 0 0 400px;
min-width: 400px;
height: 100%;
align-self: stretch;
}

.editActive[data-edit-mode="links"] #HypervideoContainer #InfoAreaRight, .editActive[data-edit-mode="overlays"] #HypervideoContainer #InfoAreaRight, .editActive[data-edit-mode="codesnippets"] #HypervideoContainer #InfoAreaRight, .editActive[data-edit-mode="annotations"] #HypervideoContainer #InfoAreaRight {
Expand Down Expand Up @@ -729,8 +729,7 @@ path {
position: relative;
order: 0;
flex: 1 1 auto;
height: 100%;
align-self: auto;
align-self: stretch;
background: transparent;
overflow: hidden;
-moz-transition-property: width;
Expand Down

0 comments on commit 634fe3c

Please sign in to comment.