diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/cobrands/fixmystreet/base.scss | 17 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/config.rb | 3 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/layout.scss | 30 | ||||
-rw-r--r-- | web/js/fixmystreet.js | 8 | ||||
-rw-r--r-- | web/js/map-OpenLayers.js | 2 |
5 files changed, 52 insertions, 8 deletions
diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 0b59b7cdb..db0d94404 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -187,16 +187,14 @@ select, input, textarea { /* LINKS */ -a { +a, +a:visited { text-decoration:none; color:$contrast1; &:hover, &:active { - text-decoration:underline; - color:$contrast2; - } - &:visited { - color: $colour_dark; + text-decoration:underline; + color:$contrast2; } } @@ -407,6 +405,13 @@ input.red-btn{ /*OTHER*/ +.plain-list { + @include list-reset-soft; + li { + margin-bottom:1em; + } +} + .issue-list{ margin: 0 0 1em 0; padding: 0px; diff --git a/web/cobrands/fixmystreet/config.rb b/web/cobrands/fixmystreet/config.rb index 74d54cc2e..471b4b008 100644 --- a/web/cobrands/fixmystreet/config.rb +++ b/web/cobrands/fixmystreet/config.rb @@ -16,9 +16,10 @@ javascripts_dir = "" # To disable debugging comments that display the original location of your selectors. Uncomment: # line_comments = false - # If you prefer the indented syntax, you might want to regenerate this # project again passing --syntax sass, or you can uncomment this: # preferred_syntax = :sass # and then run: # sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass + +line_comments = false # by Compass.app
\ No newline at end of file diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index bcb4fa84a..e9b87062b 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -158,7 +158,7 @@ } } -// Wraps around #key-tools to bo +// Wraps around #key-tools box .shadow-wrap{ position:fixed; bottom: 0em; @@ -201,6 +201,34 @@ textarea{ } +/* Report a problem page*/ +.report-a-poblem-page { + width: 41.25em; + #map_box { + width:15em; + } + #report-a-poblem-main { + width: 27em; + } + #report-a-poblem-sidebar { + position:absolute; + left:29em; + top:0; + width:15em; + .sidebar-tips { + background:#eeeeee; + padding:1em; + font-size:0.75em; + } + .sidebar-notes { + background:#333333; + padding:1em; + color:#ffffff; + font-size:0.75em; + } + } +} + /* MEDIA QUERIES */ @media only screen and (min-width: 640px) and (max-width: 960px) { diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index c3de39b48..1ebff1f4c 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -193,5 +193,13 @@ $(function(){ }); } + /* + * Report a problem page + */ + //desktop + if($('#report-a-poblem-sidebar:visible').length > 0){ + $('.content[role=main]').addClass('report-a-poblem-page'); + } + //hide on mobile $('.mobile #report-a-poblem-sidebar').hide(); });
\ No newline at end of file diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index fa93c2f4c..14c00efb3 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -216,6 +216,7 @@ $(function(){ $('#side-form').hide(); $('#side').show(); $('#sub_map_links').show(); + $('.content[role=main]').addClass('report-a-poblem-page'); fixmystreet.page = 'around'; }); @@ -371,6 +372,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { } $('#side').hide(); $('#sub_map_links').hide(); + $('.content[role=main]').addClass('report-a-poblem-page'); fixmystreet.page = 'new'; location.hash = 'report'; } |