diff options
| author | Shaform <shaform@gmail.com> | 2014-06-17 22:08:46 +0800 |
|---|---|---|
| committer | Shaform <shaform@gmail.com> | 2014-06-17 22:08:46 +0800 |
| commit | 6bbefad24e6aa4a5b51b4b21bdf30b73f8cb4d41 (patch) | |
| tree | d2efbbb62f9746b19b683c11a302c9afe385a2be /theme/javascript/core | |
| parent | 1f4cf33dd08b439cadb5c649654ecd6d3f4b399d (diff) | |
| parent | d6eb8e4c6042262408c3c0b8d67bccecfa4bf882 (diff) | |
| download | gitbook-6bbefad24e6aa4a5b51b4b21bdf30b73f8cb4d41.zip gitbook-6bbefad24e6aa4a5b51b4b21bdf30b73f8cb4d41.tar.gz gitbook-6bbefad24e6aa4a5b51b4b21bdf30b73f8cb4d41.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into ref_links
Diffstat (limited to 'theme/javascript/core')
| -rwxr-xr-x | theme/javascript/core/exercise.js | 6 | ||||
| -rw-r--r-- | theme/javascript/core/font-settings.js | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/theme/javascript/core/exercise.js b/theme/javascript/core/exercise.js index 7dbe982..f4227cc 100755 --- a/theme/javascript/core/exercise.js +++ b/theme/javascript/core/exercise.js @@ -1,9 +1,13 @@ define([ "jQuery", + "ace/ace", + "ace/theme-tomorrow", + "ace/mode-javascript", "utils/execute", "core/events", "core/state" -], function($, execute, events, state){ +], function($, _ace, _aceTheme, _aceMode, execute, events, state){ + // Bind an exercise var prepareExercise = function($exercise) { var codeSolution = $exercise.find(".code-solution").text(); diff --git a/theme/javascript/core/font-settings.js b/theme/javascript/core/font-settings.js index 0bcdd2c..dbc0879 100644 --- a/theme/javascript/core/font-settings.js +++ b/theme/javascript/core/font-settings.js @@ -91,8 +91,8 @@ define([ // Instantiate font state object fontState = storage.get("fontState", { - size: config.size || 1, - family: FAMILY[config.family || "serif"], + size: config.size || 2, + family: FAMILY[config.family || "sans"], theme: THEMES[config.theme || "white"] }); fontState.save = function(){ |