Merge branch 'master' of github.com:edx/mitx into feature-dcadams-usermanagement

This commit is contained in:
dcadams
2013-05-08 14:48:29 -07:00
101 changed files with 2264 additions and 601 deletions

View File

@@ -156,7 +156,7 @@
<div id="calculator_wrapper">
<form id="calculator">
<div class="input-wrapper">
<input type="text" id="calculator_input" />
<input type="text" id="calculator_input" title="Calculator Input Field" />
<div class="help-wrapper">
<a href="#">Hints</a>
@@ -176,8 +176,8 @@
</dl>
</div>
</div>
<input id="calculator_button" type="submit" value="="/>
<input type="text" id="calculator_output" readonly />
<input id="calculator_button" type="submit" title="Calculate" value="="/>
<input type="text" id="calculator_output" title="Calculator Output Field" readonly />
</form>
</div>