Permalink
Browse files

Merge branch 'master' into gh-pages

  • Loading branch information...
2 parents 467e6c4 + abc07c7 commit 681c382c9b86b98bd503ea17fae12513c7d59cbe @mmn80 committed Jul 8, 2012
Showing with 4 additions and 3 deletions.
  1. +1 −0 .gitignore
  2. +3 −3 stylesheets/stylesheet.css
View
@@ -4,3 +4,4 @@ server.js
javascripts/gl-matrix.js
data/data_*
.session.vim
+*.sh
@@ -64,7 +64,7 @@ h2 {
#header_right {
float: right;
display: inline-block;
- width: 700px;
+ width: 500px;
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 681c382

Please sign in to comment.