web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-11-28 08:58:46 +02:00
Code Releases Activity

@gkatsev made all sass variables !default. closes #2574

Browse Source
This commit is contained in:
Gary Katsevman 2015-09-09 17:20:06 -04:00
parent a355f900b9
commit 1b745e7b11
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -123,6 +123,7 @@ CHANGELOG
* @heff cleaned up internal duration handling ([view](https://github.com/videojs/video.js/pull/2552))
* @heff fixed the UI for live streams ([view](https://github.com/videojs/video.js/pull/2557))
* @gkatsev updated opacity of caption settings background color ([view](https://github.com/videojs/video.js/pull/2573))
* @gkatsev made all sass variables !default ([view](https://github.com/videojs/video.js/pull/2574))
--------------------

25
src/css/_variables.scss
View File

@ -1,15 +1,18 @@
$primary-text: #fff;
$secondary-text: #F4A460; // currently just used for visited links in errors and such.
$primary-text: #fff !default;
// currently just used for visited links in errors and such.
$secondary-text: #F4A460 !default;
$primary-bg: #000;
$secondary-bg: lighten($primary-bg, 35%);
$primary-bg: #000 !default;
$secondary-bg: lighten($primary-bg, 35%) !default;
$text-font-family: Arial, Helvetica, sans-serif;
$base-font-size: 10px;
$text-font-family: Arial, Helvetica, sans-serif !default;
$base-font-size: 10px !default;
$control-bar--bg: #2B333F;
$control-bar--transparency: 0.5;
$control-bar--bg: #2B333F !default;
$control-bar--transparency: 0.5 !default;
$big-play-button--width: 3em;
$big-play-button--height: 1.5em;
$big-play-button--transparency: 0.8;
$big-play-button--width: 3em !default;
$big-play-button--height: 1.5em !default;
$big-play-button--transparency: 0.8 !default;
$icon-font-path: 'font' !default;

1
src/css/video-js.scss
View File

@ -1,7 +1,6 @@
@import "variables";
@import "utilities";
$icon-font-path: 'font';
@import "../../node_modules/videojs-font/scss/icons";
@import "components/layout";