1
0
mirror of https://github.com/exane/not-gwent-online synced 2024-10-31 10:36:53 +00:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
exane 2015-06-22 17:26:09 +02:00
commit 16dfa9f2b2
3 changed files with 8 additions and 0 deletions

View File

@ -6,3 +6,7 @@ Config.Server = {
"port": 16918, "port": 16918,
secure: false secure: false
} }
Config.Site = {
base: "/gwent-online/site/public"
}

View File

@ -1,6 +1,8 @@
var Vue = require('vue'); var Vue = require('vue');
var router = require('./routes'); var router = require('./routes');
require('../../../public/Config.js');
Vue.use(require('vue-resource')); Vue.use(require('vue-resource'));
Vue.http.headers.common['X-CSRF-TOKEN'] = $('.token').attr('content'); Vue.http.headers.common['X-CSRF-TOKEN'] = $('.token').attr('content');

View File

@ -44,5 +44,7 @@ nav {
a { a {
padding: 12px; padding: 12px;
color: $main;
text-shadow: none;
} }
} }