ki9
/
tracman-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:tracman-org/server into develop

master
Keith Irwin 2017-04-17 23:58:27 -04:00
parent 71f51d9f6b 2d5716adad
commit a7e8cbfb4b
No known key found for this signature in database
GPG Key ID: 378933C743E2BBC0
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/env-sample.js
View File

@ -25,7 +25,6 @@ module.exports = {
googleClientSecret: 'XXXXXXXXX_XXXXXXXXXXXXXX',
// Google maps API key
googleMapsAPI: 'XXXXXXXXXXXXXXX_XXXXXXXXXXXXXXXXXXXXXXX',
googleMapsAPI: 'XXXXXXXXXXXXXXX_XXXXXXXXXXXXXXXXXXXXXXX'
};

3
package.json
View File

@ -30,7 +30,8 @@
"passport-local": "^1.0.0",
"passport-twitter": "^1.0.4",
"slug": "^0.9.1",
"socket.io": "^1.4.4"
"socket.io": "^1.4.4",
"xss": "^0.3.3"
},
"devDependencies": {
"chai": "^3.5.0",

20
static/css/form.css
View File

@ -24,8 +24,7 @@ form input, form textarea, form select {
padding: 1% 1.5%;
border-radius: .3vw;
}
form input:not(:disabled), form textarea:not(:disabled),
form select:not(:disabled), form .input-addon {
form input:not(:disabled), form textarea:not(:disabled), form .input-addon {
border: 1px solid #666;
-moz-box-shadow: inset .11vw .18vw .25vw rgba(0,0,0,.5);
-webkit-box-shadow: inset .11vw .18vw .25vw rgba(0,0,0,.5);
@ -103,13 +102,16 @@ form .input-with-addon.right {
color: #666;
}
form select {
-moz-box-shadow: inset 0 1px 6px rgba(255,255,255,.2),
inset -.11vw -.18vw .52vw rgba(0,0,0,.4);
-webkit-box-shadow: inset -.11vw -.18vw .52vw rgba(255,255,255,.2),
inset -.11vw -.18vw .52vw rgba(0,0,0,.4);
box-shadow: inset 0 .11vw .52vw rgba(255,255,255,.2),
inset 0 .11vw .52vw rgba(0,0,0,.4);
form select:not(:disabled) {
-moz-box-shadow: inset 0.11vw 0.18vw 0.52vw rgba(255,255,255,.2),
inset -0.11vw -0.18vw 0.52vw rgba(0,0,0,.4),
0.18vw 0.18vw 0.36vw #000;
-webkit-box-shadow: inset 0.11vw 0.18vw 0.52vw rgba(255,255,255,.2),
inset -0.11vw -0.18vw 0.52vw rgba(0,0,0,.4),
0.18vw 0.18vw 0.36vw #000;
box-shadow: inset 0.11vw 0.18vw 0.52vw rgba(255,255,255,.2),
inset -0.11vw -0.18vw 0.52vw rgba(0,0,0,.4),
0.18vw 0.18vw 0.36vw #000;
}
form select > option {
background: #222;