oreolek/voyageur-review
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bootstrap as a npm module instead of a submodule

Browse source
This commit is contained in:
Alexander Yakovlev 2016-06-28 12:21:11 +07:00
parent 715e3bb2ee
commit 9ce79a4fb7
7 changed files with 27 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -1,4 +0,0 @@
[submodule "sass/bootstrap"]
path = sass/bootstrap
url = https://github.com/twbs/bootstrap.git
branch = v4-dev

2
game/begin.coffee
View file

@ -24,8 +24,6 @@ textlink = (content, ref) ->
return "<a href='./_writer_#{ref}' class='once'>#{content}</a>"
actlink = (content, ref) ->
return "<a href='./#{ref}' class='once'>#{content}</a>"
textcycle = (content, ref) ->
return "<a href='./_replacer_#{ref}' class='cycle' id='#{ref}'>#{content}</a>"
# The first room of the game.
# For accessibility reasons the text is provided in HTML, not here.

11
html/index.html
View file

@ -60,12 +60,11 @@
<div id="legal" class="row">
<div id="footleft">
<p>The game was written by <em>(you should put your name here)</em></p>
<p>Approximate play time: not measured.</p>
<p>If you want to know how this game was made, check out <a
href="http://git.oreolek.ru/oreolek/salet" target="_blank">the
source code.</a></p>
<p>Betatesting credit: none yet</p>
<p>
If you want to know how this game was made, check out <a
href="https://git.oreolek.ru/oreolek/salet" target="_blank">the
source code.</a>
</p>
</div>
<div id="footright">
<p id='buttons'>

3
package.json
View file

@ -17,6 +17,7 @@
"gulp-zip": "^3.0.2",
"vinyl-buffer": "^1.0.0",
"vinyl-source-stream": "^1.1.0",
"watchify": "^3.1.0"
"watchify": "^3.1.0",
"bootstrap": "^4.0.0-alpha.2"
}
}

9
sass/_mixins.scss
View file

@ -1,18 +1,19 @@
@mixin halfcolumn() {
@include make-col();
@media (min-width: breakpoint-min(sm)) {
@include make-col(6);
@include make-col-span(6);
}
@media (max-width: breakpoint-max(xs)) {
@include make-col(12);
@include make-col-span(12);
}
}
@mixin col($sm-width, $xs-width) {
@include make-col();
@media (min-width: breakpoint-min(sm)) {
@include make-col($sm-width);
@include make-col-span($sm-width);
}
@media (max-width: breakpoint-max(xs)) {
@include make-col($xs-width);
@include make-col-span($xs-width);
}
}

1
sass/bootstrap

@ -1 +0,0 @@
Subproject commit d8b1b92f66d57ac888f7ab49ca236b7acfa47a2e

33
sass/main.scss
View file

@ -1,21 +1,19 @@
@import "mixins";
@import "variables";
// Bootstrap v4 stripped core
@import "bootstrap/scss/variables";
@import "bootstrap/scss/mixins";
@import "bootstrap/scss/normalize";
@import "bootstrap/scss/print";
@import "bootstrap/scss/reboot";
@import "bootstrap/scss/type";
@import "bootstrap/scss/images";
@import "bootstrap/scss/grid";
@import "bootstrap/scss/buttons";
@import "../node_modules/bootstrap/scss/variables";
@import "../node_modules/bootstrap/scss/mixins";
@import "../node_modules/bootstrap/scss/normalize";
@import "../node_modules/bootstrap/scss/print";
@import "../node_modules/bootstrap/scss/reboot";
@import "../node_modules/bootstrap/scss/type";
@import "../node_modules/bootstrap/scss/images";
@import "../node_modules/bootstrap/scss/grid";
@import "../node_modules/bootstrap/scss/buttons";
//@import "bootstrap/scss/animation";
//@import "bootstrap/scss/dropdown";
@import "bootstrap/scss/nav";
@import "bootstrap/scss/responsive-embed";
@import "bootstrap/scss/utilities";
@import "../node_modules/bootstrap/scss/nav";
@import "../node_modules/bootstrap/scss/responsive-embed";
@import "../node_modules/bootstrap/scss/utilities";
body {
overflow-y: scroll;
@ -30,10 +28,8 @@ body {
@include make-col-offset(1);
}
.label {
overflow: hidden;
margin: auto;
margin: 1em auto;
max-width: 18em;
position: relative;
text-align: center;
}
.subtitle {
@ -157,7 +153,8 @@ body {
#footright {
text-align: right;
@media (min-width: breakpoint-min(sm)) {
@include make-col(4);
@include make-col(3);
@include make-col-offset(2);
}
@media (max-width: breakpoint-max(xs)) {
@include make-col(12);