Merge branch 'master' of https://github.com/sfrischkorn/rockviewer

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,

three_d_viewer/templates/three_d_viewer/base.html

@@ -6,7 +6,7 @@
         <title>{% block title %}3D Sample Viewer{% endblock %}</title>
 
         {% block includes %}
-        <link href="{% static "three_d_viewer/css/bootstrap.min.css" %}" rel="stylesheet" media="screen" />
+        <link href="{% static "three_d_viewer/css/bootstrap.css" %}" rel="stylesheet" media="screen" />
         <script type="text/javascript" src="{% static "three_d_viewer/js/jquery-2.0.3.js" %}"></script>
         <script type="text/javascript" src="{% static "three_d_viewer/js/bootstrap.min.js" %}"></script>
         {% endblock %}
@@ -30,7 +30,7 @@
                     {% endblock %}
                 </div>
 
-                <div class="col-md-8">
+                <div id="contentdiv" class="col-md-8" style="border:1px solid black" height="100%">
                     {% block content %}
                     <p>Put some intro text sort of stuff here</p>
                     {% endblock %}

three_d_viewer/templates/three_d_viewer/detail.html

@@ -372,6 +372,6 @@ function handleMouseMove(event){
 {% endblock %}
 
 {% block content %}
-    <canvas id="canvas" style="border: 1px dotted #bfbfbf;" width="640" height="480"></canvas>
+    <canvas id="canvas" style="border: 1px dotted #bfbfbf;" width="640px" height="480px"></canvas>
     <div><br><span id="progress" style="color: red"></span></div>
 {% endblock %}