Merge branch 'develop' of github.com:tracman-org/server into develop
commit
a7e8cbfb4b
|
@ -25,7 +25,6 @@ module.exports = {
|
||||||
googleClientSecret: 'XXXXXXXXX_XXXXXXXXXXXXXX',
|
googleClientSecret: 'XXXXXXXXX_XXXXXXXXXXXXXX',
|
||||||
|
|
||||||
// Google maps API key
|
// Google maps API key
|
||||||
googleMapsAPI: 'XXXXXXXXXXXXXXX_XXXXXXXXXXXXXXXXXXXXXXX',
|
googleMapsAPI: 'XXXXXXXXXXXXXXX_XXXXXXXXXXXXXXXXXXXXXXX'
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -30,7 +30,8 @@
|
||||||
"passport-local": "^1.0.0",
|
"passport-local": "^1.0.0",
|
||||||
"passport-twitter": "^1.0.4",
|
"passport-twitter": "^1.0.4",
|
||||||
"slug": "^0.9.1",
|
"slug": "^0.9.1",
|
||||||
"socket.io": "^1.4.4"
|
"socket.io": "^1.4.4",
|
||||||
|
"xss": "^0.3.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"chai": "^3.5.0",
|
"chai": "^3.5.0",
|
||||||
|
|
|
@ -24,8 +24,7 @@ form input, form textarea, form select {
|
||||||
padding: 1% 1.5%;
|
padding: 1% 1.5%;
|
||||||
border-radius: .3vw;
|
border-radius: .3vw;
|
||||||
}
|
}
|
||||||
form input:not(:disabled), form textarea:not(:disabled),
|
form input:not(:disabled), form textarea:not(:disabled), form .input-addon {
|
||||||
form select:not(:disabled), form .input-addon {
|
|
||||||
border: 1px solid #666;
|
border: 1px solid #666;
|
||||||
-moz-box-shadow: inset .11vw .18vw .25vw rgba(0,0,0,.5);
|
-moz-box-shadow: inset .11vw .18vw .25vw rgba(0,0,0,.5);
|
||||||
-webkit-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;
|
color: #666;
|
||||||
}
|
}
|
||||||
|
|
||||||
form select {
|
form select:not(:disabled) {
|
||||||
-moz-box-shadow: inset 0 1px 6px rgba(255,255,255,.2),
|
-moz-box-shadow: inset 0.11vw 0.18vw 0.52vw rgba(255,255,255,.2),
|
||||||
inset -.11vw -.18vw .52vw rgba(0,0,0,.4);
|
inset -0.11vw -0.18vw 0.52vw rgba(0,0,0,.4),
|
||||||
-webkit-box-shadow: inset -.11vw -.18vw .52vw rgba(255,255,255,.2),
|
0.18vw 0.18vw 0.36vw #000;
|
||||||
inset -.11vw -.18vw .52vw rgba(0,0,0,.4);
|
-webkit-box-shadow: inset 0.11vw 0.18vw 0.52vw rgba(255,255,255,.2),
|
||||||
box-shadow: inset 0 .11vw .52vw rgba(255,255,255,.2),
|
inset -0.11vw -0.18vw 0.52vw rgba(0,0,0,.4),
|
||||||
inset 0 .11vw .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 {
|
form select > option {
|
||||||
background: #222;
|
background: #222;
|
||||||
|
|
Loading…
Reference in New Issue