diff --git a/LICENSE b/LICENSE index c42cdd40b3..4c4452f137 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2016 NightDev, LLC +Copyright (c) 2017 NightDev, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ THE SOFTWARE. Should any questions arise concerning your usage of this Software, or to request permission to distribute this Software, please contact the copyright -holder at http://nightdev.com/contact +holder at https://nightdev.com/contact --------------------------------- diff --git a/gulpfile.js b/gulpfile.js index 045c745df3..5fdb52c5c7 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -32,24 +32,32 @@ gulp.task( () => del('build/**/*') ); +gulp.task( + 'lint', + () => gulp.src('src/**/*.js') + .pipe(eslint()) + .pipe(eslint.format()) + .pipe(eslint.failOnError()) +); + gulp.task( 'prepare', ['cleanup', 'lint'], - () => gulp.src(['src/**/*']) + () => gulp.src('src/**/*') .pipe(gulp.dest('build/')) ); gulp.task( - 'lint', - () => gulp.src(['src/**/*.js']) - .pipe(eslint()) - .pipe(eslint.format()) - .pipe(eslint.failOnError()) + 'license', + ['prepare'], + () => gulp.src('build/index.js') + .pipe(header(LICENSE + '\n')) + .pipe(gulp.dest('build')) ); gulp.task( 'scripts', - ['prepare'], + ['license'], () => browserify('build/index.js', {debug: true}) .transform('require-globify') .transform('babelify', { @@ -62,7 +70,6 @@ gulp.task( .bundle() .pipe(gulpif(IS_PROD, source('betterttv.unmin.js'), source('betterttv.js'))) .pipe(buffer()) - .pipe(header(LICENSE + '\n')) .pipe(gulp.dest('build')) .pipe(gulpif(IS_PROD, rename('betterttv.js'))) .pipe(gulpif(IS_PROD, sourcemaps.init({loadMaps: true}))) diff --git a/package.json b/package.json index 13a6116691..42c2583033 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "BetterTTV", "author": "Night", - "version": "7.0.24", + "version": "7.0.25", "description": "BetterTTV enhances Twitch with new features, bug fixes, and reduced clutter.", "main": "betterttv.js", "scripts": { diff --git a/src/css/betterttv-dark.css b/src/css/betterttv-dark.css index 230bbb9a53..330119dfbb 100644 --- a/src/css/betterttv-dark.css +++ b/src/css/betterttv-dark.css @@ -3266,6 +3266,10 @@ button.follow-button, .subscription-modal__right button, .subscription-modal__le background: #202020; } +.new-dashboard .brick--theme-white div.flex__item.flex__item--grow.border-r { + background: #333 !important; +} + .new-dasboard .stats-table { border-top: none; } @@ -3371,7 +3375,9 @@ button.follow-button, .subscription-modal__right button, .subscription-modal__le } #video-manager .c-text-alt, -#video-manager .c-text { +#video-manager .c-text, +.new-dashboard .c-text-alt, +.new-dashboard .c-text { color: #d3d3d3 !important; } @@ -3440,6 +3446,21 @@ button.follow-button, .subscription-modal__right button, .subscription-modal__le /* new dashboard */ +.vod-vertical-nav { + background: #222; + border-right-color: #282828; +} + +.vod-vertical-nav__link:hover, +.vod-vertical-nav__link:active, +.vod-vertical-nav__link:focus, +.vod-vertical-nav__list-item .active, +.vod-vertical-nav__list-item .active:hover, +.vod-vertical-nav__list-item .active:active, +.vod-vertical-nav__list-item .active:focus { + background: #2c2541; +} + .dash-column { border: none; }