Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,10 @@ UGLY_BASIC_JS = $(BUILD_DIR)/mathquill-basic.min.js
UGLIFY ?= ./node_modules/.bin/uglifyjs
UGLIFY_OPTS ?= --mangle --compress hoist_vars=true --comments

# We set --relative-urls and --rootpath so relative font paths are correctly
# translated in the resulting CSS
LESSC ?= ./node_modules/.bin/lessc
LESS_OPTS ?=
LESS_OPTS ?= --strict-imports --relative-urls --rootpath=build/
ifdef OMIT_FONT_FACE
LESS_OPTS += --modify-var="omit-font-face=true"
endif
Expand Down
6 changes: 3 additions & 3 deletions build/mathquill.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* MathQuill v1.0.2, by Han, Jeanine, and Mary
* MathQuill v1.0.3, by Han, Jeanine, and Mary
* http://mathquill.com | [email protected]
*
* This Source Code Form is subject to the terms of the
Expand Down Expand Up @@ -29,8 +29,8 @@
}
@font-face {
font-family: Symbola;
src: url(/fonts/Symbola.eot);
src: local('Symbola Regular'), local('Symbola'), url(/fonts/Symbola.woff2) format('woff2'), url(/fonts/Symbola.woff) format('woff'), url(/fonts/Symbola.ttf) format('truetype'), url(/fonts/Symbola.otf) format('opentype'), url(/fonts/Symbola.svg#Symbola) format('svg');
src: url(fonts/Symbola.eot);
src: local('Symbola Regular'), local('Symbola'), url(fonts/Symbola.woff2) format('woff2'), url(fonts/Symbola.woff) format('woff'), url(fonts/Symbola.ttf) format('truetype'), url(fonts/Symbola.svg#Symbola) format('svg');
}
.mq-editable-field {
display: -moz-inline-box;
Expand Down
2 changes: 1 addition & 1 deletion build/mathquill.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* MathQuill v1.0.1, by Han, Jeanine, and Mary
* MathQuill v1.0.3, by Han, Jeanine, and Mary
* http://mathquill.com | [email protected]
*
* This Source Code Form is subject to the terms of the
Expand Down
4 changes: 2 additions & 2 deletions build/mathquill.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* MathQuill v1.0.1, by Han, Jeanine, and Mary
* MathQuill v1.0.3, by Han, Jeanine, and Mary
* http://mathquill.com | [email protected]
*
* This Source Code Form is subject to the terms of the
Expand Down Expand Up @@ -2211,7 +2211,7 @@ function MathQuill(el) {
return MQ1(el);
}
MathQuill.prototype = Progenote.prototype;
MathQuill.VERSION = 'v1.0.1';
MathQuill.VERSION = 'v1.0.3';
MathQuill.interfaceVersion = function (v) {
// shim for #459-era interface versioning (ended with #495)
if (v !== 1)
Expand Down
4 changes: 2 additions & 2 deletions build/mathquill.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mathquill",
"description": "Easily type math in your webapp",
"version": "1.0.2",
"version": "1.0.3",
"license": "MPL-2.0",
"main": "build/mathquill.min.js",
"types": "build/mathquill.d.ts",
Expand Down
19 changes: 9 additions & 10 deletions src/css/font.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,17 @@

@basic:~ "";
.font-srcs() when not (@basic) {
src: url(/fonts/Symbola.eot);
src: url(../fonts/Symbola.eot);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are now the actual, relative paths to the font files. lessc can now resolve them properly when building.

src: local('Symbola Regular'), local('Symbola'),
url(/fonts/Symbola.woff2) format('woff2'),
url(/fonts/Symbola.woff) format('woff'),
url(/fonts/Symbola.ttf) format('truetype'),
url(/fonts/Symbola.otf) format('opentype'),
url(/fonts/Symbola.svg#Symbola) format('svg');
url(../fonts/Symbola.woff2) format('woff2'),
url(../fonts/Symbola.woff) format('woff'),
url(../fonts/Symbola.ttf) format('truetype'),
url(../fonts/Symbola.svg#Symbola) format('svg');
}
.font-srcs() when (@basic) {
src: url(/fonts/Symbola-basic.eot);
src: url(../fonts/Symbola-basic.eot);
src: local('Symbola Regular'), local('Symbola'),
url(/fonts/Symbola-basic.woff2) format('woff2'),
url(/fonts/Symbola-basic.woff) format('woff'),
url(/fonts/Symbola-basic.ttf) format('truetype');
url(../fonts/Symbola-basic.woff2) format('woff2'),
url(../fonts/Symbola-basic.woff) format('woff'),
url(../fonts/Symbola-basic.ttf) format('truetype');
}
Loading