Restored !default and fullscreen logic in SASS

This commit is contained in:
Sam Potts 2015-07-28 11:29:49 +10:00
parent 6b0f58dab2
commit 00cf797c20

View File

@ -7,22 +7,22 @@
// ------------------------------- // -------------------------------
// Colors // Colors
$blue: #3498DB; $blue: #3498DB !default;
$gray-dark: #343F4A; $gray-dark: #343F4A !default;
$gray: #565D64; $gray: #565D64 !default;
$gray-light: #6B7D86; $gray-light: #6B7D86 !default;
$gray-lighter: #CBD0D3; $gray-lighter: #CBD0D3 !default;
$off-white: #D6DADD; $off-white: #D6DADD !default;
// Font sizes // Font sizes
$font-size-small: 14px; $font-size-small: 14px !default;
$font-size-base: 16px; $font-size-base: 16px !default;
$font-size-large: ceil(($font-size-base * 1.5)); $font-size-large: ceil(($font-size-base * 1.5)) !default;
// Controls // Controls
$control-spacing: 10px; $control-spacing: 10px !default;
$controls-bg: #fff; $controls-bg: #fff !default;
$control-bg-hover: $blue; $control-bg-hover: $blue !default; !default
// Contrast // Contrast
@mixin contrast-control-color($color: "") { @mixin contrast-control-color($color: "") {
@ -46,30 +46,30 @@ $control-bg-hover: $blue;
@include contrast-control-color-hover($control-bg-hover); @include contrast-control-color-hover($control-bg-hover);
// Tooltips // Tooltips
$tooltip-bg: $controls-bg; $tooltip-bg: $controls-bg !default;
$tooltip-color: $control-color; $tooltip-color: $control-color !default;
$tooltip-padding: $control-spacing; $tooltip-padding: $control-spacing !default;
$tooltip-arrow-size: 5px; $tooltip-arrow-size: 5px !default;
$tooltip-radius: 3px; $tooltip-radius: 3px !default;
// Progress // Progress
$progress-bg: rgba(red($gray), green($gray), blue($gray), .2); $progress-bg: rgba(red($gray), green($gray), blue($gray), .2) !default;
$progress-playing-bg: $blue; $progress-playing-bg: $blue !default;
$progress-buffered-bg: rgba(red($gray), green($gray), blue($gray), .25); $progress-buffered-bg: rgba(red($gray), green($gray), blue($gray), .25) !default;
$progress-loading-size: 40px; $progress-loading-size: 40px !default
$progress-loading-bg: rgba(0,0,0, .15); $progress-loading-bg: rgba(0,0,0, .15) !default;
// Volume // Volume
$volume-track-height: 6px; $volume-track-height: 6px !default;
$volume-track-bg: darken($controls-bg, 10%); $volume-track-bg: darken($controls-bg, 10%) !default;
$volume-thumb-height: ($volume-track-height * 2); $volume-thumb-height: ($volume-track-height * 2) !default;
$volume-thumb-width: ($volume-track-height * 2); $volume-thumb-width: ($volume-track-height * 2) !default;
$volume-thumb-bg: $control-color; $volume-thumb-bg: $control-color !default;
$volume-thumb-bg-focus: $control-bg-hover; $volume-thumb-bg-focus: $control-bg-hover !default;
// Breakpoints // Breakpoints
$bp-control-split: 560px; // When controls split into left/right $bp-control-split: 560px !default; // When controls split into left/right
$bp-captions-large: 768px; // When captions jump to the larger font size $bp-captions-large: 768px !default; // When captions jump to the larger font size
// Animation // Animation
// --------------------------------------- // ---------------------------------------
@ -607,15 +607,6 @@ $bp-captions-large: 768px; // When captions jump to the larger font size
.player-video-wrapper { .player-video-wrapper {
height: 100%; height: 100%;
width: 100%; width: 100%;
.player-captions {
top: auto;
bottom: 90px;
@media (min-width: $bp-control-split) {
bottom: 60px;
}
}
} }
.player-controls { .player-controls {
position: absolute; position: absolute;
@ -625,13 +616,29 @@ $bp-captions-large: 768px; // When captions jump to the larger font size
} }
// Hide controls when playing in full screen // Hide controls when playing in full screen
&.fullscreen-hide-controls.playing .player-controls { &.fullscreen-hide-controls.playing {
.player-controls {
transform: translateY(100%) translateY($control-spacing / 2); transform: translateY(100%) translateY($control-spacing / 2);
transition: transform .3s .2s ease; transition: transform .3s .2s ease;
}
&.hover { &.player-hover .player-controls {
transform: translateY(0); transform: translateY(0);
} }
.player-captions {
bottom: ($control-spacing / 2);
transition: bottom .3s .2s ease;
}
}
// Captions
.player-captions,
&.fullscreen-hide-controls.playing.player-hover .player-captions {
top: auto;
bottom: 90px;
@media (min-width: $bp-control-split) {
bottom: 60px;
}
} }
} }