Salet 2.0 / Bootstrap 4 update
This commit is contained in:
parent
4687bb6ecf
commit
b84b45b0f1
|
@ -26,7 +26,7 @@ $.getJSON('game/procgen/'+i18n.lang+'.json', (data) ->
|
||||||
$.holdReady( false )
|
$.holdReady( false )
|
||||||
)
|
)
|
||||||
|
|
||||||
salet.init = () ->
|
$(document).on("init", () ->
|
||||||
salet.character.lastBeat = () ->
|
salet.character.lastBeat = () ->
|
||||||
return salet.progress.sequence.length - salet.character.beat
|
return salet.progress.sequence.length - salet.character.beat
|
||||||
salet.character.newBeat = () ->
|
salet.character.newBeat = () ->
|
||||||
|
@ -38,6 +38,7 @@ salet.init = () ->
|
||||||
audio.currentTime = 0
|
audio.currentTime = 0
|
||||||
audio.volume = 1.0
|
audio.volume = 1.0
|
||||||
audio.play()
|
audio.play()
|
||||||
|
)
|
||||||
|
|
||||||
$(document).ready(() ->
|
$(document).ready(() ->
|
||||||
window.addEventListener('popstate', (event) ->
|
window.addEventListener('popstate', (event) ->
|
||||||
|
|
32
package.json
32
package.json
|
@ -1,28 +1,28 @@
|
||||||
{
|
{
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"cson": "^4.0.0",
|
"cson": "^4.1.0",
|
||||||
"glob": "^7.1.1",
|
"glob": "^7.1.2",
|
||||||
"improv": "^0.8.0",
|
"improv": "^1.0.0",
|
||||||
"salet": "^1.5.4"
|
"salet": "^2.0.0"
|
||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"babel-polyfill": "^6.20.0",
|
"babel-polyfill": "^6.26.0",
|
||||||
"bootstrap": "^4.0.0-alpha.2",
|
"bootstrap": "^4.0.0-alpha.2",
|
||||||
"browser-sync": "^2.18.2",
|
"browser-sync": "^2.18.13",
|
||||||
"browserify": "^13.1.1",
|
"browserify": "^14.5.0",
|
||||||
"browserify-shim": "^3.8.8",
|
"browserify-shim": "^3.8.14",
|
||||||
"coffee-script": "^1.12.0",
|
"coffeescript": "^2.0.0",
|
||||||
"coffeeify": "^2.1.0",
|
"coffeeify": "^3.0.1",
|
||||||
"gulp": "^3.8.11",
|
"gulp": "^3.8.11",
|
||||||
"gulp-coffee": "^2.3.3",
|
"gulp-coffee": "^2.3.4",
|
||||||
"gulp-concat": "^2.6.1",
|
"gulp-concat": "^2.6.1",
|
||||||
"gulp-sass": "^3.0.0",
|
"gulp-sass": "^3.1.0",
|
||||||
"gulp-uglify": "^2.0.0",
|
"gulp-uglify": "^3.0.0",
|
||||||
"gulp-util": "^3.0.4",
|
"gulp-util": "^3.0.8",
|
||||||
"gulp-zip": "^3.0.2",
|
"gulp-zip": "^4.0.0",
|
||||||
"vinyl-buffer": "^1.0.0",
|
"vinyl-buffer": "^1.0.0",
|
||||||
"vinyl-source-stream": "^1.1.0",
|
"vinyl-source-stream": "^1.1.0",
|
||||||
"watchify": "^3.1.0"
|
"watchify": "^3.9.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,8 +9,8 @@ $btn-bg: grey;
|
||||||
$btn-color: lighten($btn-bg, 50%);
|
$btn-color: lighten($btn-bg, 50%);
|
||||||
$secondary-bg: #F1EED9;
|
$secondary-bg: #F1EED9;
|
||||||
|
|
||||||
$brand-primary: lighten($body-color, 20%);
|
$primary: lighten($body-color, 20%);
|
||||||
$brand-danger: darken($body-bg, 30%);
|
$danger: darken($body-bg, 30%);
|
||||||
|
|
||||||
$waycolor: $link-color;
|
$waycolor: $link-color;
|
||||||
$text_background: $body-bg; // can be btn-bg
|
$text_background: $body-bg; // can be btn-bg
|
||||||
|
|
|
@ -2,9 +2,9 @@
|
||||||
@import "mixins";
|
@import "mixins";
|
||||||
@import "variables";
|
@import "variables";
|
||||||
// Bootstrap v4 stripped core
|
// Bootstrap v4 stripped core
|
||||||
@import "../node_modules/bootstrap/scss/variables";
|
@import "../node_modules/bootstrap/scss/functions";
|
||||||
@import "../node_modules/bootstrap/scss/mixins";
|
@import "../node_modules/bootstrap/scss/mixins";
|
||||||
@import "../node_modules/bootstrap/scss/normalize";
|
@import "../node_modules/bootstrap/scss/variables";
|
||||||
@import "../node_modules/bootstrap/scss/print";
|
@import "../node_modules/bootstrap/scss/print";
|
||||||
@import "../node_modules/bootstrap/scss/reboot";
|
@import "../node_modules/bootstrap/scss/reboot";
|
||||||
@import "../node_modules/bootstrap/scss/type";
|
@import "../node_modules/bootstrap/scss/type";
|
||||||
|
@ -13,8 +13,7 @@
|
||||||
@import "../node_modules/bootstrap/scss/buttons";
|
@import "../node_modules/bootstrap/scss/buttons";
|
||||||
|
|
||||||
@import "../node_modules/bootstrap/scss/nav";
|
@import "../node_modules/bootstrap/scss/nav";
|
||||||
@import "../node_modules/bootstrap/scss/responsive-embed";
|
@import "../node_modules/bootstrap/scss/navbar";
|
||||||
@import "../node_modules/bootstrap/scss/utilities";
|
|
||||||
|
|
||||||
body {
|
body {
|
||||||
overflow-y: scroll;
|
overflow-y: scroll;
|
||||||
|
|
Loading…
Reference in New Issue