Merge V2 branch

2015-02-24 14:05:43 +10:00
parent 5adaad5bf8
commit 138494c4b1
82 changed files with 8952 additions and 4985 deletions
--- a/three_d_viewer/static/three_d_viewer/css/styles.css
+++ b/three_d_viewer/static/three_d_viewer/css/styles.css
@@ -385,7 +385,7 @@ img.example {
  padding: 0;
 }
 #cssmenu > ul > li.mainitem {             /*CUSTOM CLASS TEST*/
-  width: 25%;
+  width: 20%;
 }
 #cssmenu > ul > #menu-button {
  display: none;
--- a/three_d_viewer/static/three_d_viewer/images/SiO4
+++ b/three_d_viewer/static/three_d_viewer/images/SiO4
--- a/three_d_viewer/static/three_d_viewer/images/bravais
+++ b/three_d_viewer/static/three_d_viewer/images/bravais
--- a/three_d_viewer/static/three_d_viewer/images/crystal
+++ b/three_d_viewer/static/three_d_viewer/images/crystal
--- a/three_d_viewer/static/three_d_viewer/images/crystal
+++ b/three_d_viewer/static/three_d_viewer/images/crystal
--- a/three_d_viewer/static/three_d_viewer/images/crystal
+++ b/three_d_viewer/static/three_d_viewer/images/crystal
--- a/three_d_viewer/static/three_d_viewer/images/crystal
+++ b/three_d_viewer/static/three_d_viewer/images/crystal
--- a/three_d_viewer/static/three_d_viewer/images/cyclosilicates.png
+++ b/three_d_viewer/static/three_d_viewer/images/cyclosilicates.png
--- a/three_d_viewer/static/three_d_viewer/images/depth
+++ b/three_d_viewer/static/three_d_viewer/images/depth
--- a/three_d_viewer/static/three_d_viewer/images/earth
+++ b/three_d_viewer/static/three_d_viewer/images/earth
--- a/three_d_viewer/static/three_d_viewer/images/element
+++ b/three_d_viewer/static/three_d_viewer/images/element
--- a/three_d_viewer/static/three_d_viewer/images/inosilicates.png
+++ b/three_d_viewer/static/three_d_viewer/images/inosilicates.png
--- a/three_d_viewer/static/three_d_viewer/images/nesosilicates.png
+++ b/three_d_viewer/static/three_d_viewer/images/nesosilicates.png
--- a/three_d_viewer/static/three_d_viewer/images/phyllosilicates.png
+++ b/three_d_viewer/static/three_d_viewer/images/phyllosilicates.png
--- a/three_d_viewer/static/three_d_viewer/images/seismic
+++ b/three_d_viewer/static/three_d_viewer/images/seismic
--- a/three_d_viewer/static/three_d_viewer/images/sorosilicates.png
+++ b/three_d_viewer/static/three_d_viewer/images/sorosilicates.png
--- a/three_d_viewer/static/three_d_viewer/images/tectosilicates.png
+++ b/three_d_viewer/static/three_d_viewer/images/tectosilicates.png