From b016015d4ede0ee0ab0d2e94a25ef5a7d469c7e5 Mon Sep 17 00:00:00 2001 From: Emily Eisenberg Date: Tue, 9 Jul 2013 15:53:35 -0700 Subject: [PATCH] Sync styles with khan-exercises Summary: Get the styles into a form that they can be directly copied over to khan-exercises, with no changes. Mostly just changing #math to .mathmathmath and adding a font style and size. Test Plan: Make sure that the local test still works. Reviewers: spicyj Reviewed By: spicyj Differential Revision: http://phabricator.benalpert.com/D47 --- Makefile | 2 +- static/index.html | 5 +++-- static/main.css | 9 +++++++++ static/{style.css => mjlite.css} | 14 ++------------ 4 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 static/main.css rename static/{style.css => mjlite.css} (94%) diff --git a/Makefile b/Makefile index af25b1c18..9897dc5d5 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ build/MJLite.js: MJLite.js parser.jison lexer.js copy: build cp build/MJLite.js ../exercises/utils/MJLite.js - cp static/style.css ../exercises/css/mjlite.css + cp static/mjlite.css ../exercises/css/ cp -R static/fonts ../exercises/css/ serve: diff --git a/static/index.html b/static/index.html index ff71de492..e109676f1 100644 --- a/static/index.html +++ b/static/index.html @@ -5,10 +5,11 @@ - + + -
+
diff --git a/static/main.css b/static/main.css new file mode 100644 index 000000000..62074264e --- /dev/null +++ b/static/main.css @@ -0,0 +1,9 @@ +body { + margin: 0px; + padding: 0px; +} + +input { + margin: 0px; + font-size: 100%; +} diff --git a/static/style.css b/static/mjlite.css similarity index 94% rename from static/style.css rename to static/mjlite.css index 5f39391b7..08f400433 100644 --- a/static/style.css +++ b/static/mjlite.css @@ -14,18 +14,8 @@ things to do: big parens */ -body { - margin: 0px; - padding: 0px; -} - -input { - margin: 0px; - font-size: 100%; -} - -#math { - font-family: mjlite_main; +.mathmathmath { + font: normal 1.21em mjlite_main; line-height: 1.4; }