Switched to using libsass and removed incompatible "black magic"

videojs · Apr 12, 2015 · 00a1a6e · 00a1a6e
1 parent a44350c
commit 00a1a6e
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,6 @@
 language: node_js
 node_js:
   - 0.10
-before_install:
-  - gem install sass
 before_script:
   - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then curl https://gist.githubusercontent.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash; fi
 notifications:

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -402,7 +402,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-cssmin');
-  grunt.loadNpmTasks('grunt-contrib-sass');
+  grunt.loadNpmTasks('grunt-sass');
   grunt.loadNpmTasks('grunt-s3');
   grunt.loadNpmTasks('contribflow');
   grunt.loadNpmTasks('grunt-karma');

diff --git a/package.json b/package.json
@@ -41,13 +41,13 @@
     "grunt-contrib-jshint": "~0.4.3",
     "grunt-contrib-less": "~0.6.4",
     "grunt-contrib-qunit": "~0.2.1",
-    "grunt-contrib-sass": "^0.8.1",
-	"grunt-contrib-uglify": "^0.8.0",
+    "grunt-contrib-uglify": "^0.8.0",
     "grunt-contrib-watch": "~0.1.4",
     "grunt-fastly": "^0.1.3",
     "grunt-github-releaser": "^0.1.17",
     "grunt-karma": "^0.8.3",
     "grunt-s3": "~0.2.0-alpha",
+    "grunt-sass": "^0.18.1",
     "grunt-version": "~0.3.0",
     "grunt-videojs-languages": "0.0.4",
     "grunt-zip": "0.10.2",

diff --git a/src/css/_utilities.scss b/src/css/_utilities.scss
@@ -34,12 +34,6 @@
   animation: $string;
 }
 
-@mixin context($old-context, $new-context) {
-  @at-root #{selector-replace(&, $old-context, $new-context)} {
-    @content;
-  }
-}
-
 @mixin display-flex($alignment: '', $justification: '') {
   display: -webkit-box;
   display: -webkit-flex;

diff --git a/src/css/components/_slider.scss b/src/css/components/_slider.scss
@@ -14,7 +14,7 @@
 
 .video-js .vjs-slider-horizontal .vjs-slider-handle {
   left: 0;
-  top: -0.3em;
+  top: -0.34em;
 }
 
 .video-js .vjs-slider-vertical .vjs-slider-handle {

diff --git a/tasks/dist-copy.js b/tasks/dist-copy.js
@@ -14,8 +14,6 @@ module.exports = function(grunt) {
     grunt.file.copy('node_modules/videojs-swf/dist/video-js.swf', 'dist/video-js/video-js.swf');
     grunt.file.copy('build/demo-files/demo.html', 'dist/video-js/demo.html');
     grunt.file.copy('build/demo-files/demo.captions.vtt', 'dist/video-js/demo.captions.vtt');
-    grunt.file.copy('src/css/video-js.less', 'dist/video-js/video-js.less');
-
 
     // Copy over font files
     grunt.file.recurse('build/files/font', function(absdir, rootdir, subdir, filename) {