Skip to content

Commit

Permalink
Merge branch 'master' of github.com:phuphighter/Monocle
Browse files Browse the repository at this point in the history
  • Loading branch information
Johnny Khai Nguyen committed Jul 2, 2012
2 parents 041ce24 + 478c9df commit ba57065
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 24 deletions.
2 changes: 1 addition & 1 deletion src/core/reader.js
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ Monocle.Reader.DEFAULT_SYSTEM_ID = 'RS:monocle'
Monocle.Reader.DEFAULT_CLASS_PREFIX = 'monelem_'
Monocle.Reader.DEFAULT_STYLE_RULES = [
"html#RS\\:monocle * {" +
"-webkit-font-smoothing: subpixel-antialiased;" +
"-webkit-font-smoothing: antialiased;" +
"text-rendering: auto !important;" +
"word-wrap: break-word !important;" +
"overflow: visible !important;" +
Expand Down
29 changes: 6 additions & 23 deletions src/monocore.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,8 @@
//= require "core/monocle"
//= require "compat/env"
//= require "compat/css"
//= require "compat/stubs"
//= require "compat/browser"
//= require "core/factory"
//= require "core/events"
//= require "core/styles"
//= require "core/reader"
//= require "core/book"
//= require "core/place"
//= require "core/component"
//= require "controls/panel"
//= require "panels/twopane"
//= require "panels/imode"
//= require "panels/eink"
//= require "panels/marginal"
//= require "dimensions/vert"
//= require "flippers/legacy"
//= require "dimensions/columns"
//= require "flippers/slider"
//= require "flippers/scroller"
//= require "flippers/instant"
//= require_tree ./core
//= require_tree ./compat
//= require_tree ./dimensions
//= require_tree ./flippers
//= require_tree ./panels
//= require_tree ./dimensions

Monocle.pieceLoaded('monocore');

0 comments on commit ba57065

Please sign in to comment.