Merge pull request #719 from mathquill/fix.rename-font-folder
Rename font/ => fonts/
diff --git a/.gitattributes b/.gitattributes
index 8e06004..66fbd75 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,4 +2,4 @@
* text=lf
# don't mess with fonts
-src/font/* text=binary
+src/fonts/* text=binary
diff --git a/Makefile b/Makefile
index cfe521f..b8d12ef 100644
--- a/Makefile
+++ b/Makefile
@@ -62,8 +62,8 @@
CSS_MAIN = $(CSS_DIR)/main.less
CSS_SOURCES = $(shell find $(CSS_DIR) -name '*.less')
-FONT_SOURCE = $(SRC_DIR)/font
-FONT_TARGET = $(BUILD_DIR)/font
+FONT_SOURCE = $(SRC_DIR)/fonts
+FONT_TARGET = $(BUILD_DIR)/fonts
UNIT_TESTS = ./test/unit/*.test.js
diff --git a/docs/Contributing.md b/docs/Contributing.md
index bcbd3ae..1b8aaa8 100644
--- a/docs/Contributing.md
+++ b/docs/Contributing.md
@@ -8,7 +8,7 @@
`make basic` builds a stripped-down version of MathQuill for basic mathematics, without advanced LaTeX commands. This version doesn't allow typed LaTeX backslash commands with `\` or text blocks with `$`, and also won't render any LaTeX commands that can't by typed without `\`. This version of MathQuill's JS is only somewhat smaller, but the font is like 100x smaller.
-To run this smaller version, serve and load `mathquill-basic.{js,min.js,css}` and `font/Symbola-basic.{eot,ttf}` instead.
+To run this smaller version, serve and load `mathquill-basic.{js,min.js,css}` and `fonts/Symbola-basic.{eot,ttf}` instead.
# Testing
diff --git a/package.json b/package.json
index 5bf3263..9cb6c4b 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
},
"files": [
"build/mathquill.{css,js,min.js}",
- "build/font/Symbola.*",
+ "build/fonts/Symbola.*",
"quickstart.html"
],
"devDependencies": {
diff --git a/src/css/font.less b/src/css/font.less
index af1e7f6..6c7b1dc 100644
--- a/src/css/font.less
+++ b/src/css/font.less
@@ -9,24 +9,24 @@
@basic:;
.font-srcs() when not (@basic) {
- src: url(font/Symbola.eot);
+ src: url(fonts/Symbola.eot);
src:
local("Symbola Regular"),
local("Symbola"),
- url(font/Symbola.woff2) format("woff2"),
- url(font/Symbola.woff) format("woff"),
- url(font/Symbola.ttf) format("truetype"),
- url(font/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(font/Symbola-basic.eot);
+ src: url(fonts/Symbola-basic.eot);
src:
local("Symbola Regular"),
local("Symbola"),
- url(font/Symbola-basic.woff2) format("woff2"),
- url(font/Symbola-basic.woff) format("woff"),
- url(font/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")
;
}
diff --git a/src/font/Symbola-basic.eot b/src/fonts/Symbola-basic.eot
similarity index 100%
rename from src/font/Symbola-basic.eot
rename to src/fonts/Symbola-basic.eot
Binary files differ
diff --git a/src/font/Symbola-basic.ttf b/src/fonts/Symbola-basic.ttf
similarity index 100%
rename from src/font/Symbola-basic.ttf
rename to src/fonts/Symbola-basic.ttf
Binary files differ
diff --git a/src/font/Symbola-basic.woff b/src/fonts/Symbola-basic.woff
similarity index 100%
rename from src/font/Symbola-basic.woff
rename to src/fonts/Symbola-basic.woff
Binary files differ
diff --git a/src/font/Symbola-basic.woff2 b/src/fonts/Symbola-basic.woff2
similarity index 100%
rename from src/font/Symbola-basic.woff2
rename to src/fonts/Symbola-basic.woff2
Binary files differ
diff --git a/src/font/Symbola.eot b/src/fonts/Symbola.eot
similarity index 100%
rename from src/font/Symbola.eot
rename to src/fonts/Symbola.eot
Binary files differ
diff --git a/src/font/Symbola.svg b/src/fonts/Symbola.svg
similarity index 100%
rename from src/font/Symbola.svg
rename to src/fonts/Symbola.svg
diff --git a/src/font/Symbola.ttf b/src/fonts/Symbola.ttf
similarity index 100%
rename from src/font/Symbola.ttf
rename to src/fonts/Symbola.ttf
Binary files differ
diff --git a/src/font/Symbola.woff b/src/fonts/Symbola.woff
similarity index 100%
rename from src/font/Symbola.woff
rename to src/fonts/Symbola.woff
Binary files differ
diff --git a/src/font/Symbola.woff2 b/src/fonts/Symbola.woff2
similarity index 100%
rename from src/font/Symbola.woff2
rename to src/fonts/Symbola.woff2
Binary files differ
