Merge pull request #4121 from cakephp/helvetica-body

Make the body text use helvetica.
cakephp · Jun 30, 2016 · 784be5d · 784be5d
2 parents 7a9a052 + 0f27f79
commit 784be5d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/themes/cakephp/layout.html b/themes/cakephp/layout.html
@@ -295,15 +295,15 @@ <h4 class="modal-title-cookbook" id="modal-header">{# header text injected via j
 	{# Document body #}
 	<div class="row">
 		<div class="col-sm-12 col-md-9 col-md-push-3 space-left push-off">
-			<div class="row">
-				{%- if pagename != 'search' and pagename != 'contents' and pagename != 'index' -%}
-				<div class="page-contents col-sm-5">
-					<h3>{{ _('Page Contents') }}</h3>
-					{{ toc }}
-				</div>
-				{%- endif -%}
+			{%- if pagename != 'search' and pagename != 'contents' and pagename != 'index' -%}
+			<div class="page-contents col-sm-5">
+				<h3>{{ _('Page Contents') }}</h3>
+				{{ toc }}
+			</div>
+			{%- endif -%}
 
-				{% block body %} {% endblock %}
+			<div class="document-body">
+			{% block body %} {% endblock %}
 			</div>
 		</div>
 

diff --git a/themes/cakephp/static/css/default.css b/themes/cakephp/static/css/default.css
@@ -1,3 +1,4 @@
+
 /*
  * default.css
  * ~~~~~~~~~~~~~
@@ -28,6 +29,13 @@
     margin: -50px 0 0; /* negative fixed header height */
 }
 
+.document-body {
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-weight: normal;
+    font-size: 15px;
+    letter-spacing: 0.02em;
+}
+
 /* Internal and external links generated by docutils have em inside the a. */
 .reference em {
     font-style: normal;

diff --git a/themes/cakephp/static/css/style.css b/themes/cakephp/static/css/style.css
@@ -15,7 +15,7 @@ body {
     text-rendering: optimizeLegibility;
     -moz-osx-font-smoothing: grayscale;
     min-height: 100%;
-    font-family: 'Raleway', sans-serif;
+    font-family: Raleway, sans-serif;
     font-size: 14px;
     line-height: 26px;
     letter-spacing: 0.05em;
@@ -39,6 +39,7 @@ hr {
     width: 100%;
 }
 h1, h2, h3, h4, h5, h6 {
+    font-family: Raleway, sans-serif;
     font-weight: 300;
     margin: 0;
     color: #363637;