Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix up exercises that are too wide for tutorials

Reviewers: marcos, tom, desmond

Differential Revision: http://phabricator.khanacademy.org/D737
  • Loading branch information...
commit 064281eac8e87bf5f48f3eb515ac382610c15004 1 parent 8183d56
@beneater beneater authored
Showing with 327 additions and 258 deletions.
  1. +26 −23 exercises/adding_vectors.html
  2. +1 −1  exercises/angle_types.html
  3. +3 −3 exercises/angles_1.html
  4. +3 −3 exercises/angles_2.html
  5. +2 −2 exercises/completing_the_square_1.html
  6. +1 −1  exercises/completing_the_square_2.html
  7. +3 −2 exercises/compound_inequalities.html
  8. +3 −3 exercises/conditional_statements_2.html
  9. +1 −1  exercises/congruency_postulates.html
  10. +4 −2 exercises/congruent_triangles_2.html
  11. +4 −4 exercises/converting_between_point_slope_and_standard_form.html
  12. +3 −3 exercises/counting_1_alternative.html
  13. +1 −1  exercises/creating_bar_charts_1.html
  14. +1 −0  exercises/creating_box_and_whisker_plots.html
  15. +2 −2 exercises/decimals_on_the_number_line_2.html
  16. +13 −7 exercises/dividing_complex_numbers.html
  17. +5 −0 exercises/domain_and_range_0.5.html
  18. +1 −1  exercises/empirical_rule.html
  19. +1 −1  exercises/equation_of_a_circle_1.html
  20. +1 −1  exercises/equation_of_a_circle_2.html
  21. +5 −6 exercises/equation_of_a_hyperbola.html
  22. +3 −3 exercises/equation_of_an_ellipse.html
  23. +1 −1  exercises/exploring_mean_and_median.html
  24. +2 −1  exercises/exploring_standard_deviation_1.html
  25. +8 −4 exercises/factor_expressions_by_grouping.html
  26. +3 −3 exercises/fractions_cut_and_copy_1.html
  27. +8 −8 exercises/fractions_cut_and_copy_2.html
  28. +1 −1  exercises/fractions_on_the_number_line_1.html
  29. +1 −1  exercises/fractions_on_the_number_line_2.html
  30. +18 −18 exercises/fractions_on_the_number_line_3.html
  31. +7 −8 exercises/graphs_of_sine_and_cosine.html
  32. +3 −2 exercises/identifying_points_1.html
  33. +6 −1 exercises/midpoint_formula.html
  34. +6 −7 exercises/multiplication_0.5.html
  35. +6 −5 exercises/multiplication_1.html
  36. +5 −0 exercises/multiplying_and_dividing_scientific_notation.html
  37. +10 −10 exercises/multiplying_fractions_word_problems.html
  38. +2 −2 exercises/ordering_negative_numbers.html
  39. +3 −5 exercises/parabola_intuition_3.html
  40. +1 −1  exercises/percentage_word_problems_2.html
  41. +6 −6 exercises/point_slope_form.html
  42. +2 −2 exercises/quotient_rule.html
  43. +5 −0 exercises/range_of_a_function.html
  44. +1 −1  exercises/reading_bar_charts_2.html
  45. +1 −1  exercises/reading_bar_charts_3.html
  46. +10 −5 exercises/reading_pictographs_1.html
  47. +10 −5 exercises/reading_pictographs_2.html
  48. +7 −5 exercises/reading_stem_and_leaf_plots.html
  49. +4 −4 exercises/rounding_numbers.html
  50. +2 −2 exercises/rounding_whole_numbers.html
  51. +2 −2 exercises/scientific_notation_intuition.html
  52. +3 −3 exercises/shaded_areas.html
  53. +1 −1  exercises/signs_of_a_parabola.html
  54. +2 −1  exercises/similar_triangles_1.html
  55. +2 −1  exercises/similar_triangles_2.html
  56. +1 −1  exercises/slope_intercept_form.html
  57. +2 −2 exercises/slope_of_a_line.html
  58. +4 −4 exercises/solving_quadratics_by_factoring.html
  59. +4 −4 exercises/solving_quadratics_by_factoring_2.html
  60. +4 −4 exercises/solving_quadratics_by_taking_the_square_root.html
  61. +2 −1  exercises/solving_similar_triangles_1.html
  62. +7 −2 exercises/square_roots_2.html
  63. +4 −4 exercises/standard_deviation.html
  64. +1 −1  exercises/telling_time.html
  65. +1 −1  exercises/telling_time_0.5.html
  66. +5 −0 exercises/triangle_inequality_theorem.html
  67. +8 −5 exercises/trig_addition_identities.html
  68. +2 −2 exercises/understanding_decimals_place_value.html
  69. +3 −3 exercises/understanding_moving_the_decimal.html
  70. +4 −4 exercises/variance.html
  71. +4 −0 exercises/views_of_a_function.html
  72. +1 −0  utils/answer-types.js
  73. +2 −2 utils/derivative-intuition.js
  74. +25 −25 utils/graphie-helpers-arithmetic.js
  75. +4 −4 utils/graphie-helpers.js
  76. +2 −1  utils/math.js
  77. +1 −1  utils/slice-clone.js
