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
This commit is contained in:
Emily Eisenberg 2013-07-09 15:53:35 -07:00
parent 2478a385ae
commit b016015d4e
4 changed files with 15 additions and 15 deletions

View File

@ -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:

View File

@ -5,10 +5,11 @@
<script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.4.4/underscore-min.js" type="text/javascript"></script>
<script src="MJLite.js" type="text/javascript"></script>
<script src="main.js" type="text/javascript"></script>
<link href="style.css" rel="stylesheet" type="text/css">
<link href="mjlite.css" rel="stylesheet" type="text/css">
<link href="main.css" rel="stylesheet" type="text/css">
</head>
<body>
<input type="text" value="2x^2 + 3" id="input" />
<div id="math"></div>
<div id="math" class="mathmathmath"></div>
</body>
</html>

9
static/main.css Normal file
View File

@ -0,0 +1,9 @@
body {
margin: 0px;
padding: 0px;
}
input {
margin: 0px;
font-size: 100%;
}

View File

@ -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;
}