From 43b7a1879fc1b6eea72f66dd1d5fd9eaee3baeb7 Mon Sep 17 00:00:00 2001 From: devfake Date: Mon, 22 Jun 2015 16:16:12 +0200 Subject: [PATCH 1/2] styling --- site/client/assets/sass/_nav.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/client/assets/sass/_nav.scss b/site/client/assets/sass/_nav.scss index 1bcf67d..58d78e0 100644 --- a/site/client/assets/sass/_nav.scss +++ b/site/client/assets/sass/_nav.scss @@ -44,5 +44,7 @@ nav { a { padding: 12px; + color: $main; + text-shadow: none; } } \ No newline at end of file From 1efe47d5a1c4941b9123ea261215a41e368779b3 Mon Sep 17 00:00:00 2001 From: devfake Date: Mon, 22 Jun 2015 16:30:11 +0200 Subject: [PATCH 2/2] site config --- public/Config.js | 4 ++++ site/client/app/app.js | 2 ++ 2 files changed, 6 insertions(+) diff --git a/public/Config.js b/public/Config.js index b86dc88..f849143 100644 --- a/public/Config.js +++ b/public/Config.js @@ -5,4 +5,8 @@ Config.Server = { "hostname": "localhost", "port": 16918, secure: false +} + +Config.Site = { + base: "/gwent-online/site/public" } \ No newline at end of file diff --git a/site/client/app/app.js b/site/client/app/app.js index b049be2..0298c43 100644 --- a/site/client/app/app.js +++ b/site/client/app/app.js @@ -1,6 +1,8 @@ var Vue = require('vue'); var router = require('./routes'); +require('../../../public/Config.js'); + Vue.use(require('vue-resource')); Vue.http.headers.common['X-CSRF-TOKEN'] = $('.token').attr('content');