You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by dm...@apache.org on 2017/10/18 17:04:26 UTC
aurora git commit: Add Source Sans Pro font to project
Repository: aurora
Updated Branches:
refs/heads/master 0efe41572 -> b17420538
Add Source Sans Pro font to project
Reviewed at https://reviews.apache.org/r/63099/
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/b1742053
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/b1742053
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/b1742053
Branch: refs/heads/master
Commit: b17420538768d408ea79b6d908c45642dbc88e26
Parents: 0efe415
Author: David McLaughlin <da...@dmclaughlin.com>
Authored: Wed Oct 18 09:58:35 2017 -0700
Committer: David McLaughlin <da...@dmclaughlin.com>
Committed: Wed Oct 18 09:58:35 2017 -0700
----------------------------------------------------------------------
.gitignore | 1 +
ui/src/main/js/index.js | 1 +
ui/src/main/resources/SourceSansPro-Black.ttf | Bin 0 -> 148325 bytes
ui/src/main/resources/SourceSansPro-Bold.ttf | Bin 0 -> 148889 bytes
ui/src/main/resources/SourceSansPro-Regular.ttf | Bin 0 -> 149929 bytes
.../main/resources/SourceSansPro-Semibold.ttf | Bin 0 -> 149590 bytes
ui/src/main/resources/source-sans-pro.css | 22 +++++++++++++++++++
ui/webpack.config.js | 2 +-
8 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/b1742053/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 829ab05..9ce74eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@
/ui/dist/
/ui/node_modules/
/ui/out/
+src/main/resources/scheduler/assets/js/*.ttf
http://git-wip-us.apache.org/repos/asf/aurora/blob/b1742053/ui/src/main/js/index.js
----------------------------------------------------------------------
diff --git a/ui/src/main/js/index.js b/ui/src/main/js/index.js
index 5ad5f37..8cb4490 100644
--- a/ui/src/main/js/index.js
+++ b/ui/src/main/js/index.js
@@ -12,6 +12,7 @@ import Update from 'pages/Update';
import Updates from 'pages/Updates';
import 'bootstrap/dist/css/bootstrap.css';
+import '../resources/source-sans-pro.css';
import '../sass/app.scss';
const injectApi = (Page) => (props) => <Page api={SchedulerClient} {...props} />;
http://git-wip-us.apache.org/repos/asf/aurora/blob/b1742053/ui/src/main/resources/SourceSansPro-Black.ttf
----------------------------------------------------------------------
diff --git a/ui/src/main/resources/SourceSansPro-Black.ttf b/ui/src/main/resources/SourceSansPro-Black.ttf
new file mode 100755
index 0000000..489e65a
Binary files /dev/null and b/ui/src/main/resources/SourceSansPro-Black.ttf differ
http://git-wip-us.apache.org/repos/asf/aurora/blob/b1742053/ui/src/main/resources/SourceSansPro-Bold.ttf
----------------------------------------------------------------------
diff --git a/ui/src/main/resources/SourceSansPro-Bold.ttf b/ui/src/main/resources/SourceSansPro-Bold.ttf
new file mode 100755
index 0000000..b23d6f3
Binary files /dev/null and b/ui/src/main/resources/SourceSansPro-Bold.ttf differ
http://git-wip-us.apache.org/repos/asf/aurora/blob/b1742053/ui/src/main/resources/SourceSansPro-Regular.ttf
----------------------------------------------------------------------
diff --git a/ui/src/main/resources/SourceSansPro-Regular.ttf b/ui/src/main/resources/SourceSansPro-Regular.ttf
new file mode 100755
index 0000000..1e077ba
Binary files /dev/null and b/ui/src/main/resources/SourceSansPro-Regular.ttf differ
http://git-wip-us.apache.org/repos/asf/aurora/blob/b1742053/ui/src/main/resources/SourceSansPro-Semibold.ttf
----------------------------------------------------------------------
diff --git a/ui/src/main/resources/SourceSansPro-Semibold.ttf b/ui/src/main/resources/SourceSansPro-Semibold.ttf
new file mode 100755
index 0000000..f0d0ba4
Binary files /dev/null and b/ui/src/main/resources/SourceSansPro-Semibold.ttf differ
http://git-wip-us.apache.org/repos/asf/aurora/blob/b1742053/ui/src/main/resources/source-sans-pro.css
----------------------------------------------------------------------
diff --git a/ui/src/main/resources/source-sans-pro.css b/ui/src/main/resources/source-sans-pro.css
new file mode 100644
index 0000000..5e2e81f
--- /dev/null
+++ b/ui/src/main/resources/source-sans-pro.css
@@ -0,0 +1,22 @@
+@font-face {
+ font-family: 'Source Sans Pro';
+ src: local('Source Sans Pro'), url('./SourceSansPro-Regular.ttf');
+}
+
+@font-face {
+ font-family: 'Source Sans Pro';
+ font-weight: 600;
+ src: local('Source Sans Pro SemiBold'), url('./SourceSansPro-Semibold.ttf');
+}
+
+@font-face {
+ font-family: 'Source Sans Pro';
+ font-weight: 700;
+ src: local('Source Sans Pro Bold'), url('./SourceSansPro-Bold.ttf');
+}
+
+@font-face {
+ font-family: 'Source Sans Pro';
+ font-weight: 900;
+ src: local('Source Sans Pro Black'), url('./SourceSansPro-Black.ttf');
+}
http://git-wip-us.apache.org/repos/asf/aurora/blob/b1742053/ui/webpack.config.js
----------------------------------------------------------------------
diff --git a/ui/webpack.config.js b/ui/webpack.config.js
index 789817f..60e611c 100644
--- a/ui/webpack.config.js
+++ b/ui/webpack.config.js
@@ -38,7 +38,7 @@ module.exports = {
use: ['style-loader', 'css-loader']
}, {
test: /\.(png|woff|woff2|eot|ttf|svg)$/,
- loader: 'url-loader?limit=100000'
+ loader: 'url-loader?limit=150000'
}]
}
};