diff --git a/db.sqlite3 b/db.sqlite3 index 0103b08..5d95e66 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/media/Brachiopods.ctm b/media/Brachiopods.ctm new file mode 100644 index 0000000..f4ffcfb Binary files /dev/null and b/media/Brachiopods.ctm differ diff --git a/media/Calcite.ctm b/media/Calcite.ctm index c8664cb..fe454c8 100644 Binary files a/media/Calcite.ctm and b/media/Calcite.ctm differ diff --git a/media/Muscovite.ctm b/media/Muscovite.ctm index d21fe24..47e38bc 100644 Binary files a/media/Muscovite.ctm and b/media/Muscovite.ctm differ diff --git a/media/Olivine.ctm b/media/Olivine.ctm index 024ba49..36de0d6 100644 Binary files a/media/Olivine.ctm and b/media/Olivine.ctm differ diff --git a/media/Qtz4.ctm b/media/Qtz4.ctm deleted file mode 100644 index 7b7fa3a..0000000 Binary files a/media/Qtz4.ctm and /dev/null differ diff --git a/media/Quartz.ctm b/media/Quartz.ctm index 3176c23..a449700 100644 Binary files a/media/Quartz.ctm and b/media/Quartz.ctm differ diff --git a/media/Ripples.ctm b/media/Ripples.ctm new file mode 100644 index 0000000..48a6d3c Binary files /dev/null and b/media/Ripples.ctm differ diff --git a/three_d_viewer/static/three_d_viewer/css/bootstrap.css b/three_d_viewer/static/three_d_viewer/css/bootstrap.css index bbda4ee..52d2d86 100644 --- a/three_d_viewer/static/three_d_viewer/css/bootstrap.css +++ b/three_d_viewer/static/three_d_viewer/css/bootstrap.css @@ -29,6 +29,8 @@ audio, canvas, video { display: inline-block; + /*width: 100%; + height: 100%;*/ } audio:not([controls]) { @@ -849,6 +851,7 @@ pre code { min-height: 1px; padding-right: 15px; padding-left: 15px; + height: 80%; } .col-xs-1, diff --git a/three_d_viewer/templates/three_d_viewer/base.html b/three_d_viewer/templates/three_d_viewer/base.html index 27b9d15..1364972 100644 --- a/three_d_viewer/templates/three_d_viewer/base.html +++ b/three_d_viewer/templates/three_d_viewer/base.html @@ -6,7 +6,7 @@
Put some intro text sort of stuff here
{% endblock %} diff --git a/three_d_viewer/templates/three_d_viewer/detail.html b/three_d_viewer/templates/three_d_viewer/detail.html index 6ecd062..672ef79 100644 --- a/three_d_viewer/templates/three_d_viewer/detail.html +++ b/three_d_viewer/templates/three_d_viewer/detail.html @@ -372,6 +372,6 @@ function handleMouseMove(event){ {% endblock %} {% block content %} - +