diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 626e6ad..48f257d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,17 @@ + + - + + + + + + + + @@ -31,7 +40,7 @@ - + @@ -46,14 +55,32 @@ + + + + + + + + + + + + + + + + + + + + - + - - - + @@ -68,10 +95,19 @@ - - + + - + + + + + + + + + + @@ -86,37 +122,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -129,7 +138,7 @@ - + @@ -166,7 +175,6 @@ @@ -216,6 +230,7 @@ + @@ -362,7 +377,6 @@ - @@ -478,27 +492,7 @@ - + + - + @@ -658,11 +673,10 @@ - - + @@ -695,34 +709,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -732,16 +718,12 @@ - - - + - - - + @@ -755,19 +737,7 @@ - - - - - - - - - - - - - + @@ -831,9 +801,7 @@ - - - + @@ -847,19 +815,7 @@ - - - - - - - - - - - - - + @@ -922,13 +878,6 @@ - - - - - - - @@ -945,9 +894,7 @@ - - - + @@ -966,23 +913,12 @@ - - - + - - - - - - - - - - + @@ -996,19 +932,7 @@ - - - - - - - - - - - - - + @@ -1041,24 +965,6 @@ - - - - - - - - - - - - - - - - - - @@ -1073,9 +979,69 @@ + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/db.sqlite3 b/db.sqlite3 index a97a3a0..e60a7f9 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/three_d_viewer/static/three_d_viewer/css/styles.css b/three_d_viewer/static/three_d_viewer/css/styles.css index c91a8df..4135e8c 100644 --- a/three_d_viewer/static/three_d_viewer/css/styles.css +++ b/three_d_viewer/static/three_d_viewer/css/styles.css @@ -133,10 +133,15 @@ body { } #footer { + left: 0; + right: 0; + bottom: 0; + display: block; + position: fixed; width: 100%; - margin-left: auto; + /*margin-left: auto;*/ background-color: #CCCCCC; - z-index: 900; + z-index: 1000; } #footer ul { @@ -199,11 +204,16 @@ body { #logo { width: 20%; height: 44px; - background-color: #FFFFFF; - text-align: center; + background-color: #CCCCCC; + text-align: left; float: left; } +.logoImage { + width: auto; + height: 44px; +} + #logo p { padding-top: 5%; } @@ -270,8 +280,18 @@ body { } + /* TEXT STYLES */ +ul.introList { + list-style-type: none; + } + +td.term { + +padding-right: 100px; +} + #mainText p { font-size: 12pt; font-family: 'quicksandregular', Helvetica, sans-serif; @@ -280,6 +300,14 @@ body { color: #000; } +#theoryText p { + font-size: 12pt; + font-family: 'quicksandregular', Helvetica, sans-serif; + line-height: 16pt; + text-align: left; + color: #000; +} + #mineralContainer p { font-size: 12pt; font-family: 'quicksandregular', Helvetica, sans-serif; @@ -311,6 +339,17 @@ h2.theoryHeadings { } +h3.headings { + font-size: 14pt; + font-family: 'quicksandbold', Helvetica, sans-serif; + line-height: 18pt; + text-align: left; + color: #000; + padding-top: 5px; + padding-bottom: 5px; + +} + img.example { width: 100%; height: auto; @@ -628,7 +667,7 @@ img.example { margin: 0; padding: 0; } -/*CUSTOM CLASS TEST*/ + /*CUSTOM CLASS TEST*/ #mineralMenu > ul > li.mainitem { width: 100%; } @@ -644,7 +683,7 @@ img.example { font-size: 14px; font-weight: bold; padding: 15px 20px; - color: #7a8189; + color: #7a8189 ; text-transform: uppercase; -webkit-transition: color 0.25s ease-out; -moz-transition: color 0.25s ease-out; @@ -706,6 +745,7 @@ img.example { z-index: -2; } #mineralMenu ul ul { + width: 84.5%; /* TESTING HERE!!!!!!!!!!!!!! */ position: absolute; left: -9999px; top: 70px; @@ -720,9 +760,11 @@ img.example { #mineralMenu ul ul ul { top: 37px; padding-left: 5px; + width: 100%; } #mineralMenu ul ul li { position: relative; + width: 100%; } #mineralMenu > ul > li:hover > ul { left: auto; @@ -735,7 +777,7 @@ img.example { opacity: 1; } #mineralMenu ul ul li a { - width: 130px; + width: 100%; border-bottom: 1px solid #eee; padding: 10px 20px; font-size: 10px; @@ -783,6 +825,7 @@ img.example { -o-transform: rotateY(180deg); transform: rotateY(180deg); } + @media all and (max-width: 800px), only screen and (-webkit-min-device-pixel-ratio: 2) and (max-width: 1024px), only screen and (min--moz-device-pixel-ratio: 2) and (max-width: 1024px), only screen and (-o-min-device-pixel-ratio: 2/1) and (max-width: 1024px), only screen and (min-device-pixel-ratio: 2) and (max-width: 1024px), only screen and (min-resolution: 192dpi) and (max-width: 1024px), only screen and (min-resolution: 2dppx) and (max-width: 1024px) { #mineralMenu { width: auto; diff --git a/three_d_viewer/static/three_d_viewer/images/Thumbs.db b/three_d_viewer/static/three_d_viewer/images/Thumbs.db new file mode 100644 index 0000000..1991d8b Binary files /dev/null and b/three_d_viewer/static/three_d_viewer/images/Thumbs.db differ diff --git a/three_d_viewer/static/three_d_viewer/images/bowen.jpg b/three_d_viewer/static/three_d_viewer/images/bowen.jpg new file mode 100644 index 0000000..54115c6 Binary files /dev/null and b/three_d_viewer/static/three_d_viewer/images/bowen.jpg differ diff --git a/three_d_viewer/static/three_d_viewer/images/logo_main.png b/three_d_viewer/static/three_d_viewer/images/logo_main.png new file mode 100644 index 0000000..da84181 Binary files /dev/null and b/three_d_viewer/static/three_d_viewer/images/logo_main.png differ diff --git a/three_d_viewer/templates/three_d_viewer/acknowledgements.html b/three_d_viewer/templates/three_d_viewer/acknowledgements.html index c430b13..1f6b7fc 100644 --- a/three_d_viewer/templates/three_d_viewer/acknowledgements.html +++ b/three_d_viewer/templates/three_d_viewer/acknowledgements.html @@ -3,7 +3,7 @@ {% block content %}
-

Acknowledgements



+

Acknowledgements



3DVOL has been been developed by Shane Frischkorn, Andy Bates, Christoph Shrank, Mark Barry, Linda Nothdurft, and Luke Nothdurft.

diff --git a/three_d_viewer/templates/three_d_viewer/base.html b/three_d_viewer/templates/three_d_viewer/base.html index c53274a..f513fcf 100644 --- a/three_d_viewer/templates/three_d_viewer/base.html +++ b/three_d_viewer/templates/three_d_viewer/base.html @@ -18,7 +18,7 @@