Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace multi-line comment with single line comments #2827

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/css/components/_big-play.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
opacity: 1;
border: 0.06666em solid $primary-foreground-color;

/* Need a slightly gray bg so it can be seen on black backgrounds */
// Need a slightly gray bg so it can be seen on black backgrounds
@include background-color-with-alpha($primary-background-color, $primary-background-transparency);
@include border-radius(0.3em);
@include transition(all 0.4s);
Expand Down
2 changes: 1 addition & 1 deletion src/css/components/_chapters.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
}

.vjs-chapters-button .vjs-menu {
left: -10em; /* (Width of vjs-menu - width of vjs-control) / 2 */
left: -10em; // (Width of vjs-menu - width of vjs-control) / 2
width: 0;
}

Expand Down
13 changes: 6 additions & 7 deletions src/css/components/_control-bar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
.vjs-controls-disabled .vjs-control-bar,
.vjs-using-native-controls .vjs-control-bar,
.vjs-error .vjs-control-bar {
/* !important is ok in this context. */
// !important is ok in this context.
display: none !important;
}

Expand All @@ -42,17 +42,16 @@
visibility: visible;
}

/* IE8 is flakey with fonts, and you have to change the actual content to force
fonts to show/hide properly.
- "\9" IE8 hack didn't work for this
- Found in XP IE8 from http://modern.ie. Does not show up in "IE8 mode" in IE9
*/
// IE8 is flakey with fonts, and you have to change the actual content to force
// fonts to show/hide properly.
// - "\9" IE8 hack didn't work for this
// Found in XP IE8 from http://modern.ie. Does not show up in "IE8 mode" in IE9
$ie8screen: "\0screen";
.vjs-user-inactive.vjs-playing .vjs-control-bar :before {
@media #{$ie8screen} { content: ""; }
}

/* IE 8 + 9 Support */
// IE 8 + 9 Support
.vjs-has-started.vjs-no-flex .vjs-control-bar {
display: table;
}
6 changes: 3 additions & 3 deletions src/css/components/_control.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@
}
}

/* Replacement for focus outline */
// Replacement for focus outline
.video-js .vjs-control:focus:before,
.video-js .vjs-control:hover:before,
.video-js .vjs-control:focus {
text-shadow: 0em 0em 1em rgba($primary-foreground-color, 1);
}

/* Hide control text visually, but have it available for screenreaders */
// Hide control text visually, but have it available for screenreaders
.video-js .vjs-control-text {
@include hide-visually;
}

