Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into gh-pages

  • Loading branch information...
commit 467e6c4853e28865fee4953f5b8bb720b96299ea 2 parents 89ef38f + ca94c79
@clnx authored
View
1  .gitignore
@@ -3,3 +3,4 @@ node_modules/*
server.js
javascripts/gl-matrix.js
data/data_*
+.session.vim
View
2  data/data.json
1 addition, 1 deletion not shown
View
2  data/datafile_alliances.xml
1 addition, 1 deletion not shown
View
2  data/datafile_towns.xml
1 addition, 1 deletion not shown
View
6 stylesheets/stylesheet.css
@@ -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;
-}
+}*/
Please sign in to comment.
Something went wrong with that request. Please try again.