diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-12 20:28:39 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-20 12:36:42 +0300 |
commit | 6b7e9c7655e4ffc74de90f01a0850a230b10a03c (patch) | |
tree | da865eb7dff81588d426907afcc74d6a072fe3fa /app/assets | |
parent | 98e540532cc2706e4cdc027bd2acb8406e954ddc (diff) |
Remove VideoJS and clean the integration
Handle videos in:
- MD preview in notes: commit, issue/MR, MR diff
- New notes in: commit, issue/MR, MR diff
- Persisted notes in: commit, issue/MR, MR diff
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/application.js.coffee | 1 | ||||
-rw-r--r-- | app/assets/javascripts/video_setup.js.coffee | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/application.scss | 5 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 2 |
4 files changed, 1 insertions, 10 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index c98763d6271..eceff6d91d5 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -53,7 +53,6 @@ #= require_directory ./u2f #= require_directory . #= require fuzzaldrin-plus -#= require u2f window.slugify = (text) -> text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase() diff --git a/app/assets/javascripts/video_setup.js.coffee b/app/assets/javascripts/video_setup.js.coffee deleted file mode 100644 index 01aea2d5c99..00000000000 --- a/app/assets/javascripts/video_setup.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Disables dynamic sizing of video tag, which defaults to 300px. -# Without this the video naturally fills the container. -window.VIDEOJS_NO_DYNAMIC_STYLE = true diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index c39c2947dd0..8b93665d085 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -30,11 +30,6 @@ @import "font-awesome"; /* - * Styles for VideoJS. - */ -@import "videojs/video-js"; - -/* * Page specific styles (issues, projects etc): */ @import "pages/**/*"; diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 542fa244689..300b4ac9c2e 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -268,7 +268,7 @@ .issuable-header-btn { background: $gray-normal; border: 1px solid $border-gray-normal; - + &:hover { background: $gray-dark; border: 1px solid $border-gray-dark; |