diff options
| author | Josh Angell <josh@supercooldesign.co.uk> | 2012-02-16 10:38:17 +0000 |
|---|---|---|
| committer | Josh Angell <josh@supercooldesign.co.uk> | 2012-02-16 10:38:17 +0000 |
| commit | f85c18ff212b9db614dba2ce0f6b4afdd9792d31 (patch) | |
| tree | f279418eedfcf5663d9cdee398cc47ca58206a63 | |
| parent | 8a28c1759a7080cf8785c6b0c06f8e6257658c5c (diff) | |
Frontpage general and top bits done, added in a bodyclass and mainclass variable to the header.html template
Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
| -rw-r--r-- | templates/web/fixmystreet/header.html | 4 | ||||
| -rw-r--r-- | templates/web/fixmystreet/index.html | 38 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/base.scss | 5 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/images/sprite.png | bin | 67024 -> 122438 bytes | |||
| -rw-r--r-- | web/cobrands/fixmystreet/layout.scss | 88 |
5 files changed, 111 insertions, 24 deletions
diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index b6404b91c..e5a7ee7c2 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -27,7 +27,7 @@ [% INCLUDE 'tracking_code.html' %] </head> - <body> + <body class="[% "$bodyclass" | html IF bodyclass %]"> <div class="wrapper"> @@ -39,7 +39,7 @@ </header> <div class="container"> - <div class="content" role="main"> + <div class="content [% "$mainclass" | html IF mainclass %]" role="main"> <div id="user-meta"> <ul> [% IF c.user_exists %] diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index b571d27b8..41067b26b 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html', title => '' %] +[% INCLUDE 'header.html', title => '' , mainclass => 'fullwidthpage', bodyclass => 'frontpage' %] [% IF error %] <p class="error">[% error %]</p> @@ -6,23 +6,25 @@ <div id="front-main"> - <h1>[% loc('Report, view, or discuss local problems') %]</h1> - - <h2>[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]</h2> - - [% - question - = c.cobrand.enter_postcode_text() - || loc("Enter a nearby GB postcode, or street name and area"); - %] - - <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> - <label for="pc">[% question %]:</label> - <div> - <input type="text" name="pc" value="" id="pc" size="10" maxlength="200" placeholder="e.g. ‘B1’ or ‘Hockley Birmingham’"> - <input type="submit" value="[% loc('Go') %]" id="submit"> - </div> - </form> + <div id="front-main-container"> + <h1>[% loc('Report, view, or discuss local problems') %]</h1> + + <h2>[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]</h2> + + [% + question + = c.cobrand.enter_postcode_text() + || loc("Enter a nearby GB postcode, or street name and area"); + %] + + <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> + <label for="pc">[% question %]:</label> + <div> + <input type="text" name="pc" value="" id="pc" size="10" maxlength="200" placeholder="e.g. ‘B1’ or ‘Hockley Birmingham’"> + <input type="submit" value="[% loc('Go') %]" id="submit"> + </div> + </form> + </div> </div> diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 816f80363..32b52e30e 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -80,7 +80,7 @@ body { margin:0; font-size:1em; line-height:1.5; - color:#222222; + color:#222; } @@ -757,9 +757,6 @@ a:hover.rap-notes-trigger { /* Front page */ #front-main { text-align:center; - h1 { - - } h2 { font: { style:italic; diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png Binary files differindex a72d754f8..3c2ce9ee8 100644 --- a/web/cobrands/fixmystreet/images/sprite.png +++ b/web/cobrands/fixmystreet/images/sprite.png diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 88ba90768..e013130f5 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -139,6 +139,9 @@ body { margin-bottom: -1em; @include box-shadow(0px 0px 6px 1px #000); } +.fullwidthpage { + width: 57em; +} #map_box{ position: absolute; @@ -225,6 +228,11 @@ body { width: 29em; } +.fullwidthpage { + .full-width { + width:58em; + } +} /*FORMS*/ input[type=text], @@ -258,6 +266,86 @@ textarea{ } +/* Frontpage */ +body.frontpage { + background:#1a1a1a; + .wrapper { + >.container { + position:static; + } + .content { + padding-top:15em; + } + } + .nav-wrapper-2{ + background: #1a1a1a; + height:6em; + } + #header{ + #site-logo{ + margin-top:2em; + width: 300px; + height: 60px; + background-position:-2px -108px; + } + } + #user-meta { + display:none; + } +} + +#front-main { + background:$primary; + position:absolute; + width:100%; + left:0; + top:8em; + #front-main-container { + width: 57em; + margin:0 auto; + } + h2 { + font-style:normal; + margin:0; + color:#222; + } + #postcodeForm { + float:right; + overflow:hidden; + width:47em; + margin-right:0.5em; + label { + float:left; + margin-top:0.25em; + } + div { + float:right; + width:20em; + input#pc { + padding:0.25em 0.5em; + width:16em; + } + input#submit { + width:3em; + } + } + } + a#geolocate_link { + background:none; + color:#222; + float:right; + margin:-1em 7.5em 0.5em 0; + &:hover { + text-decoration:underline; + background:none; + } + } +} + + + + + /* MEDIA QUERIES */ @media only screen and (min-width: 640px) and (max-width: 960px) { |
