Move local stylesheet to partial & tidy up

alphagov · Feb 23, 2014 · 9472294 · 9472294
1 parent b0abed7
commit 9472294
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 11 deletions.
diff --git a/app.js b/app.js
@@ -12,28 +12,20 @@ app.set('views', __dirname + '/views');
 app.use('/public', express.static(__dirname + '/public'));
 app.use('/public', express.static(__dirname + '/govuk/public'));
 
-var commonHead = '<link href="/public/stylesheets/application.css" rel="stylesheet" type="text/css" />';
-
 // routes
 
 app.get('/', function (req, res) {
 
-  var head = commonHead;
-
   res.render('index',
             {'pageTitle': 'index',
-            'head' : head,
             'assetPath' : '/public/'});
 
 });
 
 app.get('/sample', function (req, res) {
 
-  var head = commonHead;
-
   res.render('sample',
             {'pageTitle': 'sample',
-            'head' : head,
             'assetPath' : '/public/'});
 });
 

diff --git a/public/sass/application.scss b/public/sass/application.scss
@@ -12,4 +12,12 @@
   @include ie-lte(6)  {
     width: 990px;
   }
-}
+}
+.page-header {
+  padding: 0 32px;
+
+  h1 {
+    @include bold-48;
+    padding: 25px 0 15px;
+  }
+}
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
@@ -105,3 +105,18 @@ Example usage:
 #content {
   margin: 0 auto;
   max-width: 1020px; }
+
+.page-header {
+  padding: 0 32px; }
+  .page-header h1 {
+    font-family: "nta", Arial, sans-serif;
+    font-size: 48px;
+    line-height: 1.04167;
+    font-weight: 400;
+    text-transform: none;
+    font-weight: 700;
+    padding: 25px 0 15px; }
+    @media (max-width: 640px) {
+      .page-header h1 {
+        font-size: 32px;
+        line-height: 1.09375; } }
diff --git a/views/head.html b/views/head.html
@@ -0,0 +1 @@
+<link href="/public/stylesheets/application.css" rel="stylesheet" type="text/css" />
diff --git a/views/index.html b/views/index.html
@@ -1,5 +1,9 @@
 {{<govuk_template}}
 
+{{$head}}
+  {{>head}}
+{{/head}}
+
 {{$propositionHeader}}
   {{>propositional_navigation}}
 {{/propositionHeader}}
@@ -8,8 +12,9 @@
 
 {{$content}}
 <main id="content" role="main">
-
-  <h1>Welcome to the GOV.UK prototyping kit</h1>
+  <header class="page-header">
+    <h1>Welcome to the GOV.UK prototyping kit</h1>
+  </header>
 
 </main>
 {{/content}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<link href="/public/stylesheets/application.css" rel="stylesheet" type="text/css" />