Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
4f02861d
Commit
4f02861d
authored
Oct 26, 2018
by
shuangcheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ss
parent
8802c4fa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
20 deletions
+36
-20
common/lib/xmodule/xmodule/js/src/html/edit.coffee
+6
-16
common/static/css/tinymce-studio-content-fonts.css
+30
-4
No files found.
common/lib/xmodule/xmodule/js/src/html/edit.coffee
View file @
4f02861d
class
@
HTMLEditingDescriptor
# custom fonts are prepended to font selection dropdown
CUSTOM_FONTS
=
"Default='Open Sans', Verdana, Arial, Helvetica, sans-serif;"
CUSTOM_FONTS
=
"Default=
OrhonChaganTig,
'Open Sans', Verdana, Arial, Helvetica, sans-serif;"
# list of standard tinyMCE fonts: http://www.tinymce.com/wiki.php/Configuration:font_formats
STANDARD_FONTS
=
"Andale Mono=andale mono,times;"
+
"Orhon ChaganTig=OrhonChaganTig;"
+
"Orhon HawangTig=OrhonHawangTig;"
+
"Orhon GarchagTig=OrhonGarchagTig"
"Arial=arial,helvetica,sans-serif;"
+
"Arial Black=arial black,avant garde;"
+
"Book Antiqua=book antiqua,palatino;"
+
"Comic Sans MS=comic sans ms,sans-serif;"
+
"Courier New=courier new,courier;"
+
"Georgia=georgia,palatino;"
+
"Helvetica=helvetica;"
+
"Impact=impact,chicago;"
+
"Symbol=symbol;"
+
"Tahoma=tahoma,arial,helvetica,sans-serif;"
+
"Terminal=terminal,monaco;"
+
"Times New Roman=times new roman,times;"
+
"Trebuchet MS=trebuchet ms,geneva;"
+
"Verdana=verdana,geneva;"
+
"Webdings=webdings;"
+
"Wingdings=wingdings,zapf dingbats"
"Arial Black=arial black,avant garde"
_getFonts
=
()
->
CUSTOM_FONTS
+
STANDARD_FONTS
...
...
common/static/css/tinymce-studio-content-fonts.css
View file @
4f02861d
/* NOTE: This file, which loads all necessary fonts for rendering Studio UI, is 1 of 3 CSS files compiled in our production pipeline */
/* No subsetting. */
@font-face
{
font-family
:
'OrhonChaganTig'
;
src
:
local
(
"OrhonChaganTig"
),
url('../fonts/OrhonChaganTig.eot')
;
...
...
@@ -64,13 +65,38 @@
}
@font-face
{
font-family
:
'OrhonGarchagTig-V'
;
src
:
local
(
"OrhonGarchagTig-H"
),
url('../fonts/OrhonGarchagTig-V.eot')
;
src
:
local
(
"OrhonGarchagTig-H"
),
url('../fonts/OrhonGarchagTig-V.eot?#iefix')
format
(
'embedded-opentype'
),
url('../fonts/OrhonGarchagTig-V.ttf')
format
(
'truetype'
);
font-family
:
'OrhonHawangTig'
;
src
:
local
(
"OrhonHawangTig"
),
url('../fonts/OrhonHawangTig.eot')
;
src
:
local
(
"OrhonHawangTig"
),
url('../fonts/OrhonHawangTig.eot?#iefix')
format
(
'embedded-opentype'
),
url('../fonts/OrhonHawangTig.ttf')
format
(
'truetype'
);
font-weight
:
normal
;
font-style
:
normal
;
}
@font-face
{
font-family
:
'OrhonHawangTig-H'
;
src
:
local
(
"OrhonHawangTig-H"
),
url('../fonts/OrhonHawangTig-H.eot')
;
src
:
local
(
"OrhonHawangTig-H"
),
url('../fonts/OrhonHawangTig-H.eot?#iefix')
format
(
'embedded-opentype'
),
url('../fonts/OrhonHawangTig.ttf')
format
(
'truetype'
);
font-weight
:
normal
;
font-style
:
normal
;
}
@font-face
{
font-family
:
'OrhonHawangTig-V'
;
src
:
local
(
"OrhonHawangTig-V"
),
url('../fonts/OrhonHawangTig-V.eot')
;
src
:
local
(
"OrhonHawangTig-V"
),
url('../fonts/OrhonHawangTig-V.eot?#iefix')
format
(
'embedded-opentype'
),
url('../fonts/OrhonHawangTig-V.ttf')
format
(
'truetype'
);
font-weight
:
normal
;
font-style
:
normal
;
}
@font-face
{
font-family
:
'OrhonHawangTig-RTL'
;
src
:
local
(
"OrhonHawangTig"
),
url('../fonts/OrhonHawangTig-RTL.eot')
;
src
:
local
(
"OrhonHawangTig-RTL"
),
url('../fonts/OrhonHawangTig-RTL.eot?#iefix')
format
(
'embedded-opentype'
),
url('../fonts/OrhonHawangTig-RTL.ttf')
format
(
'truetype'
);
font-weight
:
normal
;
font-style
:
normal
;
}
@font-face
{
font-family
:
'Open Sans'
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment