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
Binary file removed app/fonts/Source_Code_Pro_300.eot
Binary file not shown.
352 changes: 0 additions & 352 deletions app/fonts/Source_Code_Pro_300.svg

This file was deleted.

Binary file removed app/fonts/Source_Code_Pro_300.ttf
Binary file not shown.
Binary file removed app/fonts/Source_Code_Pro_300.woff
Binary file not shown.
Binary file removed app/fonts/Source_Code_Pro_400.eot
Binary file not shown.
350 changes: 0 additions & 350 deletions app/fonts/Source_Code_Pro_400.svg

This file was deleted.

Binary file removed app/fonts/Source_Code_Pro_400.ttf
Binary file not shown.
Binary file removed app/fonts/Source_Code_Pro_400.woff
Binary file not shown.
Binary file removed app/fonts/Source_Code_Pro_500.eot
Binary file not shown.
344 changes: 0 additions & 344 deletions app/fonts/Source_Code_Pro_500.svg

This file was deleted.

Binary file removed app/fonts/Source_Code_Pro_500.ttf
Binary file not shown.
Binary file removed app/fonts/Source_Code_Pro_500.woff
Binary file not shown.
Binary file removed app/fonts/Source_Code_Pro_600.eot
Binary file not shown.
342 changes: 0 additions & 342 deletions app/fonts/Source_Code_Pro_600.svg

This file was deleted.

Binary file removed app/fonts/Source_Code_Pro_600.ttf
Binary file not shown.
Binary file removed app/fonts/Source_Code_Pro_600.woff
Binary file not shown.
48 changes: 0 additions & 48 deletions app/styles/fonts.less
Original file line number Diff line number Diff line change
Expand Up @@ -24,54 +24,6 @@
url('@{fonts-folder}/Droid_Sans_700.ttf') format('truetype'),
url('@{fonts-folder}/Droid_Sans_700.svg#DroidSans') format('svg');
}
@font-face {
font-family: 'Source Code Pro';
font-style: normal;
font-weight: 300;
src:
local('Source Code Pro Light'),
local('SourceCodePro-Light'),
url('@{fonts-folder}/Source_Code_Pro_300.eot?#iefix') format('embedded-opentype'),
url('@{fonts-folder}/Source_Code_Pro_300.woff') format('woff'),
url('@{fonts-folder}/Source_Code_Pro_300.ttf') format('truetype'),
url('@{fonts-folder}/Source_Code_Pro_300.svg#SourceCodePro') format('svg');
}
@font-face {
font-family: 'Source Code Pro';
font-style: normal;
font-weight: 400;
src:
local('Source Code Pro'),
local('SourceCodePro-Regular'),
url('@{fonts-folder}/Source_Code_Pro_400.eot?#iefix') format('embedded-opentype'),
url('@{fonts-folder}/Source_Code_Pro_400.woff') format('woff'),
url('@{fonts-folder}/Source_Code_Pro_400.ttf') format('truetype'),
url('@{fonts-folder}/Source_Code_Pro_400.svg#SourceCodePro') format('svg');
}
@font-face {
font-family: 'Source Code Pro';
font-style: normal;
font-weight: 500;
src:
local('Source Code Pro Medium'),
local('SourceCodePro-Medium'),
url('@{fonts-folder}/Source_Code_Pro_500.eot?#iefix') format('embedded-opentype'),
url('@{fonts-folder}/Source_Code_Pro_500.woff') format('woff'),
url('@{fonts-folder}/Source_Code_Pro_500.ttf') format('truetype'),
url('@{fonts-folder}/Source_Code_Pro_500.svg#SourceCodePro') format('svg');
}
@font-face {
font-family: 'Source Code Pro';
font-style: normal;
font-weight: 600;
src:
local('Source Code Pro Semibold'),
local('SourceCodePro-Semibold'),
url('@{fonts-folder}/Source_Code_Pro_600.eot?#iefix') format('embedded-opentype'),
url('@{fonts-folder}/Source_Code_Pro_600.woff') format('woff'),
url('@{fonts-folder}/Source_Code_Pro_600.ttf') format('truetype'),
url('@{fonts-folder}/Source_Code_Pro_600.svg#SourceCodePro') format('svg');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
Expand Down
1 change: 1 addition & 0 deletions app/styles/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
@import (less) "../bower_components/json-formatter/dist/json-formatter.css";
@import (less) "../bower_components/json-formatter-js/dist/style.css";
@import (less) "../bower_components/json-schema-view-js/dist/style.css";
@import (less) "../bower_components/source-code-pro/source-code-pro.css";
// endbower

// bower:less
Expand Down
1 change: 1 addition & 0 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"promise-polyfill": "~2.1.0",
"schema-form": "~0.1.4",
"SparkMD5": "spark-md5#~1.0.0",
"source-code-pro": "git://github.com/adobe-fonts/source-code-pro.git#156db3bf0b",
"yaml-js": "~0.1.1",
"yaml-worker": "^2.0.0"
},
Expand Down
1 change: 1 addition & 0 deletions grunt/concurrent.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ module.exports = {
],
dist: [
'copy:ace',
'copy:sourceCodePro',
'copy:styles'
]
};
15 changes: 15 additions & 0 deletions grunt/copy.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,20 @@ module.exports = {
'mode-yaml.js',
'mode-json.js'
],
},
sourceCodePro: {
expand: true,
cwd: 'app/bower_components/source-code-pro/',
// Upstream source-code-pro.css loads fonts by relative path
// from it's location, and since source-code-pro.css is bundled
// in dist/styles/main.css, we need to copy fonts there too.
dest: 'dist/styles/',
src: [
'**/*.eot',
'**/*.otf',
'**/*.ttf',
'**/*.woff',
'**/*.woff2'
]
}
};