View
49 exercises/adding_vectors.html
@@ -4,6 +4,11 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Adding vectors</title>
<script src="../khan-exercise.js"></script>
+ <style type="text/css">
+ #answer_area input[type=text] {
+ width: 40px;
+ }
+ </style>
</head>
<body>
<div class="exercise">
@@ -17,34 +22,32 @@
<div class="problems">
<div>
- <div class="question">
- <div id="graph" class="graphie" style="float: right">
- graphInit({
- range: 10,
- scale: 20,
- tickStep: 1,
- labelStep: 1,
- unityLabels: false,
- labelFormat: function( s ) { return "\\small{" + s + "}"; },
- axisArrows: "<->"
- });
+ <p class="question">What is <code>\vec a + \vec b</code>?</p>
- line( [0, 0], [AX, AY], { stroke: "#6495ed", arrows: "->" } );
- line( [0, 0], [BX, BY], { stroke: "#28ae7b", arrows: "->" } );
+ <p><code>\begin{align*}
+ \vec a &= <var>AX</var> \hat\imath + <var>AY</var> \hat\jmath \\
+ \vec b &= <var>BX</var> \hat\imath + <var>BY</var> \hat\jmath
+ \end{align*}</code></p>
- var AF = 1 + 0.8 / sqrt( AX * AX + AY * AY );
- label( [AF * AX, AF * AY], "\\vec a", { color: "#6495ed" } );
+ <div id="graph" class="graphie">
+ graphInit({
+ range: 10,
+ scale: 20,
+ tickStep: 1,
+ labelStep: 1,
+ unityLabels: false,
+ labelFormat: function( s ) { return "\\small{" + s + "}"; },
+ axisArrows: "<->"
+ });
- var BF = 1 + 0.8 / sqrt( BX * BX + BY * BY );
- label( [BF * BX, BF * BY], "\\vec b", { color: "#28ae7b" } );
- </div>
+ line( [0, 0], [AX, AY], { stroke: "#6495ed", arrows: "->" } );
+ line( [0, 0], [BX, BY], { stroke: "#28ae7b", arrows: "->" } );
- <p>What is <code>\vec a + \vec b</code>?</p>
+ var AF = 1 + 0.8 / sqrt( AX * AX + AY * AY );
+ label( [AF * AX, AF * AY], "\\vec a", { color: "#6495ed" } );
- <p><code>\begin{align*}
- \vec a &= <var>AX</var> \hat\imath + <var>AY</var> \hat\jmath \\
- \vec b &= <var>BX</var> \hat\imath + <var>BY</var> \hat\jmath
- \end{align*}</code></p>
+ var BF = 1 + 0.8 / sqrt( BX * BX + BY * BY );
+ label( [BF * BX, BF * BY], "\\vec b", { color: "#28ae7b" } );
</div>
<div class="solution" data-type="multiple">
View
2  exercises/angle_types.html
@@ -43,7 +43,7 @@
DIFF == 90 ? path([ [1 * cos( ANGLE_ONE_R ), 1 * sin( ANGLE_ONE_R )], [sqrt(2) * cos( ANGLE_ONE_R + PI / 4 ), sqrt(2) * sin( ANGLE_ONE_R + PI / 4)], [1 * cos( ANGLE_TWO_R ), 1 * sin( ANGLE_TWO_R )] ]) : arc( [0,0], 1, ANGLE_ONE, ANGLE_TWO );
addMouseLayer();
- graph.protractor = new Protractor( [22, 0] );
+ graph.protractor = new Protractor( [14, -8] );
</div>
</div>
View
6 exercises/angles_1.html
@@ -244,7 +244,7 @@
<div class="graphie" id="supplementary-and-triangle">
init({
range: [[-9, 6], [-3, 5]],
- scale: [40, 40]
+ scale: [33, 33]
});
style({
@@ -402,7 +402,7 @@
<div class="graphie" id="parallel-and-triangle">
init( {
range: [[-9, 9.5], [-5.7, 8]],
- scale: [30, 30]
+ scale: [27, 27]
});
style( {
@@ -577,7 +577,7 @@
<div class="graphie" id="alternate-exterior-and-complementary">
init( {
range: [[-6, 8], [-5, 5]],
- scale: [50, 50]
+ scale: [35, 35]
} );
style( {
View
6 exercises/angles_2.html
@@ -173,7 +173,7 @@
<div class="problem">
<div class="graphie" id="opposite-parallel">
init({
- range: [[-7, 6], [-5, 5.2]],
+ range: [[-6.5, 6], [-5, 5.2]],
scale: [40, 40]
});
@@ -337,7 +337,7 @@
<div class="graphie" id="star1">
init({
range: [[-10, 10], [-7, 10]],
- scale: [30, 30]
+ scale: [25, 25]
});
@@ -482,7 +482,7 @@
<div class="graphie" id="star2">
init({
range: [[-10, 10], [-7, 10]],
- scale: [30, 30]
+ scale: [25, 25]
});
View
4 exercises/completing_the_square_1.html
@@ -6,7 +6,7 @@
<script src="../khan-exercise.js"></script>
<style type="text/css">
#answer_area .short input[type=text] {
- width: 60px;
+ width: 32px;
}
</style>
</head>
@@ -28,7 +28,7 @@
<div class="set-sol"><var>X1</var></div>
<div class="set-sol"><var>X2</var></div>
<div class="input-format">
- <p><code>x = \quad</code><span class="entry short"></span><code>\quad \text{or} \quad x = \quad</code><span class="entry short"></span></p>
+ <p><code>x = {}</code><span class="entry short"></span><code>\quad\text{or}\quad x = {}</code><span class="entry short"></span></p>
</div>
</div>
</div>
View
2  exercises/completing_the_square_2.html
@@ -6,7 +6,7 @@
<script src="../khan-exercise.js"></script>
<style type="text/css">
#answer_area .short input[type=text] {
- width: 60px;
+ width: 32px;
}
</style>
</head>
View
5 exercises/compound_inequalities.html
@@ -137,7 +137,8 @@
var end = max( SOLUTION[0], SOLUTION[1] ) + randRange( 2, 5 );
init({
- range: [ [ start - 1, end + 1 ], [ -1, 1 ] ]
+ range: [ [ start - 1, end + 1 ], [ -1, 1 ] ],
+ scale: 28
});
numberLine( start, end, null, start );
@@ -148,7 +149,7 @@
style({ stroke: COLOR[i], fill: COLOR[i], strokeWidth: 3.5, arrows: "->" });
path([ [ SOLUTION[i] + 0.15 * ( LESS_THAN[i] ? -1 : 1 ), y_placement[i] ], [ LESS_THAN[i] ? start : end, y_placement[i] ] ]);
style({ stroke: COLOR[i], fill: INCLUSIVE[i] ? COLOR[i] : null });
- circle( [ SOLUTION[i], y_placement[i] ], 0.15 );
+ circle( [ SOLUTION[i], y_placement[i] ], 0.2 );
}
</div>
<div data-if="IS_OR">
View
6 exercises/conditional_statements_2.html
@@ -222,8 +222,8 @@
<var id="QUESTIONS">
<!-- event verb, event noun, conclusion verb, conclusion noun -->
[["go to", "a birthday party", "eat", "cake"],
- ["eat", "a sandwich", "turn into", "superman"],
- ["turn into", "superman", "eat", "a sandwich"],
+ ["eat", "a sandwich", "turn into", "superman"],
+ ["turn into", "superman", "eat", "a sandwich"],
["watch", "a movie", "eat", "popcorn"],
["miss", "the bus", "ride with", "my dad"],
["go in", "the rain", "take", "my umbrella"],
@@ -235,7 +235,7 @@
["play", "basketball", "make", "a three point shot"],
["go to", "the Olympics", "win", "a gold medal"],
["go to", "the softball game", "hit", "a home run"],
- ["finish", "my homework", "play", "on the computer"],
+ ["finish", "my homework", "play", "on the computer"],
["win", "a gold medal", "go to", "Disneyland"]]
</var>
<var id="EVENT_V,EVENT_N,CONC_V,CONC_N">randFromArray(QUESTIONS)</var>
View
2  exercises/congruency_postulates.html
@@ -53,7 +53,7 @@
<em>Your triangle can be anywhere. There is no need to line up the two triangles.</em>
<div class="graphie" id="triangles">
init({
- range: [ [ -7, 7 ], [ -7, 7 ] ]
+ range: [ [ -6.2, 6.2 ], [ -5.9, 6.5 ] ]
});
addMouseLayer();
initCongruence({ triangle: TRIANGLE, type: TYPE, reflected: REFLECTED });
View
6 exercises/congruent_triangles_2.html
@@ -44,7 +44,8 @@
<div class="question">
<div class="graphie" id="triangle">
init({
- range: [ [-1, 15 ], [ -7, 2.5 ] ]
+ range: [ [-1, 15 ], [ -7, 2.5 ] ],
+ scale: 31
})
TR_A.draw();
TR_A.drawLabels();
@@ -152,7 +153,8 @@
<div class="question">
<div class="graphie" id="oppTriangle">
init({
- range: [ [-1, 15 ], [ -7, 2.5 ] ]
+ range: [ [-1, 15 ], [ -7, 2.5 ] ],
+ scale: 32
})
TR_A.draw();
TR_A.drawLabels();
View
8 exercises/converting_between_point_slope_and_standard_form.html
@@ -6,7 +6,7 @@
<script src="../khan-exercise.js"></script>
<style type="text/css">
#answer_area input[type=text] {
- width: 30px;
+ width: 23px;
}
</style>
</head>
@@ -32,7 +32,7 @@
<!-- Custom validation is used to allow for x to be any value. If we allowed a finite range for x, then we could have a set of solutions.-->
<div class="solution" data-type="custom">
<div class="instruction">
- <p><code>y - \space</code><input id="solution_y" type="text"></input><code> \quad = \quad</code><input id="solution_m" type="text"></input><code>(x - \space</code><input id="solution_x" type="text"></input><code>)</code></p>
+ <p><code>y - {}</code><input id="solution_y" type="text"></input><code>{} = {}</code><input id="solution_m" type="text"></input><code>(x - {}</code><input id="solution_x" type="text"></input><code>)</code></p>
</div>
<div class="guess">
[ $( '#solution_x' ).val(), $( '#solution_y' ).val(), $( '#solution_m' ).val() ]
@@ -128,8 +128,8 @@
</p>
<div class="solution" data-type="multiple">
<p>
- <span class="sol" data-fallback="1"><var>A</var></span><code>\space x \space + \space </code>
- <span class="sol" data-fallback="1"><var>B</var></span><code>\space y \quad = \quad </code>
+ <span class="sol" data-fallback="1"><var>A</var></span><code>\space x + {}</code>
+ <span class="sol" data-fallback="1"><var>B</var></span><code>\space y = {}</code>
<span class="sol"><var>C</var></span>
</p>
<div class="example">three integers to complete the standard form equation</div>
View
6 exercises/counting_1_alternative.html
@@ -107,8 +107,8 @@
<div>
<div class="graphie" id="loaf">
init({
- range: [ [ -1.5, 18.5 ], [ -4, -0.5 ] ],
- scale: [ 30, 50 ]
+ range: [ [ -0.5, 17.5 ], [ -4, -0.5 ] ],
+ scale: [ 27, 50 ]
});
graph.loaf = raphael.set();
@@ -200,7 +200,7 @@
<div class="graphie" id="fence">
init({
range: [ [ -1, LENGTH + 1 ], [ -2, 3.5 ] ],
- scale: [ 600 / ( LENGTH + 2 ), 20 ]
+ scale: [ 475 / ( LENGTH + 2 ), 20 ]
});
style({ stroke: null, fill: BLUE, opacity: 0.3 }, function() {
View
2  exercises/creating_bar_charts_1.html
@@ -41,7 +41,7 @@
<div class="graphie" id="barchart">
init({
range: [ [ -2, 17 ], [ -3, 12 ] ],
- scale: [ 30, 30 ]
+ scale: [ 26, 30 ]
});
addMouseLayer();
View
1  exercises/creating_box_and_whisker_plots.html
@@ -12,6 +12,7 @@
box-shadow: 0 0 0;
-moz-box-shadow: 0 0 0;
-webkit-box-shadow: 0 0 0;
+ padding-right: 0;
}
.sortable > ul > li {
width: 28px;
View
4 exercises/decimals_on_the_number_line_2.html
@@ -25,8 +25,8 @@
<p>Move the <strong><code>\color{orange}{\text{orange dot}}</code></strong> to <strong><code>\color{orange}{<var>SOLUTION</var>}</code></strong> on the number line. The distance between adjacent tick marks is 0.5.</p>
<div class="graphie" id="number-line">
init({
- range: [ [LOWER_BOUND - 1, UPPER_BOUND + 1], [-1, 1] ],
- scale: [120, 40]
+ range: [ [LOWER_BOUND - 0.3, UPPER_BOUND + 0.3], [-1, 1] ],
+ scale: [108, 40]
});
style({arrows: "&gt;"});
View
20 exercises/dividing_complex_numbers.html
@@ -73,25 +73,31 @@
<p>
The squares in the denominator are evaluated and subtracted.
</p>
- <code>
+ <p><code>
\qquad \dfrac{(<var>A_REP_COLORED</var>) \cdot (<var>CONJUGATE_COLORED</var>)}
{(<var>B_REAL_COLORED</var>)^2 - (<var>B_IMAG_COLORED</var>i)^2} =
- \dfrac{(<var>A_REP_COLORED</var>) \cdot (<var>CONJUGATE_COLORED</var>)}
+ </code></p>
+ <p><code>
+ \qquad \dfrac{(<var>A_REP_COLORED</var>) \cdot (<var>CONJUGATE_COLORED</var>)}
{<var>B_REAL * B_REAL</var> + <var>B_IMAG * B_IMAG</var>} =
- \dfrac{(<var>A_REP_COLORED</var>) \cdot (<var>CONJUGATE_COLORED</var>)}
+ </code></p>
+ <p><code>
+ \qquad \dfrac{(<var>A_REP_COLORED</var>) \cdot (<var>CONJUGATE_COLORED</var>)}
{<var>B_REAL * B_REAL + B_IMAG * B_IMAG</var>}
- </code>
+ </code></p>
</div>
<div>
<p>
Afterwards, the numerator is multiplied using the distributive property.
</p>
- <code>
+ <p><code>
\qquad \dfrac{(<var>A_REP_COLORED</var>) \cdot (<var>CONJUGATE_COLORED</var>)}
{<var>DENOMINATOR</var>} =
- \dfrac{(<var>A_REAL_COLORED</var> \cdot \color{<var>BLUE</var>}{<var>negParens( B_REAL )</var>}) + (<var>A_IMAG_COLORED</var> \cdot \color{<var>BLUE</var>}{<var>negParens( B_REAL )</var>} i) + (<var>A_REAL_COLORED</var> \cdot \color{<var>BLUE</var>}{<var> B_CONJUGATE_IMAG_COLORED </var>}i) + (<var>A_IMAG_COLORED</var> \cdot \color{<var>BLUE</var>}{<var> B_CONJUGATE_IMAG_COLORED </var>} i^2)}
+ </code></p>
+ <p><code>
+ \qquad \dfrac{(<var>A_REAL_COLORED</var> \cdot \color{<var>BLUE</var>}{<var>negParens( B_REAL )</var>}) + (<var>A_IMAG_COLORED</var> \cdot \color{<var>BLUE</var>}{<var>negParens( B_REAL )</var>} i) + (<var>A_REAL_COLORED</var> \cdot \color{<var>BLUE</var>}{<var> B_CONJUGATE_IMAG_COLORED </var>}i) + (<var>A_IMAG_COLORED</var> \cdot \color{<var>BLUE</var>}{<var> B_CONJUGATE_IMAG_COLORED </var>} i^2)}
{<var>DENOMINATOR</var>}
- </code>
+ </code></p>
<p>
All multiplications are evaluated.
</p>
View
5 exercises/domain_and_range_0.5.html
@@ -4,6 +4,11 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Domain and range of a function 0.5</title>
<script src="../khan-exercise.js"></script>
+ <style type="text/css">
+ #answer_area input[type=text] {
+ width: 40px;
+ }
+ </style>
</head>
<body>
<div class="exercise">
View
2  exercises/empirical_rule.html
@@ -60,7 +60,7 @@
<div class="graphie" id="normaldist">
init({
range: [ [ MEAN - STDDEV * 3.5, MEAN + STDDEV * 3.5 ], [ -1.5, 4.3 ] ],
- scale: [ 600 / ( STDDEV * 7 ), 40 ]
+ scale: [ 475 / ( STDDEV * 7 ), 40 ]
});
style({ stroke: "#bbb" }, function() {
View
2  exercises/equation_of_a_circle_1.html
@@ -6,7 +6,7 @@
<script src="../khan-exercise.js"></script>
<style type="text/css">
#answer_area .short input[type=text] {
- width: 60px;
+ width: 40px;
}
</style>
</head>
View
2  exercises/equation_of_a_circle_2.html
@@ -6,7 +6,7 @@
<script src="../khan-exercise.js"></script>
<style type="text/css">
#answer_area .short input[type=text] {
- width: 60px;
+ width: 40px;
}
</style>
</head>
View
11 exercises/equation_of_a_hyperbola.html
@@ -6,8 +6,8 @@
<script src="../khan-exercise.js"></script>
<style type="text/css">
#answer_area input[type="text"] {
- margin: 0 0 0 5px;
- width: 30px;
+ margin: 0 0 0 0;
+ width: 28px;
}
</style>
</head>
@@ -39,10 +39,9 @@
</div>
<div class="solution" data-type="multiple">
- <p>
- <code>y = \pm (</code><span class="sol" data-fallback="1"><var>B/A</var></span>
- <code>)(x + </code><span class="sol" data-fallback="0"><var>-H</var></span>
- <code>) + </code><span class="sol" data-fallback="0"><var>K</var></span>
+ <p style="font-size: 11px;">
+ <code>y = \pm </code><span class="sol" data-fallback="1"><var>B/A</var></span>
+ <code>(x + </code><span class="sol" data-fallback="0"><var>-H</var></span><code>) + </code><span class="sol" data-fallback="0"><var>K</var></span>
</p>
<p class="example">enter integers, <em>simplified</em> fractions, or <em>exact</em> decimals for each term</p>
View
6 exercises/equation_of_an_ellipse.html
@@ -6,7 +6,7 @@
<script src="../khan-exercise.js"></script>
<style type="text/css">
#answer_area .short input[type=text] {
- width: 60px;
+ width: 40px;
}
</style>
</head>
@@ -37,8 +37,8 @@
<div class="solution" data-type="multiple">
<p class="short"><code>(h, k) = (</code><span class="sol"><var>H</var></span><code>,</code> <span class="sol"><var>K</var></span><code>)</code></p>
- <p>Major radius = <span class="sol"><var>MAJ</var></span></p>
- <p>Minor radius = <span class="sol"><var>MIN</var></span></p>
+ <p>Major radius = <span class="sol short"><var>MAJ</var></span></p>
+ <p>Minor radius = <span class="sol short"><var>MIN</var></span></p>
</div>
</div>
</div>
View
2  exercises/exploring_mean_and_median.html
@@ -51,7 +51,7 @@
init({
range: [
- [LOWER_BOUND - 1, UPPER_BOUND + 1],
+ [LOWER_BOUND - 0.3, UPPER_BOUND + 0.2],
[-3, 3]],
scale: 35
});
View
3  exercises/exploring_standard_deviation_1.html
@@ -25,7 +25,8 @@
graph.numPoints = POINTS;
init({
- range: [ [LOWER_BOUND - 0.1, UPPER_BOUND + 0.1], [-2, 5] ]
+ range: [ [LOWER_BOUND - 0.3, UPPER_BOUND + 0.3], [-2, 5] ],
+ scale: 35
});
style({ stroke: "#bbb" });
View
12 exercises/factor_expressions_by_grouping.html
@@ -6,7 +6,7 @@
<script src="../khan-exercise.js"></script>
<style type="text/css">
#answer_area input[type=text] {
- width: 30px;
+ width: 30px;
}
</style>
</head>
@@ -47,9 +47,13 @@
</div>
<div class="input-format">
- <p class="entry" data-type="multiple">
- <code>(</code><span class="sol"></span><code>\space r + \space</code><span class="sol"></span><code>)(</code><span class="sol"></span><code>\space s + \space</code><span class="sol"></span><code>)</code>
- </p>
+ <div class="entry" data-type="multiple" style="font-size: 14px;">
+ <div style="float: left;">
+ <code>(</code><span class="sol"></span><code>\space r + \space</code><span class="sol"></span><code>)</code>
+ </div><div style="float: right;">
+ <code>(</code><span class="sol"></span><code>\space s + \space</code><span class="sol"></span><code>)</code>
+ </div>
+ </div>
</div>
<p class="example">enter an integer for each coefficient</p>
<p class="example">pay attention to the sign of each number you enter to be sure the entire equation is correct</p>
View
6 exercises/fractions_cut_and_copy_1.html
@@ -33,21 +33,21 @@
<div class="graphie" id="parent_block">
initSliceClone(["current_block"]);
- init({range: [[0, 1], [0, 1]], scale: [600, 25 ]});
+ init({range: [[0, 1], [0, 1]], scale: [500, 25 ]});
rectchart([1, 0], ["#e00", "#999"]);
</div>
<p>Current Block:</p>
<div class="graphie" id="current_block">
- init({ range: [[0, 1], [0, 1] ], scale: [600, 25]});
+ init({ range: [[0, 1], [0, 1] ], scale: [500, 25]});
rectchart([1, 0], ["#e00", "#999"]);
</div>
<p>Goal Block:</p>
<div class="graphie" id="goal_block">
- init({range: [[0, 1], [0, 1]], scale: [600 * ANSWER, 25]});
+ init({range: [[0, 1], [0, 1]], scale: [500 * ANSWER, 25]});
rectchart([1, 0], [BLUE, "#999"]);
</div>
View
16 exercises/fractions_cut_and_copy_2.html
@@ -36,56 +36,56 @@
<div class="graphie" id="parent_block">
initSliceClone(["current_block_1", "current_block_2"]);
- init({range: [[0, 1], [0, 1]], scale: [ 600, 25]});
+ init({range: [[0, 1], [0, 1]], scale: [ 500, 25]});
rectchart([1, 0], ["#e00", "#999"]);
</div>
<p>Current Block 1:</p>
<div class="graphie" id="current_block_1">
- init({range: [[0, 1], [0, 1]], scale: [600, 25]});
+ init({range: [[0, 1], [0, 1]], scale: [500, 25]});
rectchart([1, 0], ["#e00", "#999"]);
</div>
<p>Goal Block 1:</p>
<div class="graphie" id="goal_block_2">
- init({range: [[0, 1], [0, 1]], scale: [600 * ANSWER_1, 25]});
+ init({range: [[0, 1], [0, 1]], scale: [500 * ANSWER_1, 25]});
rectchart([1, 0], [BLUE, "#999"]);
</div>
<p>Current Block 2:</p>
<div class="graphie" id="current_block_2">
- init({range: [[0, 1], [0, 1]], scale: [600, 25]});
+ init({range: [[0, 1], [0, 1]], scale: [500, 25]});
rectchart([1, 0], ["#e00", "#999"]);
</div>
<p>Goal Block 2:</p>
<div class="graphie" id="goal_block_2">
- init({range: [[0, 1], [0, 1]], scale: [600 * ANSWER_2, 25]});
+ init({range: [[0, 1], [0, 1]], scale: [500 * ANSWER_2, 25]});
rectchart([1, 0], [ORANGE, "#999"]);
</div>
<div class="solution" data-type="custom">
<div class="instruction">
<div style="margin-bottom: 10px;">
- <span>Cut Starting Block into</span>
+ <span>Cut Starting Block into</span><br>
<input type="button" value="-" class="simple-button" onclick="KhanUtil.changePieces(false)">
<span id="pieces" style="display: inline-block; width: 54px; text-align: center;">1 piece</span>
<input type="button" value="+" class="simple-button" onclick="KhanUtil.changePieces(true)">
</div>
<div style="margin-bottom: 10px;">
- <span style="display:inline-block; text-align: right; width: 120px;">Copy Current Block 1</span>
+ <span style="display:inline-block; text-align: right; width: 120px;">Copy Current Block 1</span><br>
<input type="button" value="-" class="simple-button" onclick="KhanUtil.changeTimes(false, 'current_block_1')" disabled="disabled">
<span id="current_block_1_times" style="display: inline-block; width: 54px; text-align: center;">1 time</span>
<input type="button" value="+" class="simple-button" onclick="KhanUtil.changeTimes(true, 'current_block_1')">
</div>
<div style="margin-bottom: 10px;">
- <span style="display:inline-block; text-align: right; width: 120px;">Copy Current Block 2</span>
+ <span style="display:inline-block; text-align: right; width: 120px;">Copy Current Block 2</span><br>
<input type="button" value="-" class="simple-button" onclick="KhanUtil.changeTimes(false, 'current_block_2')" disabled="disabled">
<span id="current_block_2_times" style="display: inline-block; width: 54px; text-align: center;">1 time</span>
<input type="button" value="+" class="simple-button" onclick="KhanUtil.changeTimes(true, 'current_block_2')">
View
2  exercises/fractions_on_the_number_line_1.html
@@ -31,7 +31,7 @@
<div class="graphie" id="number-line">
init({
- range: [ [LOWER_BOUND - 0.3, UPPER_BOUND + 0.4], [-1, 1] ],
+ range: [ [LOWER_BOUND - 0.1, UPPER_BOUND + 0.1], [-1, 1] ],
scale: [80*SCALE, 40]
});
View
2  exercises/fractions_on_the_number_line_2.html
@@ -32,7 +32,7 @@
<div class="graphie" id="number-line">
init({
- range: [ [LOWER_BOUND - 1, UPPER_BOUND + 1], [-1, 1] ],
+ range: [ [LOWER_BOUND - 0.5, UPPER_BOUND + 0.5], [-1, 1] ],
scale: [80 * SCALE, 40]
});
View
36 exercises/fractions_on_the_number_line_3.html
@@ -31,41 +31,41 @@
<div class="graphie" id="number-line">
init({
- range: [ [LOWER_BOUND - 1, UPPER_BOUND + 1], [-1, 1] ],
- scale: [80, 40]
+ range: [ [(LOWER_BOUND - 0.5) * abs(DENOMINATOR), (UPPER_BOUND + 0.5) * abs(DENOMINATOR)], [-1, 1] ],
+ scale: [70 / abs(DENOMINATOR), 40]
});
style({arrows: "&gt;"});
- line( [ 0, 0 ], [ UPPER_BOUND + 0.25, 0 ] );
+ line( [ 0, 0 ], [ (UPPER_BOUND + 0.25) * abs(DENOMINATOR), 0 ] );
style({arrows: "-&gt;"});
- line( [ 0, 0 ], [ LOWER_BOUND - 0.25, 0 ] );
+ line( [ 0, 0 ], [ (LOWER_BOUND - 0.25) * abs(DENOMINATOR), 0 ] );
style({arrows: ""});
for ( var x = LOWER_BOUND; x &lt;= UPPER_BOUND; x++ ) {
- line( [ x, -0.2 ], [ x, 0.2 ] );
+ line( [ x * abs(DENOMINATOR), -0.2 ], [ x * abs(DENOMINATOR), 0.2 ] );
}
style({ stroke: GREEN, strokeWidth: 3.5 });
- line( [ LOWER_BOUND, -0.2], [LOWER_BOUND, 0.2]);
- label( [ LOWER_BOUND, -0.53 ], LOWER_BOUND, "center", { color: GREEN });
+ line( [ LOWER_BOUND * abs(DENOMINATOR), -0.2], [LOWER_BOUND * abs(DENOMINATOR), 0.2]);
+ label( [ LOWER_BOUND * abs(DENOMINATOR), -0.53 ], LOWER_BOUND, "center", { color: GREEN });
- line( [ UPPER_BOUND, -0.2], [UPPER_BOUND, 0.2]);
- label( [ UPPER_BOUND, -0.53 ], UPPER_BOUND, "center", { color: GREEN });
+ line( [ UPPER_BOUND * abs(DENOMINATOR), -0.2], [UPPER_BOUND * abs(DENOMINATOR), 0.2]);
+ label( [ UPPER_BOUND * abs(DENOMINATOR), -0.53 ], UPPER_BOUND, "center", { color: GREEN });
line( [ 0, -0.2], [0, 0.2]);
label( [ 0, -0.53 ], "0", "center", { color: GREEN });
addMouseLayer();
- graph.movablePoint = addMovablePoint({ constraints: { constrainY: true }, snapX: 1 / DENOMINATOR });
+ graph.movablePoint = addMovablePoint({ constraints: { constrainY: true }, snapX: 1 });
graph.movablePoint.onMove = function( x, y ) {
- return [ min( max( LOWER_BOUND, x ), UPPER_BOUND ), y ];
+ return [ min( max( LOWER_BOUND * abs(DENOMINATOR), x ), UPPER_BOUND * abs(DENOMINATOR) ), y ];
};
</div>
</div>
<div class="solution" data-type="custom">
<span class="instruction"> Move the orange dot to select your answer. </span>
- <div class="guess"> graph.movablePoint.coord[0] </div>
+ <div class="guess"> graph.movablePoint.coord[0] / abs(DENOMINATOR) </div>
<div class="validator-function">
if ( guess === 0 ) {
return "";
@@ -92,8 +92,8 @@
and <code>\color{green}{<var>M_WHOLE + (SOLUTION > 1 ? 1 : -1)</var>}</code> on the number line.</p>
<div class="graphie" data-update="number-line">
style({ stroke: "#FFA500", strokeWidth: 3.5 });
- line( [M_WHOLE, -0.2], [M_WHOLE, 0.2]);
- line( [M_WHOLE + (SOLUTION > 0 ? 1 : -1), -0.2], [M_WHOLE + (SOLUTION > 0 ? 1 : -1), 0.2]);
+ line( [M_WHOLE * abs(DENOMINATOR), -0.2], [M_WHOLE * abs(DENOMINATOR), 0.2]);
+ line( [(M_WHOLE + (SOLUTION > 0 ? 1 : -1)) * abs(DENOMINATOR), -0.2], [(M_WHOLE + (SOLUTION > 0 ? 1 : -1)) * abs(DENOMINATOR), 0.2]);
</div>
</div>
@@ -103,19 +103,19 @@
on the number line.</p>
<div class="graphie" data-update="number-line">
style({ stroke: GREEN, fill: "#6495ED", strokeWidth: 3.5, arrows: "-&gt;" });
- line( [ M_WHOLE, 0 ], [ SOLUTION, 0 ] );
+ line( [ M_WHOLE * abs(DENOMINATOR), 0 ], [ SOLUTION * abs(DENOMINATOR), 0 ] );
graph.movablePoint.visibleShape.toFront();
style({ stroke: "#FFA500", strokeWidth: 3.5, arrows: "" });
- line( [M_WHOLE, -0.2], [M_WHOLE, 0.2]);
- line( [M_WHOLE + (SOLUTION > 0 ? 1 : -1), -0.2], [M_WHOLE + (SOLUTION > 0 ? 1 : -1), 0.2]);
+ line( [M_WHOLE * abs(DENOMINATOR), -0.2], [M_WHOLE * abs(DENOMINATOR), 0.2]);
+ line( [(M_WHOLE + (SOLUTION > 0 ? 1 : -1)) * abs(DENOMINATOR), -0.2], [(M_WHOLE + (SOLUTION > 0 ? 1 : -1)) * abs(DENOMINATOR), 0.2]);
</div>
</div>
<div>
<div class="graphie" data-update="number-line">
label( [ SOLUTION, -0.83 ], NUMBER, "center", { color: "#FFA500" });
- graph.movablePoint.moveTo( SOLUTION, 0 );
+ graph.movablePoint.moveTo( SOLUTION * abs(DENOMINATOR), 0 );
</div>
<p>The orange number shows where <code>\color{orange}{<var>NUMBER</var>}</code> is on the number line.</p>
</div>
View
15 exercises/graphs_of_sine_and_cosine.html
@@ -14,7 +14,7 @@
</script>
<style type="text/css">
#answer_area input[type=text] {
- width: 30px;
+ width: 25px;
}
</style>
</head>
@@ -28,10 +28,10 @@
<var id="PERIOD">2 * PI * HSCALE</var>
<var id="VRANGE">3.5</var>
- <var id="HRANGE">4.5 * PI * HSCALE</var>
+ <var id="HRANGE">3.5 * PI * HSCALE</var>
<var id="PIXVSCALE">150 / VRANGE</var>
- <var id="PIXHSCALE">300 / HRANGE</var>
+ <var id="PIXHSCALE">250 / HRANGE</var>
<var id="FUNCS">VSCALE + "*" + FN + "(x/" + HSCALE + ")"</var>
@@ -80,14 +80,13 @@
<p class="question">What is <code>f(x)</code>?</p>
- <p class="solution" data-type="multiple"><code>f(x)=</code>
+ <div class="solution" data-type="multiple"><div style="font-size: 11px;">
+ <code>f(x)=</code>
<span class="sol short" data-fallback="1"><var>VSCALE</var></span>
<!-- we make the default fn type blank so users don't think the default value of sin or cos is important, not sure if this is necessary, though -->
<span class="sol" data-type="list" data-choices="['', 'cos', 'sin']"><var>FN</var></span>
- <code>(\ </code>
- <span class="sol short" data-fallback="1"><var>1 / HSCALE</var></span>
- <code>\ x)</code>
- </p>
+ <code>(</code><span class="sol short" data-fallback="1"><var>1 / HSCALE</var></span><code>x)</code>
+ </div></div>
</div>
</div>
View
5 exercises/identifying_points_1.html
@@ -85,8 +85,9 @@
<div class="graphie" data-update="grid">
var point = POINTS[FORGOTTEN];
- label( point, PAIR( point ) + "\\text{ was not graphed.}", "above right" );
- circle( point, 0.15, { stroke: "red", fill: "red"} );
+ label( point, PAIR( point ), "above right");
+ label( point, "\\text{was not graphed.}", "right" );
+ circle( point, 0.3, { stroke: "red" } );
</div>
</div>
</div>
View
7 exercises/midpoint_formula.html
@@ -43,6 +43,11 @@
return pos;
}
</script>
+ <style type="text/css">
+ #answer_area input[type=text] {
+ width: 40px;
+ }
+ </style>
</head>
<body>
<div class="exercise">
@@ -85,7 +90,7 @@
<div class="solution" data-type="multiple">
- (<span class="sol"><var>XM</var></span>, <span class="sol"><var>YM</var></span>)
+ <code>\Large{(}</code><span class="sol"><var>XM</var></span>, <span class="sol"><var>YM</var></span><code>\Large{)}</code>
<p class="example"> integers, like <code>6</code></p>
<p class="example"> simplified proper fractions, like <code>3/5</code></p>
<p class="example"> simplified improper fractions, like <code>7/4</code></p>
View
13 exercises/multiplication_0.5.html
@@ -29,18 +29,17 @@
<div data-if="B > 0" data-unwrap>
<div>
<div class="graphie" data-update="numbers">
- label( [ 0, B - 1 ], "\\text{Draw " + plural( A, "circle" ) + ".}", "right" );
+ label( [ 0, B - 1 ], "Draw " + plural( A, "circle" ) + ".", "right", false );
drawRow( A, B - 3, "#6495ED", 1 );
</div>
</div>
<div>
<div class="graphie" data-update="numbers">
- label( [ 0, B - 2 ], "\\text{"
- + "If there" + ( B === 1 ? " is " : " are " ) + plural( B, "row" )
- + " with " + plural( A, "circle" ) + ( B === 1 ? " " : " each " )
- + ", there is a total of how many circles?"
- + "}",
- "right" );
+ label( [ 0, B - 2 ],
+ "If there" + ( B === 1 ? " is " : " are " ) + plural( B, "row" )
+ + " with " + plural( A, "circle" ) + ( B === 1 ? "" : " each" )
+ + ",&lt;br&gt;there are a total of how many circles?",
+ "right", false );
for ( var i = 1; i &lt; B; i++ ) {
drawRow( A, B - 3 - i, "#28AE7B", A * i + 1 );
}
View
11 exercises/multiplication_1.html
@@ -29,16 +29,17 @@
<div data-if="B > 0" data-unwrap>
<div>
<div class="graphie" data-update="numbers">
- label( [ 0, B - 1 ], "\\text{Draw " + plural( A, "circle" ) + ".}", "right" );
+ label( [ 0, B - 1 ], "Draw " + plural( A, "circle" ) + ".", "right", false );
drawRow( A, B - 3, "#6495ED", 1 );
</div>
</div>
<div>
<div class="graphie" data-update="numbers">
- label( [ 0, B - 2 ], "\\text{"
- + "If there" + ( B === 1 ? " is " : " are " ) + plural( B, "row" )
- + " with " + plural( A, "circle" ) + ( B === 1 ? " " : " each " ) + ", there is a total of how many circles?"
- + "}", "right" );
+ label( [ 0, B - 2 ],
+ "If there" + ( B === 1 ? " is " : " are " ) + plural( B, "row" )
+ + " with " + plural( A, "circle" ) + ( B === 1 ? "" : " each" )
+ + ",&lt;br&gt;there are a total of how many circles?",
+ "right", false );
for ( var i = 1; i &lt; B; i++ ) {
drawRow( A, B - 3 - i, "#28AE7B", A * i + 1 );
}
View
5 exercises/multiplying_and_dividing_scientific_notation.html
@@ -4,6 +4,11 @@
<meta charset="UTF-8" />
<title>Multiplying and dividing scientific notation</title>
<script src="../khan-exercise.js"></script>
+ <style type="text/css">
+ #answer_area input[type=text] {
+ width: 30px;
+ }
+ </style>
</head>
<body>
<div class="exercise">
View
20 exercises/multiplying_fractions_word_problems.html
@@ -58,10 +58,10 @@
<code class="hint_orange"><var>INVITEES</var></code> is <code class="hint_green"><var>SOLUTION</var></code>:
</p>
<div class="graphie">
- init({ range: [ [ -0.05, 1 ], [ 0, 3 ] ],scale: [ 500, 30 ] });
+ init({ range: [ [ -0.05, 1 ], [ 0, 3 ] ],scale: [ 450, 30 ] });
rectchart( [ N, D - N ], [ BLUE, "#ccc" ], 2 );
rectchart( [ INVITEES, 0 ], [ ORANGE, "#999" ], 1 );
- rectchart( [ SOLUTION, INVITEES - SOLUTION ], [ GREEN, "#fff" ], 0 );
+ rectchart( [ SOLUTION, INVITEES - SOLUTION ], [ GREEN, BACKGROUND ], 0 );
style({ color: BLUE }, function() {
label([ 0, 2.5 ], "\\frac{" + N + "}{" + D + "}", "left" );
});
@@ -125,10 +125,10 @@
<code class="hint_orange"><var>AMOUNT</var></code> is <code class="hint_green"><var>SOLUTION</var></code>:
</p>
<div class="graphie">
- init({ range: [ [ -0.05, 1 ], [ 0, 3 ] ],scale: [ 500, 30 ] });
+ init({ range: [ [ -0.05, 1 ], [ 0, 3 ] ],scale: [ 450, 30 ] });
rectchart( [ N, D - N ], [ BLUE, "#ccc" ], 2 );
rectchart( [ AMOUNT, 0 ], [ ORANGE, "#999" ], 1 );
- rectchart( [ SOLUTION, AMOUNT - SOLUTION ], [ GREEN, "#fff" ], 0 );
+ rectchart( [ SOLUTION, AMOUNT - SOLUTION ], [ GREEN, BACKGROUND ], 0 );
style({ color: BLUE }, function() {
label([ 0, 2.5 ], "\\frac{" + N + "}{" + D + "}", "left" );
});
@@ -192,10 +192,10 @@
<code class="hint_orange"><var>AMOUNT</var></code> is <code class="hint_green"><var>SOLUTION</var></code>:
</p>
<div class="graphie">
- init({ range: [ [ -0.05, 1 ], [ 0, 3 ] ],scale: [ 500, 30 ] });
+ init({ range: [ [ -0.05, 1 ], [ 0, 3 ] ],scale: [ 450, 30 ] });
rectchart( [ N, D - N ], [ BLUE, "#ccc" ], 2 );
rectchart( [ AMOUNT, 0 ], [ ORANGE, "#999" ], 1 );
- rectchart( [ SOLUTION, AMOUNT - SOLUTION ], [ GREEN, "#fff" ], 0 );
+ rectchart( [ SOLUTION, AMOUNT - SOLUTION ], [ GREEN, BACKGROUND ], 0 );
style({ color: BLUE }, function() {
label([ 0, 2.5 ], "\\frac{" + N + "}{" + D + "}", "left" );
});
@@ -262,10 +262,10 @@
<code class="hint_orange"><var>GALLONS</var></code> is <code class="hint_green"><var>SOLUTION</var></code>:
</p>
<div class="graphie">
- init({ range: [ [ -0.05, 1 ], [ 0, 3 ] ],scale: [ 500, 30 ] });
+ init({ range: [ [ -0.05, 1 ], [ 0, 3 ] ],scale: [ 450, 30 ] });
rectchart( [ N, D - N ], [ BLUE, "#ccc" ], 2 );
rectchart( [ GALLONS, 0 ], [ ORANGE, "#999" ], 1 );
- rectchart( [ SOLUTION, GALLONS - SOLUTION ], [ GREEN, "#fff" ], 0 );
+ rectchart( [ SOLUTION, GALLONS - SOLUTION ], [ GREEN, BACKGROUND ], 0 );
style({ color: BLUE }, function() {
label([ 0, 2.5 ], "\\frac{" + N + "}{" + D + "}", "left" );
});
@@ -330,10 +330,10 @@
<code class="hint_orange"><var>ATTENDEES</var></code> is <code class="hint_green"><var>SOLUTION</var></code>:
</p>
<div class="graphie">
- init({ range: [ [ -0.05, 1 ], [ 0, 3 ] ],scale: [ 500, 30 ] });
+ init({ range: [ [ -0.05, 1 ], [ 0, 3 ] ],scale: [ 450, 30 ] });
rectchart( [ N, D - N ], [ BLUE, "#ccc" ], 2 );
rectchart( [ ATTENDEES, 0 ], [ ORANGE, "#999" ], 1 );
- rectchart( [ SOLUTION, ATTENDEES - SOLUTION ], [ GREEN, "#fff" ], 0 );
+ rectchart( [ SOLUTION, ATTENDEES - SOLUTION ], [ GREEN, BACKGROUND ], 0 );
style({ color: BLUE }, function() {
label([ 0, 2.5 ], "\\frac{" + N + "}{" + D + "}", "left" );
});
View
4 exercises/ordering_negative_numbers.html
@@ -95,7 +95,7 @@
<div class="graphie" id="number-line">
init({
range: [ [-1, 101], [-1, 1] ],
- scale: [ 7, 40 ]
+ scale: [ 4.5, 40 ]
});
style({
@@ -109,7 +109,7 @@
var position = "above";
$.each( NUMS_SORT, function( i, el ) {
- ellipse( [ 100 + el[0], 0 ], [ 0.80, 0.14 ], { "stroke-width": 0, fill: el[1] } );
+ ellipse( [ 100 + el[0], 0 ], [ 0.89, 0.1 ], { "stroke-width": 0, fill: el[1] } );
label( [ 100 + el[0], 0 ], "\\color{" + el[1] + "}{" + el[0] + "}", position, { labelDistance: 5 } );
position = ( position === "above" ? "below" : "above" );
} );
View
8 exercises/parabola_intuition_3.html
@@ -7,7 +7,6 @@
<style type="text/css">
#answer_area input[type=text] {
width: 30px;
- margin: 0px 0px 0px 5px;
}
</style>
</head>
@@ -104,10 +103,9 @@
<p>Directrix: <code>y = </code><span id="directrix-label"><code>-1</code></span></p>
<p>
Equation of the parabola:<br />
- <code>y - </code><span class="sol" data-fallback="0" required><var>Y1</var></span>
- <code> = </code><span class="sol" data-fallback="1" required><var>A</var></span>
- <code>(x - </code><span class="sol" data-fallback="0" required><var>X1</var></span>
- <code>)^2</code>
+ <span style="font-size: 12px;">
+ <code>y - </code><span class="sol" data-fallback="0" required><var>Y1</var></span><code> = </code><span class="sol" data-fallback="1" required><var>A</var></span><code>(x - </code><span class="sol" data-fallback="0" required><var>X1</var></span><code>)^2</code>
+ </span>
</p>
<p class="example">set the focus and directrix by moving them around the graph</p>
View
2  exercises/percentage_word_problems_2.html
@@ -24,7 +24,7 @@
<p><code>x = \dfrac{$<var>YEAR_THIS</var>}{<var>(100 + YEAR_PERCENT_MORE) / 100</var>}</code></p>
<p><code>x = $<var>YEAR_LAST</var></code> (rounding to the nearest penny in this step)</p>
<p>So, <var>he(1)</var> had $<var>YEAR_LAST</var> last year, but we want to know how much <var>he(1)</var> has made <b>over the past year!</b></p>
- <p><code>\text{money made over the past year} = \text{amount of money today} - \text{amount of money last year}</code></p>
+ <p><code>\text{money made over the past year} = </code> <code>\qquad \text{amount of money today} - \text{amount of money last year}</code></p>
<p><code>\qquad =$<var>YEAR_THIS</var>-$<var>YEAR_LAST</var></code></p>
<p><code>\qquad \approx $<var>round((YEAR_THIS - YEAR_LAST) * 100) / 100</var></code>
<p>So, the answer is $<var>round((YEAR_THIS - YEAR_LAST) * 100) / 100</var>.</p>
View
12 exercises/point_slope_form.html
@@ -35,8 +35,8 @@
<span class="sol" data-type="rational"><var>X1</var></span>
</div>
<div class="input-format">
- <p class="entry" data-type="multiple">
- <code>(y - \space</code><span class="sol" data-type="rational"></span><code>) = \space</code><span class="sol" data-type="rational"></span><code>(x - \space</code><span class="sol" data-type="rational"></span><code>)</code>
+ <p class="entry" data-type="multiple" style="font-size: 11px;">
+ <code>(y - {}</code><span class="sol" data-type="rational"></span><code>) = {}</code><span class="sol" data-type="rational"></span><code>(x - {}</code><span class="sol" data-type="rational"></span><code>)</code>
</p>
</div>
<p class="example">integers, like <code>6</code></p>
@@ -82,8 +82,8 @@
<span class="sol" data-type="rational"><var>X1</var></span>
</div>
<div class="input-format">
- <p class="entry" data-type="multiple">
- <code>(y - \space</code><span class="sol" data-type="rational"></span><code>) = \space</code><span class="sol" data-type="rational"></span><code>(x - \space</code><span class="sol" data-type="rational"></span><code>)</code>
+ <p class="entry" data-type="multiple" style="font-size: 11px;">
+ <code>(y - {}</code><span class="sol" data-type="rational"></span><code>) = {}</code><span class="sol" data-type="rational"></span><code>(x - {}</code><span class="sol" data-type="rational"></span><code>)</code>
</p>
</div>
<p class="example">integers, like <code>6</code></p>
@@ -122,8 +122,8 @@
<span class="sol" data-type="rational"><var>X1</var></span>
</div>
<div class="input-format">
- <p class="entry" data-type="multiple">
- <code>(y - \space</code><span class="sol" data-type="rational"></span><code>) = \space</code><span class="sol" data-type="rational"></span><code>(x - \space</code><span class="sol" data-type="rational"></span><code>)</code>
+ <p class="entry" data-type="multiple" style="font-size: 11px;">
+ <code>(y - {}</code><span class="sol" data-type="rational"></span><code>) = {}</code><span class="sol" data-type="rational"></span><code>(x - {}</code><span class="sol" data-type="rational"></span><code>)</code>
</p>
</div>
<p class="example">integers, like <code>6</code></p>
View
4 exercises/quotient_rule.html
@@ -8,8 +8,8 @@
<body>
<div class="exercise">
<div class="vars" data-ensure="FUNCN.fText !== FUNCD.fText">
- <var id="FUNCN">generateSpecialFunction("x")</var>
- <var id="FUNCD">generateSpecialFunction("x")</var>
+ <var id="FUNCN" data-ensure="FUNCN.hints == null || FUNCN.hints.length <= 4">generateSpecialFunction("x")</var>
+ <var id="FUNCD" data-ensure="FUNCD.hints == null || FUNCD.hints.length <= 4">generateSpecialFunction("x")</var>
<var id="N_F">FUNCN.fText</var>
<var id="N_DF">FUNCN.ddxFText</var>
View
5 exercises/range_of_a_function.html
@@ -4,6 +4,11 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Range of a function</title>
<script src="../khan-exercise.js"></script>
+ <style type="text/css">
+ #answer_area input[type=text] {
+ width: 40px;
+ }
+ </style>
</head>
<body>
View
2  exercises/reading_bar_charts_2.html
@@ -34,7 +34,7 @@
<div class="graphie" id="barchart">
init({
range: [ [ -2, 17 ], [ -3, 11 ] ],
- scale: [ 30, 30 ]
+ scale: [ 27, 30 ]
});
for ( var y = 1; y &lt;= 10; ++y ) {
View
2  exercises/reading_bar_charts_3.html
@@ -38,7 +38,7 @@
<div class="graphie" id="barchart">
init({
range: [ [ -2, NUM_STUDENTS * 3 + 2 ], [ -3, 12 ] ],
- scale: [ 26, 26 ]
+ scale: [ 24, 24 ]
});
for ( var y = 1; y &lt;= 10; ++y ) {
View
15 exercises/reading_pictographs_1.html
@@ -6,16 +6,21 @@
<script src="../khan-exercise.js"></script>
<style>
.fake_header span, .fake_row span {
- width: 40px;
- height: 40px;
+ width: 38px;
+ height: 38px;
vertical-align: top;
- line-height: 40px;
+ line-height: 38px;
}
.fake_row span:first-child {
- width: 80px;
+ width: 76px;
}
.fake_header span:first-child {
- width: 480px;
+ width: 460px;
+ }
+ </style>
+ <style type="text/css">
+ #answer_area input[type=text] {
+ width: 40px;
}
</style>
</head>
View
15 exercises/reading_pictographs_2.html
@@ -6,16 +6,21 @@
<script src="../khan-exercise.js"></script>
<style>
.fake_header span, .fake_row span {
- width: 40px;
- height: 40px;
+ width: 38px;
+ height: 38px;
vertical-align: top;
- line-height: 40px;
+ line-height: 38px;
}
.fake_row span:first-child {
- width: 80px;
+ width: 76px;
}
.fake_header span:first-child {
- width: 480px;
+ width: 460px;
+ }
+ </style>
+ <style type="text/css">
+ #answer_area input[type=text] {
+ width: 40px;
}
</style>
</head>
View
12 exercises/reading_stem_and_leaf_plots.html
@@ -81,33 +81,35 @@
</p>
<p>
<code>
- \left| \quad \begin{matrix}
+ \small{
+ \left| \space \begin{matrix}
<span data-each="STEMS times as STEM" data-unwrap>
\color{<var>GREEN</var>}{<var>STEM</var>}
\vphantom{\Large{0}} \\
</span>
- \end{matrix} \quad \right|
- \quad
+ \end{matrix} \space \right|
+ \space
\begin{matrix}
<span data-each="STEMS times as STEM" data-unwrap>
<span data-each="DATA[ STEM ] as LEAF" data-unwrap>\color{<var>BLUE</var>}{<var>LEAF</var>}&amp;</span>
\vphantom{\Large{0}} \\
</span>
\end{matrix}
- \quad
+ \space
\begin{matrix}
<span data-each="STEMS times as STEM" data-unwrap>
\rightarrow
\vphantom{\Large{0}} \\
</span>
\end{matrix}
- \quad
+ \space
\begin{matrix}
<span data-each="STEMS times as STEM" data-unwrap>
<span data-each="DATA[ STEM ] as LEAF" data-unwrap>\color{<var>GREEN</var>}{<var>STEM</var>}\color{<var>BLUE</var>}{<var>LEAF</var>}&amp;</span>
\vphantom{\Large{0}} \\
</span>
\end{matrix}
+ }
</code>
</p>
</div>
View
8 exercises/rounding_numbers.html
@@ -32,11 +32,11 @@
<div class="graphie">
init({
range: [ [ -0.06 * pow( 10, -PLACE ) , 1.3 * pow( 10, -PLACE ) ], [-1, 1] ],
- scale: [ 600 * pow( 10, PLACE ), 40 ]
+ scale: [ 450 * pow( 10, PLACE ), 40 ]
});
numberLine( floorTo( PLACE , NUM ), ceilTo( PLACE , NUM ) + pow( 10, -( PLACE+2 )) , round( pow( 10, -(PLACE + 1 ))) );
style({ stroke: "#FFA500", fill: "#FFA500", strokeWidth: 3.5 });
- ellipse( [ 10 * pow( 10, -( PLACE+1 )) * (NUM - floorTo( PLACE , NUM ))/pow( 10,- (PLACE) ), 0 ], [pow( 10, -PLACE ) / 100, 0.15]);
+ ellipse( [ 10 * pow( 10, -( PLACE+1 )) * (NUM - floorTo( PLACE , NUM ))/pow( 10,- (PLACE) ), 0 ], [pow( 10, -PLACE ) / 115, 0.1]);
label( [ 10 * pow(10, -( PLACE+1 )) * ( NUM - floorTo( PLACE , NUM ))/pow( 10,- (PLACE) )], NUM, "below");
style({ stroke: "#6495ED", "fill": "none", strokeWidth: 3.5 });
if( DIGITS[ 5 + PLACE ] >= 5 ) {
@@ -71,11 +71,11 @@
<div class="graphie">
init({
range: [ [ -0.06 * pow( 10, -PLACE ) , 10.3 * pow( 10, -PLACE ) ], [-1, 1] ],
- scale: [ 600 * pow( 10, PLACE ), 40 ]
+ scale: [ 450 * pow( 10, PLACE ), 40 ]
});
numberLine( floorTo( PLACE , NUM ), ceilTo( PLACE , NUM ) + pow( 10,- (PLACE+2 )) , pow( 10,- (PLACE+1) ) );
style({ stroke: "#FFA500", fill: "#FFA500", strokeWidth: 3.5 });
- ellipse( [ 10 * pow(10,- (PLACE+1)) * (NUM - floorTo( PLACE , NUM ))/pow(10,- (PLACE) ), 0 ], [pow(10, -PLACE) / 100, 0.15]);
+ ellipse( [ 10 * pow(10, -(PLACE+1)) * (NUM - floorTo( PLACE , NUM ))/pow(10,- (PLACE) ), 0 ], [pow(10, -PLACE) / 115, 0.1]);
label( [ 10 * pow(10, -( PLACE+1 )) * ( NUM - floorTo( PLACE , NUM ))/pow(10, -(PLACE) )], NUM, "below");
style({ stroke: "#6495ED", "fill": "none", strokeWidth: 3.5 });
if ( DIGITS[ 2 + PLACE ] >= 5 ) {
View
4 exercises/rounding_whole_numbers.html
@@ -49,11 +49,11 @@
<div class="graphie">
init({
range: [ [ -0.06 * pow( 10, -PLACE ) , 1.3 * pow( 10, -PLACE ) ], [-1, 1] ],
- scale: [ 600 * pow( 10, PLACE ), 40 ]
+ scale: [ 450 * pow( 10, PLACE ), 40 ]
});
numberLine( floorTo( PLACE , NUM ), ceilTo( PLACE , NUM ) + pow( 10, -( PLACE+2 )) , round( pow( 10, -(PLACE + 1 ))) );
style({ stroke: "#FFA500", fill: "#FFA500", strokeWidth: 3.5 });
- ellipse( [ 10 * pow( 10, -( PLACE+1 )) * (NUM - floorTo( PLACE , NUM ))/pow( 10,- (PLACE) ), 0 ], [pow( 10, -PLACE ) / 100, 0.15]);
+ ellipse( [ 10 * pow( 10, -( PLACE+1 )) * (NUM - floorTo( PLACE , NUM ))/pow( 10,- (PLACE) ), 0 ], [pow( 10, -PLACE ) / 115, 0.1]);
label( [ 10 * pow(10, -( PLACE+1 )) * ( NUM - floorTo( PLACE , NUM ))/pow( 10,- (PLACE) )], NUM, "below");
style({ stroke: "#6495ED", "fill": "none", strokeWidth: 3.5 });
if( DIGITS[ 5 + PLACE ] >= 5 ) {
View
4 exercises/scientific_notation_intuition.html
@@ -39,7 +39,7 @@
<div class="graphie" id="scinot">
init({
range: [ [ -8, 14 ], [ -1, 3 ] ],
- scale: [30, 45]
+ scale: [23, 45]
});
graph.decimalPlace = E;
@@ -79,7 +79,7 @@
});
style({ stroke: null, fill: "black" }, function() {
- ellipse( [ E, 1.7 ], [ 4 / 30, 4 / 45 ] );
+ ellipse( [ E, 1.7 ], [ 4 / 23, 4 / 45 ] );
});
var setDecimal = function( place, exp ) {
View
6 exercises/shaded_areas.html
@@ -165,11 +165,11 @@
OUTER.drawShape(KhanUtil.currentGraph, { fill: BLUE, opacity: 0.5 });
</div>
</div>
- <p><code>\text{area of whole figure} = <var>OUTER.hint()</var> = <var>PRETTY_OUTER_AREA</var></code></p>
- <p><code>\text{area of inner region} = <var>INNER.hint()</var> = <var>PRETTY_INNER_AREA</var></code></p>
+ <p><code>\text{area of whole figure} = </code><br><code>\qquad<var>OUTER.hint()</var> = <var>PRETTY_OUTER_AREA</var></code></p>
+ <p><code>\text{area of inner region} = </code><br><code>\qquad<var>INNER.hint()</var> = <var>PRETTY_INNER_AREA</var></code></p>
<p>Then subtract the inner region's area from the whole figure's area to find the area of the shaded region (the difference between the two areas).</p>
<p><code>\text{area of shaded region} = <var>PRETTY_OUTER_AREA</var> - <var>PRETTY_INNER_AREA</var> = <var>roundTo(2, SHADED_AREA)</var></code></p>
</div>
</div>
</body>
-</html>
+</html>
View
2  exercises/signs_of_a_parabola.html
@@ -28,7 +28,7 @@
<div id="grid" class="graphie">
init({
range: [ [ -10, 10 ], [ -10, 10 ] ],
- scale: [ 30, 30 ]
+ scale: [ 25, 25 ]
});
grid( [ -10, 10 ], [ -10, 10 ], { stroke: "#e2e2e2" });
View
3  exercises/similar_triangles_1.html
@@ -76,7 +76,8 @@
<div class="question">
<div class="graphie" id="triangles" >
init({
- range: [ [-1, 13 ], [ -14, 2.5 ] ]
+ range: [ [-1, 13 ], [ -14, 2.5 ] ],
+ scale: 35
})
TR.draw();
View
3  exercises/similar_triangles_2.html
@@ -114,7 +114,8 @@
<div class="question">
<div class="graphie" id="triangles" >
init({
- range: [ [-1, 13 ], [ -14, 2.5 ] ]
+ range: [ [-1, 13 ], [ -14, 2.5 ] ],
+ scale: 35
})
TR.draw();
View
2  exercises/slope_intercept_form.html
@@ -9,7 +9,7 @@
width: 40px;
}
#answer_area .short input[type=text] {
- width: 60px;
+ width: 40px;
}
</style>
</head>
View
4 exercises/slope_of_a_line.html
@@ -138,7 +138,7 @@
<div class="graphie quarter-graph">
graphInit({
range: 6,
- scale: 20,
+ scale: 16.9,
tickStep: 1,
labelStep: 1,
labelFormat: function( s ) { return "\\small{" + s + "}"; },
@@ -176,7 +176,7 @@
<var id="SLOPES">[
{ value: M_INIT, display: M_INIT },
{ value: 0, display: 0 },
- { value: 99999, display: "undefined" },
+ { value: 999, display: "undefined" },
{ value: 1 / M_INIT, display: "\\dfrac{1}{" + M_INIT + "}" }
]</var>
<var id="WHICH">randRange( 1, 2 )</var>
View
8 exercises/solving_quadratics_by_factoring.html
@@ -6,7 +6,7 @@
<script src="../khan-exercise.js"></script>
<style type="text/css">
#answer_area input[type=text] {
- width: 50px;
+ width: 35px;
}
</style>
</head>
@@ -35,9 +35,9 @@
<div class="solution" data-type="set">
<div class="set-sol"><var>A</var></div>
<div class="set-sol"><var>B</var></div>
- <div class="input-format">
- <p><code>x = \quad</code><span class="entry"></span><code>\quad \text{and} \quad x = \quad</code><span class="entry"></span></p>
- </div>
+ <div class="input-format"><p style="font-size: 12px;">
+ <code>x = {}</code><span class="entry"></span><code>\space \text{and}\space x = {}</code><span class="entry"></span>
+ </p></div>
</div>
<div class="hints" data-apply="appendContents">
View
8 exercises/solving_quadratics_by_factoring_2.html
@@ -6,7 +6,7 @@
<script src="../khan-exercise.js"></script>
<style type="text/css">
#answer_area input[type=text] {
- width: 50px;
+ width: 35px;
}
</style>
</head>
@@ -35,9 +35,9 @@
<div class="solution" data-type="set">
<div class="set-sol"><var>A</var></div>
<div class="set-sol"><var>B</var></div>
- <div class="input-format">
- <p><code>x = \quad</code><span class="entry"></span><code>\quad \text{and} \quad x = \quad</code><span class="entry"></span></p>
- </div>
+ <div class="input-format"><p style="font-size: 12px;">
+ <code>x = {}</code><span class="entry"></span><code>\space \text{and} \space x = {}</code><span class="entry"></span>
+ </p></div>
</div>
<div class="hints" data-apply="appendContents">
View
8 exercises/solving_quadratics_by_taking_the_square_root.html
@@ -6,7 +6,7 @@
<script src="../khan-exercise.js"></script>
<style type="text/css">
#answer_area input[type=text] {
- width: 50px;
+ width: 35px;
}
</style>
</head>
@@ -27,9 +27,9 @@
<div class="solution" data-type="set">
<div class="set-sol"><var>H + CONSTANT</var></div>
<div class="set-sol"><var>H - CONSTANT</var></div>
- <div class="input-format">
- <p><code>x = \quad</code><span class="entry"></span><code>\quad \text{or} \quad x = \quad</code><span class="entry"></span></p>
- </div>
+ <div class="input-format"><p style="font-size: 12px;">
+ <code>x = {}</code><span class="entry"></span><code>\space \text{or} \space x = {}</code><span class="entry"></span>
+ </p></div>
<p class="example">integers, like <code>6</code></p>
<p class="example"><em>simplified proper</em> fractions, like <code>3/5</code></p>
<p class="example"><em>simplified improper</em> fractions, like <code>7/4</code></p>
View
3  exercises/solving_similar_triangles_1.html
@@ -129,7 +129,8 @@
var maxY = Math.max(aBounding[1][1], bBounding[1][1]);
init({
- range: [ [minX, maxX ], [ minY, maxY ] ]
+ range: [ [minX, maxX ], [ minY, maxY ] ],
+ scale: 500 / (maxX - minX)
})
style({
View
9 exercises/square_roots_2.html
@@ -3,6 +3,11 @@
<head>
<title>Square roots 2</title>
<script src="../khan-exercise.js"></script>
+ <style type="text/css">
+ #answer_area input[type=text] {
+ width: 35px;
+ }
+ </style>
</head>
<body>
<div class="summary">Estimating square roots as between two roots
@@ -19,7 +24,7 @@
</div>
<p class="question">The value of <code>\sqrt{<var>Q</var>}</code> lies between which two <a href="#" class="show-definition" data-definition="consecutive-integers">consecutive integers</a>?</p>
-
+
<div class="definition" id="consecutive-integers">
Integers that appear in order when counting, for example 2 and 3.
</div>
@@ -29,7 +34,7 @@
<p><span class="sol short"><var>N</var></span> <code>&lt; \sqrt{<var>Q</var>} &lt;</code> <span class="sol short"><var>N + 1</var></span></p>
<span class="example">two integers, like <code>6</code></span>
</div>
-
+
<div class="hints">
<div>
<p>Consider the perfect squares near <code><var>Q</var></code>.
View
8 exercises/standard_deviation.html
@@ -44,11 +44,11 @@
<div class="solution" data-type="multiple">
<p>
- Average age:
+ Average age:<br><code>\quad</code>
<span class="sol short" data-type="decimal" data-inexact data-max-error="0.15"><var>mean( DATA )</var></span> years old
</p>
<p>
- Standard deviation:
+ Standard deviation:<br><code>\quad</code>
<span class="sol short" data-type="decimal" data-inexact data-max-error="0.15"><var>stdDevPop( DATA )</var></span> years
</p>
<div class="example">decimals, like <code>7.5</code></div>
@@ -184,11 +184,11 @@
<div class="solution" data-type="multiple">
<p>
- Average age:
+ Average age:<br><code>\quad</code>
<span class="sol short" data-type="decimal" data-inexact data-max-error="0.15"><var>mean( DATA )</var></span> years old
</p>
<p>
- Standard deviation:
+ Standard deviation:<br><code>\quad</code>
<span class="sol short" data-type="decimal" data-inexact data-max-error="0.15"><var>stdDev( DATA )</var></span> years
</p>
<div class="example">decimals, like <code>0.75</code></div>
View
2  exercises/telling_time.html
@@ -34,7 +34,7 @@
<div style="clear: both;"></div>
</div>
<div class="solution" data-type="multiple">
- <p class="short">The time is <span class="sol"><var>HOUR</var></span> : <span class="sol"><var>NICE_MINUTE</var></span> <var>AM_PM</var></p>
+ <p class="short">The time is:<br><span class="sol"><var>HOUR</var></span> : <span class="sol"><var>NICE_MINUTE</var></span> <var>AM_PM</var></p>
<p class="example">a 12-hour time in hours and minutes</p>
</div>
View
2  exercises/telling_time_0.5.html
@@ -34,7 +34,7 @@
<div style="clear: both;"></div>
</div>
<div class="solution" data-type="multiple">
- <p class="short">The time is <span class="sol"><var>HOUR</var></span> : <span class="sol"><var>NICE_MINUTE</var></span> <var>AM_PM</var></p>
+ <p class="short">The time is:<br><span class="sol"><var>HOUR</var></span> : <span class="sol"><var>NICE_MINUTE</var></span> <var>AM_PM</var></p>
<p class="example">a 12-hour time in hours and minutes</p>
</div>
View
5 exercises/triangle_inequality_theorem.html
@@ -19,6 +19,11 @@
return [ [ a, b, c] , [ sa.toFixed( 1 ), sb.toFixed( 1 ), sc.toFixed( 1 ) ] ];
}
</script>
+ <style type="text/css">
+ #answer_area input[type=text] {
+ width: 40px;
+ }
+ </style>
</head>
<body>
<div class="exercise">
View
13 exercises/trig_addition_identities.html
@@ -196,8 +196,10 @@
<code>\sin(x \pm y)
= \sin x \cdot \cos y \pm \cos x \cdot \sin y</code>
</br>In this case, we have
- <p><code>\qquad \sin(<var>T_ANG</var>
- <var>OP</var> <var>S_ANG</var>) =
+ <p><code>\qquad \sin(<var>T_ANG</var>
+ <var>OP</var> <var>S_ANG</var>) =</code>
+ <br>
+ <code>\qquad\qquad
\sin(<var>T_ANG</var>) \cdot
\cos(<var>S_ANG</var>) <var>OP</var>
\cos(<var>T_ANG</var>) \cdot
@@ -323,7 +325,8 @@
= \cos x \cdot \cos y \mp \sin x \cdot \sin y</code>
</br>In this case, we have
<p><code>\qquad \cos(<var>T_ANG</var>
- <var>OP</var> <var>S_ANG</var>) =
+ <var>OP</var> <var>S_ANG</var>) =</code><br>
+ <code>\qquad\qquad
\cos(<var>T_ANG</var>) \cdot
\cos(<var>S_ANG</var>) <var>OP2</var>
\sin(<var>T_ANG</var>) \cdot
@@ -536,14 +539,14 @@
<div>
Now we just need to evaluate each term.
<p><code>\qquad \cos^2(<var>T_ANG</var>) =
- \left(\dfrac{Adjacent}{Hypotenuse}\right)^2 =
+ \left(\dfrac{Adj}{Hyp}\right)^2 =
\left(\dfrac{<var>ADJACENT_NAME</var>}
{<var>HYPOTENUSE_NAME</var>}\right)^2 =
\left(\dfrac{<var>ADJACENT_VALUE</var>}
{<var>HYPOTENUSE_VALUE</var>}\right)^2 =
<var>TERM1</var></code></p>
<p><code>\qquad \sin^2(<var>T_ANG</var>) =
- \left(\dfrac{Opposite}{Hypotenuse}\right)^2 =
+ \left(\dfrac{Opp}{Hyp}\right)^2 =
\left(\dfrac{<var>OPPOSITE_NAME</var>}
{<var>HYPOTENUSE_NAME</var>}\right)^2 =
\left(\dfrac{<var>OPPOSITE_VALUE</var>}
View
4 exercises/understanding_decimals_place_value.html
@@ -19,13 +19,13 @@
}
.coin-column { position: relative; margin: 0px; float: left; left: 1px; z-index: 1; }
.place-value {
- width: 55px; margin: 8px; line-height: 30px;
+ width: 55px; margin: 6px; line-height: 30px;
background-color: #eee; border-width: 1px; border-style: solid; border-color: #ddd; color: #ddd;
font-weight: bold; text-align: center; font-size: 20px;
cursor: pointer;
}
.bill {
- width: 70px; margin: 10px; line-height: 30px;
+ width: 70px; margin: 10px 6px; line-height: 30px;
background-color: #eee; border-width: 1px; border-style: solid; border-color: #ddd; color: #ddd;
font-weight: bold; text-align: center; font-size: 20px;
cursor: pointer;
View
6 exercises/understanding_moving_the_decimal.html
@@ -37,7 +37,7 @@
<div class="graphie">
init({
range: [ [ -1, 11 ], [ -1, 3 ] ],
- scale: [30, 45]
+ scale: [20, 40]
});
var digitsA = KhanUtil.digits( A );
@@ -84,8 +84,8 @@
ellipse( [ digitsA.length - A_DECIMAL - 0.5, 0.8 ], [ 0.09, 0.06 ] );
ellipse( [ digitsB.length - B_DECIMAL - 0.5, -0.2 ], [ 0.09, 0.06 ] );
- var labelstr = "\\text{The decimal point needs to be moved " + POW_DIFF + " time" + ( POW_DIFF !== 1 ? "s.}" : ".}");
- label ([ digitsA.length + 0.5, 0.5 ], labelstr, "right", 1);
+ var labelstr = "The decimal point needs to be moved " + POW_DIFF + " time" + ( POW_DIFF !== 1 ? "s." : ".");
+ label ([ digitsA.length + 0.5, 0.5 ], labelstr, "right", false);
</div>
<p>Moving the decimal one position to the <var>PM === 1 ? "right" : "left"</var> is the same as <var>PM === 1 ? "multiplying" : "dividing"</var> by ten once.</p>
View
8 exercises/variance.html
@@ -42,11 +42,11 @@
<div class="solution" data-type="multiple">
<p>
- Average age:
+ Average age:<br><code>\quad</code>
<span class="sol short" data-type="decimal" data-inexact data-max-error="0.15"><var>mean( DATA )</var></span> years old
</p>
<p>
- Variance:
+ Variance:<br><code>\quad</code>
<span class="sol short" data-type="decimal" data-inexact data-max-error="0.15"><var>sum( SQR_DEV ) / DATA_POINTS</var></span> years<code>^2</code>
</p>
<div class="example">decimals, like <code>7.5</code></div>
@@ -164,11 +164,11 @@
<div class="solution" data-type="multiple">
<p>
- Average age:
+ Average age:<br><code>\quad</code>
<span class="sol short" data-type="decimal" data-inexact data-max-error="0.15"><var>mean( DATA )</var></span> years old
</p>
<p>
- Variance:
+ Variance:<br><code>\quad</code>
<span class="sol short" data-type="decimal" data-inexact data-max-error="0.15"><var>sum( SQR_DEV ) / ( DATA_POINTS - 1 )</var></span> years<code>^2</code>
</p>
<div class="example">decimals, like <code>0.75</code></div>
View
4 exercises/views_of_a_function.html
@@ -55,6 +55,10 @@
#table-to-graph .ttable {
margin-bottom: 20px;
}
+
+ #answer_area .ttable input {
+ width: 60px;
+ }
</style>
</head>
<body>
View
1  utils/answer-types.js
@@ -979,6 +979,7 @@ $.extend(Khan.answerTypes, {
var area = $("<div />");
area.append(realArea).append(imagArea).tmpl();
+ area.find("input").css("width", "50px");