Skip to content

Commit 7e8d36b

Browse files
FrancescoMolinarovins01-4science
authored andcommitted
Merged in task/ux-plus-cris/UXP-234 (pull request #38)
Task/ux plus cris/UXP-234 Approved-by: Andrea Barbasso
2 parents b7b9e8a + e70b46d commit 7e8d36b

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/app/shared/media-player/media-player.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
@import 'videojs-wavesurfer/dist/css/videojs.wavesurfer.css';
33

44
.media-container {
5-
max-height: 480px;
6-
margin-bottom: 140px;
5+
//additional 32px to give some space under content bar
6+
margin-bottom: calc(var(--ds-video-selection-bar-height) + 32px);
77
}
88

99

src/app/shared/media-player/media-selection-bar/media-selection-bar.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
overflow-y: hidden;
88
white-space: nowrap;
99
padding: 0;
10-
height: calc(107px + 0.25rem);
10+
height: var(--ds-video-selection-bar-height);
1111

1212
&-item {
1313
display: inline-block;

src/styles/_custom_variables.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@
152152
--ds-cris-layout-navbar-tab-color-active: #006666;
153153
--ds-cris-layout-navbar-tab-color-hover : #{theme-color('light')};
154154

155+
--ds-video-selection-bar-height: calc(107px + 0.25rem);
156+
155157
--ds-carousel-controls-color: #{$gray-600};
156158
--ds-carousel-caption-color: #{$gray-800};
157159
--ds-carousel-caption-background: rgba(255, 255, 255, .6);

0 commit comments

Comments
 (0)