Permalink
Browse files

Merge commit 'f58d634052df2f886ea8c8f9e65a1c5132bf3e05' into HEAD

  • Loading branch information...
2 parents fb0c970 + f58d634 commit 978c1aa4c0b39a1b776ca5490aa775206e34c8ff Jenkins committed Oct 15, 2012
View
@@ -4,7 +4,6 @@ gem "sinatra"
gem "zendesk_api"
gem "rake"
gem "unicorn"
-gem 'slimmer', '1.2.4'
gem "mail"
group :test do
View
@@ -1,23 +1,15 @@
GEM
remote: http://rubygems.org/
specs:
- PriorityQueue (0.1.2)
- builder (3.0.0)
faraday (0.8.4)
multipart-post (~> 1.1)
faraday_middleware (0.8.8)
faraday (>= 0.7.4, < 0.9)
- gds-api-adapters (0.2.3)
- lrucache (~> 0.1.1)
- null_logger
- plek
hashie (1.2.0)
i18n (0.6.1)
inflection (1.0.0)
json (1.7.5)
kgio (2.7.4)
- lrucache (0.1.3)
- PriorityQueue (~> 0.1.2)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -27,10 +19,6 @@ GEM
mocha (0.12.3)
metaclass (~> 0.0.1)
multipart-post (1.1.5)
- nokogiri (1.5.5)
- null_logger (0.0.1)
- plek (0.3.0)
- builder
polyglot (0.3.3)
rack (1.4.1)
rack-protection (1.2.0)
@@ -43,13 +31,6 @@ GEM
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
- slimmer (1.2.4)
- gds-api-adapters (>= 0.0.33, < 0.3.0)
- json
- nokogiri (~> 1.5.0)
- null_logger
- plek (>= 0.1.8)
- rack (>= 1.3.5)
tilt (1.3.3)
treetop (1.4.10)
polyglot
@@ -76,6 +57,5 @@ DEPENDENCIES
rack-test
rake
sinatra
- slimmer (= 1.2.4)
unicorn
zendesk_api
View
@@ -1,7 +1,2 @@
require "./lib/app"
-if ENV['RACK_ENV'] == "development"
- use(Slimmer::App, :asset_host => "http://static.preview.alphagov.co.uk")
-else
- use Slimmer::App
-end
run App
@@ -4,6 +4,10 @@
display: block;
}
+body {
+ font-family: Helvetica, sans-serif;
+}
+
/* White Content */
#framework {
background-color: white;
@@ -221,10 +225,16 @@ header.section-header {
margin-bottom: 10px;
}
+section#hint {
+ line-height: 1em;
+ background-color: #f0f0f0;
+ font-size: 1.2em;
+ padding: 1em;
+}
+
header.content-header hgroup h1 {
background-repeat: no-repeat;
color: black;
- font-family: "NTA", "Helvetica Neue", Arial, Helvetica, sans-serif;
font-size: 2em;
font-weight: 400;
letter-spacing: 0;
@@ -237,7 +247,7 @@ header.content-header hgroup h1 {
}
#wrapper header h1 {
- margin: 0 0 0 1.572727273em;
+ margin: 0 0 0 1.73em;
margin-top: 20px;
}
@@ -1,4 +1,11 @@
<section id="message">
<p>Request a change to existing GOVUK content.</p>
+ </section>
+
+ <p></p>
+
+ <section id="hint">
+ <p>If requesting an urgent content amend request, please follow up your submission of the form with a phone call to 07827 992603.</p>
+ <p>An urgent content amend request should only be made if the public or the government is facing immediate and significant financial, legal or physical risk.</p>
</section>
View
@@ -1,5 +1,6 @@
<meta charset="utf-8" />
<meta HTTP-EQUIV="Pragma" CONTENT="no-cache">
+<meta name="robots" content="noindex,nofollow">
<META HTTP-EQUIV="Expires" CONTENT="-1">
<link rel="stylesheet" type="text/css" href="/stylesheets/gov_feedback.css"/>
<!--[if lt IE 9]>
@@ -1,3 +1,9 @@
<section id="message">
<p>Complete this form to report a problem, to request GDS support, or to make a suggestion.</p>
+</section>
+
+<p></p>
+
+<section id="hint">
+ <p>To raise critical issues with Directgov-branded tools and transactions, please call Graham Francis on 07798 926978.</p>
</section>

0 comments on commit 978c1aa

Please sign in to comment.