Merge remote-tracking branch 'origin/zoom'

blomman9 · May 17, 2014 · ae04353 · ae04353
2 parents 20579e7 + 0e4c1ee
commit ae04353
Show file tree

Hide file tree

Showing 21 changed files with 832 additions and 273 deletions.
diff --git a/static/bootstrap/BootstrapLicense.txt b/static/bootstrap/BootstrapLicense.txt
diff --git a/static/bootstrap/css/bootstrap.min.css b/static/bootstrap/css/bootstrap.min.css
diff --git a/static/bootstrap/fonts/glyphicons-halflings-regular.eot b/static/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/static/bootstrap/fonts/glyphicons-halflings-regular.woff b/static/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/static/bootstrap/js/bootstrap.min.js b/static/bootstrap/js/bootstrap.min.js
diff --git a/static/css/bootstrap.min.css b/static/css/bootstrap.min.css
diff --git a/static/css/style-munstrap.css b/static/css/style-munstrap.css
@@ -0,0 +1,20 @@
+body{
+  padding-top: 70px;
+}
+
+img.i {
+  display: block;
+  margin: 10px auto;
+}
+
+img.img-zoom{
+  cursor: pointer;
+}
+
+div.service-alert{
+  margin-top: 10px;
+}
+
+img#zoom_image{
+  margin-bottom: 15px;
+}
diff --git a/static/fonts/glyphicons-halflings-regular.eot b/static/fonts/glyphicons-halflings-regular.eot