mascully/wingbase
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

convert styles to stylus

Browse source
This commit is contained in:
Asraelite 2016-03-29 14:50:17 +01:00
parent 1160466cf9
commit c47ad92f21
11 changed files with 98 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,2 +1,4 @@
node_modules/ node_modules/
log/ log/
public/static/css/*.css
*.log

50
npm-debug.log
View file

@ -1,50 +0,0 @@
0 info it worked if it ends with ok
1 verbose cli [ '/usr/local/bin/node',
1 verbose cli '/usr/local/bin/npm',
1 verbose cli 'start',
1 verbose cli '--',
1 verbose cli '-p',
1 verbose cli '70' ]
2 info using npm@3.7.3
3 info using node@v5.9.1
4 verbose run-script [ 'prestart', 'start', 'poststart' ]
5 info lifecycle wingbase@0.0.1~prestart: wingbase@0.0.1
6 silly lifecycle wingbase@0.0.1~prestart: no script for prestart, continuing
7 info lifecycle wingbase@0.0.1~start: wingbase@0.0.1
8 verbose lifecycle wingbase@0.0.1~start: unsafe-perm in lifecycle true
9 verbose lifecycle wingbase@0.0.1~start: PATH: /usr/local/lib/node_modules/npm/bin/node-gyp-bin:/home/asraelite/code/nodejs/wingbase/node_modules/.bin:/usr/local/bin:/usr/local/heroku/bin:/home/asraelite/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/home/asraelite/bin:/usr/local/java/jdk1.7.0_45/bin:/home/asraelite/bin:/usr/local/java/jdk1.7.0_45/jre/bin:/home/asraelite/.rvm/bin:/usr/local/bin:/usr/local/bin:/usr/local/go/bin:/home/asraelite/Code/go/bin:/home/asraelite/.rvm/bin
10 verbose lifecycle wingbase@0.0.1~start: CWD: /home/asraelite/code/nodejs/wingbase
11 silly lifecycle wingbase@0.0.1~start: Args: [ '-c', 'node index.js "-p" "70"' ]
12 silly lifecycle wingbase@0.0.1~start: Returned: code: 1 signal: null
13 info lifecycle wingbase@0.0.1~start: Failed to exec start script
14 verbose stack Error: wingbase@0.0.1 start: `node index.js "-p" "70"`
14 verbose stack Exit status 1
14 verbose stack at EventEmitter.<anonymous> (/usr/local/lib/node_modules/npm/lib/utils/lifecycle.js:239:16)
14 verbose stack at emitTwo (events.js:100:13)
14 verbose stack at EventEmitter.emit (events.js:185:7)
14 verbose stack at ChildProcess.<anonymous> (/usr/local/lib/node_modules/npm/lib/utils/spawn.js:24:14)
14 verbose stack at emitTwo (events.js:100:13)
14 verbose stack at ChildProcess.emit (events.js:185:7)
14 verbose stack at maybeClose (internal/child_process.js:850:16)
14 verbose stack at Process.ChildProcess._handle.onexit (internal/child_process.js:215:5)
15 verbose pkgid wingbase@0.0.1
16 verbose cwd /home/asraelite/code/nodejs/wingbase
17 error Linux 3.13.0-24-generic
18 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "start" "--" "-p" "70"
19 error node v5.9.1
20 error npm v3.7.3
21 error code ELIFECYCLE
22 error wingbase@0.0.1 start: `node index.js "-p" "70"`
22 error Exit status 1
23 error Failed at the wingbase@0.0.1 start script 'node index.js "-p" "70"'.
23 error Make sure you have the latest version of node.js and npm installed.
23 error If you do, this is most likely a problem with the wingbase package,
23 error not with npm itself.
23 error Tell the author that this fails on your system:
23 error node index.js "-p" "70"
23 error You can get information on how to open an issue for this project with:
23 error npm bugs wingbase
23 error Or if that isn't available, you can get their info via:
23 error npm owner ls wingbase
23 error There is likely additional logging output above.
24 verbose exit [ 1, true ]

97
public/static/css/styles.css
View file

@ -1,74 +1,59 @@
@font-face { @font-face {
font-family: 'FreePixel'; font-family: 'FreePixel';
src: url('/css/FreePixel.ttf'); src: url("/css/FreePixel.ttf");
} }
* { * {
margin: 0; margin: 0;
padding: 0; padding: 0;
font-family: FreePixel; font-family: FreePixel;
} }
body { body {
overflow: hidden; overflow: hidden;
} }
#gui { #gui {
color: #fff; color: #fff;
} }
.container {
#gui > .container { position: fixed;
position: fixed;
} }
#chat {
#gui #chat { bottom: 0;
bottom: 0; left: 0;
left: 0; width: 400px;
width: 400px; max-height: 300px;
max-height: 300px; overflow: hidden;
overflow: hidden; background-color: rgba(0,0,0,0.55);
background-color: rgba(0, 0, 0, 0.55);
} }
#chat #chat-messages > span {
#gui #chat-messages > span { display: block;
display: block; margin-top: 5px;
margin-top: 5px;
} }
#chat #chat-messages > span > span {
#gui #chat span > span { color: #afa;
color: #afa;
} }
#chat #chat-messages > span > span.teama {
#gui #chat span > span.teama { color: #f76;
color: #f76;
} }
#chat #chat-messages > span > span.teamb {
#gui #chat span > span.teamb { color: #8af;
color: #8af;
} }
#chat #chat-messages > span.server {
#gui #chat span.server { color: #68c;
color: #68c;
} }
#chat input {
#gui #chat input { font-family: inherit;
font-family: inherit; font-size: 16px;
font-size: 16px; border: 0;
border: 0; display: block;
display: block; width: 100%;
width: 100%; padding: 2px 0 2px 0;
padding: 2px 0 2px 0; background-color: rgba(20,20,20,0.5);
background-color: rgba(20, 20, 20, 0.5);
} }
#chat input:focus {
#gui #chat input:focus { background-color: #eee;
background-color: #eee;
} }
#weapons {
#gui #weapons { bottom: 0;
bottom: 0; left: 50%;
left: 50%; transform: translate(-50%, 0);
transform: translate(-50%, 0);
} }
#gui #weapons

3
public/static/css/test.css
View file

@ -1,3 +0,0 @@
# test {
ayy: 5;
}

BIN
public/static/img/favicon_256.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.1 KiB

52
public/stylus/styles.styl Normal file
View file

@ -0,0 +1,52 @@
@font-face {
font-family: 'FreePixel';
src: url('/css/FreePixel.ttf');
}
* {
margin: 0;
padding: 0;
font-family: FreePixel;
}
body {
overflow: hidden;
}
#gui
color #fff
.container
position fixed
#chat
bottom 0
left 0
width 400px
max-height 300px
overflow hidden
background-color rgba(0, 0, 0, 0.55)
#chat-messages
> span
display block
margin-top 5px
> span
color #afa
&.teama
color #f76
&.teamb
color #8af
&.server
color #68c
input
font-family inherit
font-size 16px
border 0
display block
width 100%
padding 2px 0 2px 0
background-color rgba(20, 20, 20, 0.5)
&:focus
background-color #eee
#weapons
bottom 0
left 50%
transform translate(-50%, 0)

4
public/stylus/test.css
View file

@ -1,4 +0,0 @@
# test {
ayy: 5;
b: 2;
}

3
public/stylus/test.styl
View file

@ -1,3 +0,0 @@
# test {
ayy: 5;
}

2
server/game/room/index.js
View file

@ -13,7 +13,7 @@ class Room {
this.teamB = new Set(); this.teamB = new Set();
this.world = new World(this); this.world = new World(this);
this.name = (Math.random() * 100000 | 0).toString(36); this.name = (Math.random() * 100000 | 0).toString(36);
this.tps = 5; this.tps = wingbase.args.development ? 5 : 60;
this.idGenerator = (function*() { this.idGenerator = (function*() {
let i = 0; let i = 0;

3
server/index.js
View file

@ -17,11 +17,10 @@ class WingbaseServer extends ServerInterface {
commander commander
.version(packageJson.version) .version(packageJson.version)
.option('-d, --development', 'run in development mode') .option('-d, --development', 'run in development mode')
.option('-p, --port [port]', 'specify port to use', port) .option('-p, --port <port>', 'specify port to use', parseInt, port)
.parse(process.argv); .parse(process.argv);
this.args = commander; this.args = commander;
console.log(commander.port);
process.on('SIGINT', this.stop.bind(this)); process.on('SIGINT', this.stop.bind(this));
} }

1
server/web/index.js
View file

@ -25,6 +25,7 @@ class WebServer {
app.use(stylus.middleware({ app.use(stylus.middleware({
src: 'public/stylus', src: 'public/stylus',
dest: 'public/static/css', dest: 'public/static/css',
force: wingbase.args.development,
compile: (str, path) => { compile: (str, path) => {
return stylus(str) return stylus(str)
.set('filename', path) .set('filename', path)