diff --git a/.gitignore b/.gitignore index 54835c2..09eeec9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ node_modules/ bower_components/ app/lib/components/ *.swp +*.*~ diff --git a/.travis.yml b/.travis.yml index f55d7f5..2197832 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,3 @@ language: node_js node_js: - - 0.8 - -before_script: - - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start - - npm install --quiet -g karma - - ./scripts/web-server.js > /dev/null & - - sleep 1 # give server time to start - -script: - - karma start config/karma.conf.js --no-auto-watch --single-run --reporters=dots --browsers=Firefox - - karma start config/karma-e2e.conf.js --reporters=dots --browsers=Firefox + - "node" diff --git a/app/css/calendar.css b/app/css/calendar.css deleted file mode 100644 index 743e694..0000000 --- a/app/css/calendar.css +++ /dev/null @@ -1,4 +0,0 @@ -.community-calendar li { list-style-type: none; } -.cc-event { border: 1px solid black; } -.cc-event-title { font-weight: bold; } -.cc-event-date {} diff --git a/app/index.html b/app/index.html index fc3a540..1141b7f 100644 --- a/app/index.html +++ b/app/index.html @@ -9,19 +9,18 @@ - + + -
-