Skip to content

Commit e2902a7

Browse files
committed
mojs-player: add z-index of 100
1 parent 2b28776 commit e2902a7

File tree

11 files changed

+27
-28
lines changed

11 files changed

+27
-28
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mojs-player",
3-
"version": "0.40.0",
3+
"version": "0.40.1",
44
"description": "Player controls for [mojs](mojs.io). Intended to help you to craft `mojs` animation sequences.",
55
"main": "build/mojs-player.min.js",
66
"authors": [

build/mojs-player.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
:: MojsPlayer :: Player controls for [mojs](mojs.io). Intended to help you to craft `mojs` animation sequences.
33
Oleg Solomka @LegoMushroom 2016 MIT
4-
0.40.0
4+
0.40.1
55
*/
66

77
/******/ (function(modules) { // webpackBootstrap
@@ -159,7 +159,7 @@
159159
this._defaults.isHidden = false;
160160

161161
var str = 'mojs-player';
162-
this.revision = '0.40.0';
162+
this.revision = '0.40.1';
163163
this._prefix = str + '-' + this._hashCode(str) + '-';
164164
this._localStorage = this._prefix + 'model';
165165
};
@@ -8928,7 +8928,7 @@
89288928

89298929

89308930
// module
8931-
exports.push([module.id, "._mojs-player_1uepo_4 {\n position: fixed;\n left: 0;\n bottom: 0;\n width: 100%;\n height: 40px;\n height: 40px;\n height: 2.5rem;\n background: rgba( 58, 8, 57, .85 )\n}\n._mojs-player__left_1uepo_1 {\n position: absolute;\n left: 0;\n width: 175px;\n width: 175px;\n width: 10.9375rem\n}\n._mojs-player__mid_1uepo_1 {\n position: absolute;\n left: 175px;\n left: 175px;\n left: 10.9375rem;\n right: 35px;\n right: 35px;\n right: 2.1875rem;\n overflow: hidden;\n padding: 0 20px;\n padding: 0 20px;\n padding: 0 1.25rem\n}\n._mojs-player__right_1uepo_1 {\n position: absolute;\n right: 0\n}\n._mojs-player__hide-button_1uepo_1 {\n position: absolute;\n right: 6px;\n right: 6px;\n right: 0.375rem;\n bottom: 100%\n}\n._mojs-player_1uepo_4._is-hidden_1uepo_40 {\n -webkit-transform: translateY(100%);\n transform: translateY(100%)\n}\n._mojs-player_1uepo_4._is-transition_1uepo_43 {\n -webkit-transition: all .15s ease-out;\n transition: all .15s ease-out\n}\n\n", ""]);
8931+
exports.push([module.id, "._mojs-player_tes6w_4 {\n position: fixed;\n left: 0;\n bottom: 0;\n width: 100%;\n height: 40px;\n height: 40px;\n height: 2.5rem;\n background: rgba( 58, 8, 57, .85 );\n z-index: 100\n}\n._mojs-player__left_tes6w_1 {\n position: absolute;\n left: 0;\n width: 175px;\n width: 175px;\n width: 10.9375rem\n}\n._mojs-player__mid_tes6w_1 {\n position: absolute;\n left: 175px;\n left: 175px;\n left: 10.9375rem;\n right: 35px;\n right: 35px;\n right: 2.1875rem;\n overflow: hidden;\n padding: 0 20px;\n padding: 0 20px;\n padding: 0 1.25rem\n}\n._mojs-player__right_tes6w_1 {\n position: absolute;\n right: 0\n}\n._mojs-player__hide-button_tes6w_1 {\n position: absolute;\n right: 6px;\n right: 6px;\n right: 0.375rem;\n bottom: 100%\n}\n._mojs-player_tes6w_4._is-hidden_tes6w_41 {\n -webkit-transform: translateY(100%);\n transform: translateY(100%)\n}\n._mojs-player_tes6w_4._is-transition_tes6w_44 {\n -webkit-transition: all .15s ease-out;\n transition: all .15s ease-out\n}\n\n", ""]);
89328932

89338933
// exports
89348934

@@ -8938,13 +8938,13 @@
89388938
/***/ function(module, exports) {
89398939

89408940
module.exports = {
8941-
"mojs-player": "_mojs-player_1uepo_4",
8942-
"mojs-player__left": "_mojs-player__left_1uepo_1",
8943-
"mojs-player__mid": "_mojs-player__mid_1uepo_1",
8944-
"mojs-player__right": "_mojs-player__right_1uepo_1",
8945-
"mojs-player__hide-button": "_mojs-player__hide-button_1uepo_1",
8946-
"is-hidden": "_is-hidden_1uepo_40",
8947-
"is-transition": "_is-transition_1uepo_43"
8941+
"mojs-player": "_mojs-player_tes6w_4",
8942+
"mojs-player__left": "_mojs-player__left_tes6w_1",
8943+
"mojs-player__mid": "_mojs-player__mid_tes6w_1",
8944+
"mojs-player__right": "_mojs-player__right_tes6w_1",
8945+
"mojs-player__hide-button": "_mojs-player__hide-button_tes6w_1",
8946+
"is-hidden": "_is-hidden_tes6w_41",
8947+
"is-transition": "_is-transition_tes6w_44"
89488948
};
89498949

89508950
/***/ }

build/mojs-player.min.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/blocks/mojs-player.postcss.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
width: 100%;
99
height: calc( 40 * $PX );
1010
background: rgba( 58, 8, 57, .85 );
11+
z-index: 100;
1112

1213
$btnWidth: 35;
1314
$btnCount: 5;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"mojs-player":"_mojs-player_1uepo_4","mojs-player__left":"_mojs-player__left_1uepo_1","mojs-player__mid":"_mojs-player__mid_1uepo_1","mojs-player__right":"_mojs-player__right_1uepo_1","mojs-player__hide-button":"_mojs-player__hide-button_1uepo_1","is-hidden":"_is-hidden_1uepo_40","is-transition":"_is-transition_1uepo_43"}
1+
{"mojs-player":"_mojs-player_tes6w_4","mojs-player__left":"_mojs-player__left_tes6w_1","mojs-player__mid":"_mojs-player__mid_tes6w_1","mojs-player__right":"_mojs-player__right_tes6w_1","mojs-player__hide-button":"_mojs-player__hide-button_tes6w_1","is-hidden":"_is-hidden_tes6w_41","is-transition":"_is-transition_tes6w_44"}

gulpfile.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var shell = require("gulp-shell");
1515
var babel = require("gulp-babel");
1616

1717
var devFolder = '', distFolder = '', currentVersion = 0;
18-
var distMoFile = devFolder + 'build/mojs-player.js';
18+
var distMoFile = devFolder + 'build/mojs-player.js';
1919
var libMainFile = devFolder + 'lib/mojs-player.js';
2020

2121
var paths = {
@@ -48,6 +48,7 @@ gulp.task('babel-lib', function(e){
4848
gulp.task('minify', function() {
4949
return gulp.src(distMoFile)
5050
.pipe(plumber())
51+
.pipe(livereload())
5152
.pipe(insert.transform(function(contents) {
5253
return credits + contents;
5354
}))
@@ -105,7 +106,7 @@ gulp.task('update-main-file-version', function(e){
105106
});
106107

107108
gulp.task('default', function(){
108-
var server = livereload();
109+
livereload.listen();
109110
gulp.run('get-current-version');
110111
gulp.watch(paths.src.babel, [ 'babel-lib' ]);
111112
gulp.watch(distMoFile, [ 'minify' ]);

index.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,13 @@
3434
<script src="build/mojs-player.js"></script>
3535

3636
<script>
37-
3837
let el = document.querySelector( '#js-el' );
39-
4038
let tw = new mojs.Tween({
4139
duration: 4000,
4240
onUpdate (p) {
4341
el.style.transform = `translateX(${ 1000 * p }px)`;
4442
}
4543
});
46-
4744
let mojsPlayer = new MojsPlayer({
4845
add: tw,
4946
isPlaying: true,
@@ -52,7 +49,7 @@
5249
// className: 'lalal'
5350
// isSaveState: false
5451
});
55-
5652
</script>
53+
5754
</body>
5855
</html>

js/mojs-player.babel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class MojsPlayer extends Module {
3434
this._defaults.isHidden = false;
3535

3636
let str = 'mojs-player';
37-
this.revision = '0.40.0';
37+
this.revision = '0.40.1';
3838
this._prefix = `${str}-${ this._hashCode( str ) }-`;
3939
this._localStorage = `${ this._prefix }model`;
4040
}

lib/mojs-player.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
:: MojsPlayer :: Player controls for [mojs](mojs.io). Intended to help you to craft `mojs` animation sequences.
33
Oleg Solomka @LegoMushroom 2016 MIT
4-
0.40.0
4+
0.40.1
55
*/
66

77
'use strict';
@@ -95,7 +95,7 @@ var MojsPlayer = function (_Module) {
9595
this._defaults.isHidden = false;
9696

9797
var str = 'mojs-player';
98-
this.revision = '0.40.0';
98+
this.revision = '0.40.1';
9999
this._prefix = str + '-' + this._hashCode(str) + '-';
100100
this._localStorage = this._prefix + 'model';
101101
};

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "mojs-player",
33
"description": "Player controls for mojs playback",
4-
"version": "0.40.0",
4+
"version": "0.40.1",
55
"license": "MIT",
66
"private": false,
77
"scripts": { },

0 commit comments

Comments
 (0)