diff options
| -rw-r--r-- | templates/web/fixmystreet/header.html | 1 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/new/fill_in_details_form.html | 7 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/base.scss | 5 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/layout.scss | 63 | ||||
| -rw-r--r-- | web/js/fixmystreet.js | 4 |
5 files changed, 64 insertions, 16 deletions
diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index 8ee70bd36..e1066c7b5 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -5,6 +5,7 @@ <!--[if gt IE 8]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> <head> <meta name="viewport" content="initial-scale=1.0"> + <meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html index a48e26893..5178ccb9e 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -1,8 +1,13 @@ <div id="report-a-poblem-main"> <h1>[% loc('Reporting a problem') %]</h1> + <!-- THIS NEED THE NAME OF THE COUNCIL --> + <p>[% loc('This report will be sent to <strong>Name of the Council</strong>.') %]</p> + <div id="report-a-poblem-sidebar"> - + <!-- + The text for this section needs checking, but I can't work out which bit comes from where + --> <div class="sidebar-tips"> [% IF report.used_map %] [% IF partial_token %] diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 02cfb4638..838d8cf38 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -445,6 +445,7 @@ label{ // this is the user's logged in details or the login link etc .wrapper { + width:100%; display:table; caption-side:bottom; } @@ -688,7 +689,9 @@ a:hover.button-left { a.rap-notes-trigger, a:hover.rap-notes-trigger { display:block; - margin:0 1.25em 0 0.5em; + width:90%; + padding-left:5%; + padding-right:5%; } .rap-notes { margin:1em 0; diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 068f6a378..89761c712 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -38,7 +38,7 @@ body { display: table-caption; .nav-wrapper-2{ width: 100%; - height: 3.5em; + min-height: 3.5em; position: fixed; border-top: 0.25em solid $primary; z-index:2; @@ -290,8 +290,8 @@ body.frontpage { } } #user-meta { - top:-3em; p { + top:-2em; right:0; } } @@ -304,7 +304,7 @@ body.frontpage { left:0; top:1em; #front-main-container { - width: 57em; + max-width: 57em; margin:0 auto; } h2 { @@ -319,14 +319,21 @@ body.frontpage { margin:0.5em 0; } div { + display:block; margin:0 auto; width:20em; + overflow:hidden; input#pc { + display:block; + float:left; padding:0.25em 0.5em; width:16em; } input#submit { + display:block; + float:right; width:3em; + height:2em; } } } @@ -446,7 +453,7 @@ body.frontpage { /* MEDIA QUERIES */ -@media only screen and (min-width: 640px) and (max-width: 960px) { +@media only screen and (min-width: 48em) and (max-width: 64em) { .container { width: 100%; } @@ -466,19 +473,51 @@ body.frontpage { width: auto; float:right; padding-left: 180px; - background: #222; - @include background(linear-gradient(#000, #222 10%, #222 90%, #000)); + } + .nav-wrapper { + // width:auto; + .nav-wrapper-2 { + // width:auto; + } } //Main menu drops below logo and my-soc menu #main-menu{ margin-top: 3em; } + //therefore header needs to open up + #header { + height:6em; + } + + //fix the left margin on login bit + #user-meta { + p { + left:1em; + } + } + body.frontpage { + #user-meta { + p { + left:auto; + } + } + } //Map become percentage width #map_box{ - width: 40%; - margin-right: 5%; + width: 38%; + } + + //put the RAP notes into the main copy area + #report-a-poblem-sidebar { + position: static; + width: auto; + @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0); + .sidebar-tips, + .sidebar-notes { + font-size:1em; + } } //Revert to mobile use of the .full-width class @@ -487,9 +526,9 @@ body.frontpage { margin: 0em -1em 0 -1em; } - //Remove all styling from the .content box - .content{ - width: 50%; - @include box-shadow(0px 0px 0px 0px #000); + //make fullpage auto width + .fullwidthpage { + width: auto; } + }
\ No newline at end of file diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 7967e3d7d..d88d66db4 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -70,7 +70,7 @@ function tabs(elem) $(function(){ - if(Modernizr.mq('only screen and (max-width:48em)')) { + if(Modernizr.mq('only screen and (max-width:47em)')) { $('html').addClass('mobile'); } @@ -288,7 +288,7 @@ $(function(){ */ $('.mobile').on('click', '#nav-link', function(e){ e.preventDefault(); - var foo = $('.wrapper').height() - $('main-nav').height(); + var foo = $('.wrapper').height() - 500; $('html, body').animate({scrollTop:foo}, 1000); }); });
\ No newline at end of file |