/* IE 8 + 9 Support */
// IE 8 + 9 Support
.vjs-no-flex .vjs-control {
display: table-cell;
vertical-align: middle;
Expand Down
2 changes: 1 addition & 1 deletion src/css/components/_fullscreen.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.video-js .vjs-fullscreen-control {
@extend .vjs-icon-fullscreen-enter;
}
/* Switch to the exit icon when the player is in fullscreen */
// Switch to the exit icon when the player is in fullscreen
.video-js.vjs-fullscreen .vjs-fullscreen-control {
@extend .vjs-icon-fullscreen-exit;
}
53 changes: 26 additions & 27 deletions src/css/components/_layout.scss
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
.video-js {
/* display:inline-block would be closer to the video el's display:inline
* but it results in flash reloading when going into fullscreen [#2205]
*/
// display:inline-block would be closer to the video el's display:inline
// but it results in flash reloading when going into fullscreen [#2205]
display: block;
/* Make video.js videos align top when next to video elements */
// Make video.js videos align top when next to video elements
vertical-align: top;
box-sizing: border-box;

color: $primary-foreground-color;
background-color: #000;
position: relative;
padding: 0;
/* Start with 10px for base font size so other dimensions can be em based and
easily calculable. */
// Start with 10px for base font size so other dimensions can be em based and
// easily calculable.
font-size: 10px;
line-height: 1;

/* Provide some basic defaults for fonts */
// Provide some basic defaults for fonts
font-weight: normal;
font-style: normal;
/* Avoiding helvetica: issue #376 */
// Avoiding helvetica: issue #376
font-family: $text-font-family;

@include user-select(none);

/* Fix for Firefox 9 fullscreen (only if it is enabled). Not needed when
checking fullScreenEnabled. */
// Fix for Firefox 9 fullscreen (only if it is enabled). Not needed when
// checking fullScreenEnabled.
&:-moz-full-screen { position: absolute; }

&:-webkit-full-screen {
Expand All @@ -34,35 +33,35 @@
}
}

/* All elements inherit border-box sizing */
// All elements inherit border-box sizing
.video-js *,
.video-js *:before,
.video-js *:after {
box-sizing: inherit;
}

/* List style reset */
// List style reset
.video-js ul {
font-family: inherit;
font-size: inherit;
line-height: inherit;
list-style-position: outside;

/* Important to specify each */
// Important to specify each
margin-left: 0;
margin-right: 0;
margin-top: 0;
margin-bottom: 0;
}

/* Fill the width of the containing element and use padding to create the
desired aspect ratio. Default to 16x9 unless another ratio is given. */
// Fill the width of the containing element and use padding to create the
// desired aspect ratio. Default to 16x9 unless another ratio is given.
@mixin apply-aspect-ratio($width, $height) {
padding-top: 100% * ($height/$width);
}

/* Not including a default AR in vjs-fluid because it would override
the user set AR injected into the header. */
// Not including a default AR in vjs-fluid because it would override
// the user set AR injected into the header.
.video-js.vjs-fluid,
.video-js.vjs-16-9,
.video-js.vjs-4-3 {
Expand All @@ -84,8 +83,8 @@
height: 100%;
}

/* Playback technology elements expand to the width/height of the containing div
<video> or <object> */
// Playback technology elements expand to the width/height of the containing div
// <video> or <object>
.video-js .vjs-tech {
position: absolute;
top: 0;
Expand All @@ -94,12 +93,12 @@
height: 100%;
}

/* Fullscreen Styles */
// Fullscreen Styles
body.vjs-full-window {
padding: 0;
margin: 0;
height: 100%;
/* Fix for IE6 full-window. http://www.cssplay.co.uk/layouts/fixed.html */
// Fix for IE6 full-window. http://www.cssplay.co.uk/layouts/fixed.html
overflow-y: auto;
}
.vjs-full-window .video-js.vjs-fullscreen {
Expand All @@ -114,15 +113,15 @@ body.vjs-full-window {
.video-js.vjs-fullscreen {
width: 100% !important;
height: 100% !important;
/* Undo any aspect ratio padding for fluid layouts */
// Undo any aspect ratio padding for fluid layouts
padding-top: 0 !important;
}
.video-js.vjs-fullscreen.vjs-user-inactive {
cursor: none;
}


/* Hide disabled or unsupported controls. */
// Hide disabled or unsupported controls.
.vjs-hidden { display: none !important; }

// Visually hidden offscreen, but accessible to screen readers.
Expand All @@ -140,10 +139,10 @@ body.vjs-full-window {
visibility: visible;
}

/* In IE8 w/ no JavaScript (no HTML5 shim), the video tag doesn't register.
The .video-js classname on the video tag also isn't considered.
This optional paragraph inside the video tag can provide a message to users
about what's required to play video. */
// In IE8 w/ no JavaScript (no HTML5 shim), the video tag doesn't register.
// The .video-js classname on the video tag also isn't considered.
// This optional paragraph inside the video tag can provide a message to users
// about what's required to play video.
.vjs-no-js {
padding: 20px;
color: #fff;
Expand Down
6 changes: 3 additions & 3 deletions src/css/components/_loading.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
margin: -25px 0 0 -25px;
opacity: 0.85;

/* Need to fix centered page layouts */
// Need to fix centered page layouts
text-align: left;

border: 6px solid rgba($primary-background-color, $primary-background-transparency);
Expand All @@ -33,14 +33,14 @@
width: inherit;
height: inherit;
border-radius: inherit;
/* Keep 100% opacity so they don't show through each other */
// Keep 100% opacity so they don't show through each other
opacity: 1;
border: inherit;
border-color: transparent;
border-top-color: white;
}

/* only animate when showing because it can be processor heavy */
// only animate when showing because it can be processor heavy
.vjs-seeking .vjs-loading-spinner:before,
.vjs-seeking .vjs-loading-spinner:after,
.vjs-waiting .vjs-loading-spinner:before,
Expand Down
12 changes: 6 additions & 6 deletions src/css/components/_poster.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
height: 100%;
}

/* Used for IE8 fallback */
// Used for IE8 fallback
.vjs-poster img {
display: block;
vertical-align: middle;
Expand All @@ -25,23 +25,23 @@
width: 100%;
}

/* Hide the poster after the video has started playing */
// Hide the poster after the video has started playing
.vjs-has-started .vjs-poster {
display: none;
}

/* Don't hide the poster if we're playing audio */
// Don't hide the poster if we're playing audio
.vjs-audio.vjs-has-started .vjs-poster {
display: block;
}

/* Hide the poster when controls are disabled because it's clickable
and the native poster can take over */
// Hide the poster when controls are disabled because it's clickable
// and the native poster can take over
.vjs-controls-disabled .vjs-poster {
display: none;
}

/* Hide the poster when native controls are used otherwise it covers them */
// Hide the poster when native controls are used otherwise it covers them
.vjs-using-native-controls .vjs-poster {
display: none;
}
Loading