From a3762ec91ca13d4e99321299891548442bd0db2a Mon Sep 17 00:00:00 2001 From: Palmer Date: Wed, 10 Dec 2014 23:18:33 -0500 Subject: [PATCH 1/4] docs(app): adds roboto font --- docs/app/assets/css/docs.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/app/assets/css/docs.css b/docs/app/assets/css/docs.css index b77db528..fef51c2a 100644 --- a/docs/app/assets/css/docs.css +++ b/docs/app/assets/css/docs.css @@ -1,3 +1,13 @@ +@import url(http://fonts.googleapis.com/css?family=Roboto:500,400,300); + +@font-face { + font-family: 'Roboto', sans-serif; +} + +body { + font-family: Roboto, Arial, serif; +} + md-sidenav.md-locked-open[flex="20"] { width: 20%; } From 704e61e963dabe357711edbc31d5846b0eb14c99 Mon Sep 17 00:00:00 2001 From: Palmer Date: Mon, 15 Dec 2014 22:52:23 -0500 Subject: [PATCH 2/4] docs(app): updates typography --- docs/app/assets/css/docs.css | 16 ++++++++++++++++ docs/config/services/deployments/default.js | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/docs/app/assets/css/docs.css b/docs/app/assets/css/docs.css index b77db528..42c8e9b4 100644 --- a/docs/app/assets/css/docs.css +++ b/docs/app/assets/css/docs.css @@ -1,3 +1,19 @@ +body { + font-family: 'Roboto', sans-serif; + font-size: 16px; + font-weight: 400; +} + +h1 { + font-size: 40px; + font-weight: 400; +} + +h2 { + font-size: 24px; + font-weight: 400; +} + md-sidenav.md-locked-open[flex="20"] { width: 20%; } diff --git a/docs/config/services/deployments/default.js b/docs/config/services/deployments/default.js index e730829a..e5c5fa2a 100644 --- a/docs/config/services/deployments/default.js +++ b/docs/config/services/deployments/default.js @@ -32,7 +32,8 @@ module.exports = function defaultDeployment(getComponentPath) { 'css/prettify-theme.css', 'css/docs.css', 'css/animations.css', - 'font-awesome/css/font-awesome.css' + 'font-awesome/css/font-awesome.css', + 'http://fonts.googleapis.com/css?family=Roboto:400,400italic,500,700' ] }; }; From 1e2b57de58ccee82ad1d5ce85d3f38cc53abedc2 Mon Sep 17 00:00:00 2001 From: Palmer Date: Mon, 15 Dec 2014 23:26:46 -0500 Subject: [PATCH 3/4] docs(app): replaces font px w/ % --- docs/app/assets/css/docs.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/app/assets/css/docs.css b/docs/app/assets/css/docs.css index 42c8e9b4..ed7c6f6c 100644 --- a/docs/app/assets/css/docs.css +++ b/docs/app/assets/css/docs.css @@ -1,16 +1,16 @@ body { font-family: 'Roboto', sans-serif; - font-size: 16px; + font-size: 85%; font-weight: 400; } h1 { - font-size: 40px; + font-size: 225%; font-weight: 400; } h2 { - font-size: 24px; + font-size: 185%; font-weight: 400; } From 824dbb6c059e2aa4a6d59ac2cdba3a07cc34aed4 Mon Sep 17 00:00:00 2001 From: Palmer Date: Tue, 16 Dec 2014 14:03:02 -0500 Subject: [PATCH 4/4] docs(app): adds stylesheets to deployment files --- docs/config/services/deployments/debug.js | 3 ++- docs/config/services/deployments/default.js | 2 +- docs/config/services/deployments/jquery.js | 3 ++- docs/config/services/deployments/production.js | 5 +++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/config/services/deployments/debug.js b/docs/config/services/deployments/debug.js index 90e2ef34..afb4d7ec 100644 --- a/docs/config/services/deployments/debug.js +++ b/docs/config/services/deployments/debug.js @@ -32,7 +32,8 @@ module.exports = function debugDeployment(getComponentPath) { 'css/prettify-theme.css', 'css/docs.css', 'css/animations.css', - 'font-awesome/css/font-awesome.css' + 'font-awesome/css/font-awesome.css', + '//fonts.googleapis.com/css?family=Roboto:400,400italic,500,700' ] }; }; diff --git a/docs/config/services/deployments/default.js b/docs/config/services/deployments/default.js index e5c5fa2a..2a7d07b6 100644 --- a/docs/config/services/deployments/default.js +++ b/docs/config/services/deployments/default.js @@ -33,7 +33,7 @@ module.exports = function defaultDeployment(getComponentPath) { 'css/docs.css', 'css/animations.css', 'font-awesome/css/font-awesome.css', - 'http://fonts.googleapis.com/css?family=Roboto:400,400italic,500,700' + '//fonts.googleapis.com/css?family=Roboto:400,400italic,500,700' ] }; }; diff --git a/docs/config/services/deployments/jquery.js b/docs/config/services/deployments/jquery.js index 37a36d78..b228dbe0 100644 --- a/docs/config/services/deployments/jquery.js +++ b/docs/config/services/deployments/jquery.js @@ -36,7 +36,8 @@ module.exports = function jqueryDeployment(getComponentPath) { 'css/prettify-theme.css', 'css/docs.css', 'css/animations.css', - 'font-awesome/css/font-awesome.css' + 'font-awesome/css/font-awesome.css', + '//fonts.googleapis.com/css?family=Roboto:400,400italic,500,700' ] }; }; diff --git a/docs/config/services/deployments/production.js b/docs/config/services/deployments/production.js index bc029fa9..601d3b9f 100644 --- a/docs/config/services/deployments/production.js +++ b/docs/config/services/deployments/production.js @@ -32,7 +32,8 @@ module.exports = function productionDeployment(getVersion) { stylesheets: [ 'css/prettify-theme.css', 'css/docs.css', - 'css/animations.css' + 'css/animations.css', + '//fonts.googleapis.com/css?family=Roboto:400,400italic,500,700' ] }; -}; \ No newline at end of file +};