diff --git a/app/fonts/Source_Code_Pro_300.eot b/app/fonts/Source_Code_Pro_300.eot
deleted file mode 100644
index 4c6b89bfd04..00000000000
Binary files a/app/fonts/Source_Code_Pro_300.eot and /dev/null differ
diff --git a/app/fonts/Source_Code_Pro_300.svg b/app/fonts/Source_Code_Pro_300.svg
deleted file mode 100644
index f085d2c0ee3..00000000000
--- a/app/fonts/Source_Code_Pro_300.svg
+++ /dev/null
@@ -1,352 +0,0 @@
-
-
-
diff --git a/app/fonts/Source_Code_Pro_300.ttf b/app/fonts/Source_Code_Pro_300.ttf
deleted file mode 100644
index 1481d1f1b9e..00000000000
Binary files a/app/fonts/Source_Code_Pro_300.ttf and /dev/null differ
diff --git a/app/fonts/Source_Code_Pro_300.woff b/app/fonts/Source_Code_Pro_300.woff
deleted file mode 100644
index 118e92ca8b1..00000000000
Binary files a/app/fonts/Source_Code_Pro_300.woff and /dev/null differ
diff --git a/app/fonts/Source_Code_Pro_400.eot b/app/fonts/Source_Code_Pro_400.eot
deleted file mode 100644
index 60bd73b5837..00000000000
Binary files a/app/fonts/Source_Code_Pro_400.eot and /dev/null differ
diff --git a/app/fonts/Source_Code_Pro_400.svg b/app/fonts/Source_Code_Pro_400.svg
deleted file mode 100644
index 850a5aa6648..00000000000
--- a/app/fonts/Source_Code_Pro_400.svg
+++ /dev/null
@@ -1,350 +0,0 @@
-
-
-
diff --git a/app/fonts/Source_Code_Pro_400.ttf b/app/fonts/Source_Code_Pro_400.ttf
deleted file mode 100644
index 268a2e4322e..00000000000
Binary files a/app/fonts/Source_Code_Pro_400.ttf and /dev/null differ
diff --git a/app/fonts/Source_Code_Pro_400.woff b/app/fonts/Source_Code_Pro_400.woff
deleted file mode 100644
index 7daeecc8a6a..00000000000
Binary files a/app/fonts/Source_Code_Pro_400.woff and /dev/null differ
diff --git a/app/fonts/Source_Code_Pro_500.eot b/app/fonts/Source_Code_Pro_500.eot
deleted file mode 100644
index b0f95c5ce4e..00000000000
Binary files a/app/fonts/Source_Code_Pro_500.eot and /dev/null differ
diff --git a/app/fonts/Source_Code_Pro_500.svg b/app/fonts/Source_Code_Pro_500.svg
deleted file mode 100644
index 1cc6ffc76cd..00000000000
--- a/app/fonts/Source_Code_Pro_500.svg
+++ /dev/null
@@ -1,344 +0,0 @@
-
-
-
diff --git a/app/fonts/Source_Code_Pro_500.ttf b/app/fonts/Source_Code_Pro_500.ttf
deleted file mode 100644
index 3387d07e01d..00000000000
Binary files a/app/fonts/Source_Code_Pro_500.ttf and /dev/null differ
diff --git a/app/fonts/Source_Code_Pro_500.woff b/app/fonts/Source_Code_Pro_500.woff
deleted file mode 100644
index cf61584f2f8..00000000000
Binary files a/app/fonts/Source_Code_Pro_500.woff and /dev/null differ
diff --git a/app/fonts/Source_Code_Pro_600.eot b/app/fonts/Source_Code_Pro_600.eot
deleted file mode 100644
index 020eda323b8..00000000000
Binary files a/app/fonts/Source_Code_Pro_600.eot and /dev/null differ
diff --git a/app/fonts/Source_Code_Pro_600.svg b/app/fonts/Source_Code_Pro_600.svg
deleted file mode 100644
index 8770eaece1e..00000000000
--- a/app/fonts/Source_Code_Pro_600.svg
+++ /dev/null
@@ -1,342 +0,0 @@
-
-
-
diff --git a/app/fonts/Source_Code_Pro_600.ttf b/app/fonts/Source_Code_Pro_600.ttf
deleted file mode 100644
index 00d27da81b0..00000000000
Binary files a/app/fonts/Source_Code_Pro_600.ttf and /dev/null differ
diff --git a/app/fonts/Source_Code_Pro_600.woff b/app/fonts/Source_Code_Pro_600.woff
deleted file mode 100644
index 0afa123985a..00000000000
Binary files a/app/fonts/Source_Code_Pro_600.woff and /dev/null differ
diff --git a/app/styles/fonts.less b/app/styles/fonts.less
index 9940ac26400..d55c2a2ec7f 100644
--- a/app/styles/fonts.less
+++ b/app/styles/fonts.less
@@ -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;
diff --git a/app/styles/main.less b/app/styles/main.less
index a9356e52d73..a7dac318690 100644
--- a/app/styles/main.less
+++ b/app/styles/main.less
@@ -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
diff --git a/bower.json b/bower.json
index 5cccc941359..8cdd7dc551c 100644
--- a/bower.json
+++ b/bower.json
@@ -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"
},
diff --git a/grunt/concurrent.js b/grunt/concurrent.js
index 99965bfaefd..b99b5750bfc 100644
--- a/grunt/concurrent.js
+++ b/grunt/concurrent.js
@@ -9,6 +9,7 @@ module.exports = {
],
dist: [
'copy:ace',
+ 'copy:sourceCodePro',
'copy:styles'
]
};
diff --git a/grunt/copy.js b/grunt/copy.js
index 72dd4960d2f..f86da9f8d2f 100644
--- a/grunt/copy.js
+++ b/grunt/copy.js
@@ -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'
+ ]
}
};