Skip to content

Commit

Permalink
Merge branch 'temp' into cleanupanswers
Browse files Browse the repository at this point in the history
  • Loading branch information
Christi committed Jan 2, 2012
2 parents 0bc46ca + c52cc03 commit 9d28066
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion exercises/linear_equations_1.html
Expand Up @@ -28,7 +28,7 @@
<div><code><var>A</var>x = <var>D</var></code></div>

<div class="solution" data-type="multiple">
<p><code>x</code> = <span class="sol"><var> D / A </var></span></p>
<p><code>x =</code> <span class="sol"><var> D / A </var></span></p>
</div>

</div>
Expand Down
2 changes: 1 addition & 1 deletion exercises/linear_equations_2.html
Expand Up @@ -19,7 +19,7 @@
<p class="question">Solve for <code>x</code>:</p>
<div><code><var>A</var>x + <var>B</var> = <var>D</var></code></div>
<div class="solution" data-type="multiple">
<p><code>x</code> = <span class="sol"><var>( D - B ) / A </var></span></p>
<p><code>x =</code> <span class="sol"><var>( D - B ) / A </var></span></p>
</div>

</div>
Expand Down
2 changes: 1 addition & 1 deletion exercises/linear_equations_3.html
Expand Up @@ -22,7 +22,7 @@
<div><code><var>A</var>x + <var>B</var> = <var>C</var>x + <var>D</var></code></div>

<div class="solution" data-type="multiple">
<p><code>x</code> = <span class="sol"><var>( D - B ) / ( A - C )</var></span></p>
<p><code>x =</code> <span class="sol"><var>( D - B ) / ( A - C )</var></span></p>
</div>
</div>
</div>
Expand Down
11 changes: 7 additions & 4 deletions exercises/triangle_angles_1.html
Expand Up @@ -62,7 +62,8 @@
tr.drawLabels();
</div>
</div>
<div class="solution"><var>TRIANGLE[ 0 ][ 2 ]</var></div>

<div class="solution" data-type="multiple"><p><code>X =</code><span class="sol"><var>TRIANGLE[ 0 ][ 2 ]</var></span></div>
<div class="hints">
<p>Angles in a triangle add up to 180 degrees.</p>
<p>We know two angles of the triangle.</p>
Expand All @@ -86,7 +87,8 @@
tr.drawLabels();
</div>
</div>
<div class="solution"><var>TRIANGLE[ 0 ][ 2 ]</var></div>
<div class="solution" data-type="multiple"><p><code>X =</code><span class="sol"><var>TRIANGLE[ 0 ][ 2 ]</var></span></div>

<div class="hints">
<p>Angles in a triangle add up to 180 degrees.</p>
<p>Because this triangle has two sides equal, it also has two angles equal (it is an isosceles triangle).</p>
Expand Down Expand Up @@ -115,7 +117,8 @@
tr.drawLabels();
</div>
</div>
<div class="solution"><var>TRIANGLE[ 0 ][ 0 ]</var></div>
<div class="solution" data-type="multiple"><p><code>X =</code><span class="sol"><var>TRIANGLE[ 0 ][ 0 ]</var></span></div>

<div class="hints">
<p>Angles in a triangle add up to 180 degrees.</p>
<p>Because this triangle has two sides equal, it also has two angles equal (it is an isosceles triangle).</p>
Expand Down Expand Up @@ -146,7 +149,7 @@
tr.drawLabels();
</div>
</div>
<div class="solution"><var>TRIANGLE[ 0 ][ 0 ]</var></div>
<div class="solution" data-type="multiple"><p><code>X =</code><span class="sol"><var>TRIANGLE[ 0 ][ 0 ]</var></span></div>
<div class="hints">
<p>Angles in a triangle add up to 180 degrees.</p>
<p>Because this triangle has two sides equal, it also has two angles equal (it is an isosceles triangle).</p>
Expand Down

0 comments on commit 9d28066

Please sign in to comment.