Permalink
Browse files

Merge branch 'master' into gh-pages

  • Loading branch information...
2 parents 89ef38f + ca94c79 commit 467e6c4853e28865fee4953f5b8bb720b96299ea @mmn80 committed Jul 8, 2012
Showing with 7 additions and 6 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 data/data.json
  3. +1 −1 data/datafile_alliances.xml
  4. +1 −1 data/datafile_towns.xml
  5. +3 −3 stylesheets/stylesheet.css
View
@@ -3,3 +3,4 @@ node_modules/*
server.js
javascripts/gl-matrix.js
data/data_*
+.session.vim
View

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -64,7 +64,7 @@ h2 {
#header_right {
float: right;
display: inline-block;
- width: 500px;
+ width: 700px;
margin: 20px 0 0 0;
border: 1px solid #CCCCCC;
border-bottom: none;
@@ -93,10 +93,10 @@ select {
}
/* hosters: comment this to use the xml2json button; also make #header_right.width: 700px */
-#xml2json {
+/*#xml2json {
display: none;
width: 0px;
-}
+}*/

0 comments on commit 467e6c4

Please sign in to comment.