Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

better styling

  • Loading branch information...
commit ec9f26b3d0fd76afc6b2093e4d046d2b76a4169c 1 parent 1c99dcb
@ianloic ianloic authored
View
31 mixture/static/mixture.css
@@ -84,4 +84,35 @@ body {
body.two {
background: #cccccc;
+}
+
+#camholder {
+ margin-top: 40px;
+ background-color: #eee;
+ margin-left: auto;
+ margin-right: auto;
+ width: 435px;
+ padding: 10px;
+ border: 1px solid #666666;
+ border-radius: 3px;
+ text-align: center;
+
+ background-color: #d2d2d2;
+ background: -moz-linear-gradient(top, #f2f2f2, #d2d2d2);
+ background: -webkit-gradient(linear, left top, left bottom, from(#f2f2f2), to(#d2d2d2));
+}
+
+#capture {
+ margin-top: 10px;
+ padding: 15px 100px;
+ background-color: #eb2950;
+ background: -moz-linear-gradient(top, #ef5272, #eb2950);
+ background: -webkit-gradient(linear, left top, left bottom, from(#ef5272), to(#eb2950));
+ color: #EDEDED;
+ text-shadow: 0 -0.35mm rgba(0,0,0,0.25);
+ border-radius: 3px;
+ outline: none;
+ -webkit-appearance: none;
+ font-size: 16pt;
+
}
View
2  mixture/templates/base.html
@@ -11,7 +11,7 @@
<div id="header"><img src="/static/mixture_logo.png"></div>
<div id="nav" class="{{ nav }}">
<div class="segment" id="nav-one">
- <span>1. Choose a picture</span>
+ <span>1. Take a picture</span>
<div class="edge" id="edge-left"></div>
</div>
<div class="segment" id="nav-two">
View
10 mixture/templates/upload.html
@@ -5,17 +5,21 @@
{% endblock %}
{% block body %}
-<h1>Take a picture</h1>
<script language="JavaScript">
webcam.set_swf_url('/static/webcam.swf');
webcam.set_shutter_sound(true, '/static/shutter.mp3');
- document.write(webcam.get_html(320, 240));
+
webcam.set_api_url('/upload/');
webcam.set_hook('onComplete', 'my_callback_function');
function my_callback_function(response) {
window.location.href=response;
}
</script>
-<a href="javascript:void(webcam.snap())">Take Snapshot</a>
+ <div id="camholder">
+ <div id="camera"><script>document.write(webcam.get_html(435, 325));</script></div>
+ <button onclick="webcam.snap()" id="capture">Capture!</button>
+ </div>
+
+ </div>
{% endblock %}
Please sign in to comment.
Something went wrong with that request. Please try again.