Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Khan/khan-exercises
...
head fork: Khan/khan-exercises
Checking mergeability… Don’t worry, you can still create the pull request.
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 1 contributor
Commits on Aug 11, 2011
@nsfmc nsfmc wrapping the colorpicker
should fix the problem where the colorpicker breaks on gae
39709fe
Commits on Sep 01, 2011
@nsfmc nsfmc massive merge 432ecb9
Showing with 29 additions and 0 deletions.
  1. +29 −0 utils/graphie-helpers.js
View
29 utils/graphie-helpers.js
@@ -524,3 +524,32 @@ function changeIntercept( dir ) {
+ ( dir * graph.BD / graph.INCR );
updateEquation();
}
+<<<<<<< HEAD
+
+jQuery.fn[ "graphie-helpersLoad" ] = function(){
+ // Colorblind-safe set of colors from colorbrewer.org
+ var qualitativeColors = KhanUtil.shuffle([
+ "#33a02c", // dark green
+ "#b2df8a", // light green
+ "#6495ed", // cornflower blue
+ "#a6cee3" // light blue
+ ]);
+
+ // You can use these colors for pie charts or anything that needs to 'get darker'
+ var sequentialColors = KhanUtil.shuffle([
+ [ "#fef0d9", "#fdcc8a", "#fc8d59", "#e34a33", "#b30000" ], // light yellow -> dark red
+ [ "#ffffcc", "#a1dab4", "#41b6c4", "#2c7fb8", "#253494" ], // light yellow -> dark aqua
+ [ "#feebe2", "#fbb4b9", "#f768a1", "#c51b8a", "#7a0177" ], // light pink -> dark violet
+ [ "#f1eef6", "#bdc9e1", "#74a9cf", "#2b8cbe", "#045a8d" ], // light blue -> dark blue
+ [ "#edf8fb", "#b2e2e2", "#66c2a4", "#2ca25f", "#006d2c" ] // light blue -> dark green
+ ]);
+
+ jQuery.extend(KhanUtil,{
+ "colors" : {
+ "qualitative" : qualitativeColors,
+ "sequential" : sequentialColors[0]
+ }
+ });
+};
+=======
+>>>>>>> ef02c95bf9a9c9354d91001ee47752ed9ca1366f

No commit comments for this range

Something went wrong with that request. Please try again.