diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2011-09-09 11:04:15 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2011-09-09 11:04:15 +0100 |
| commit | 4e8af1aaea80ac7fe2c0ef7ed62f52061da3054b (patch) | |
| tree | 50f87ab7d103253f8d7d7e32d7b7a4258fa1db74 | |
| parent | 63e03938cbc9401eccf36bdce8f312f171559c80 (diff) | |
ie6 class for other cobrand headers, small screen tweaks for headings.
| -rw-r--r-- | templates/web/barnet/header.html | 5 | ||||
| -rw-r--r-- | templates/web/fiksgatami/header.html | 7 | ||||
| -rw-r--r-- | templates/web/lichfielddc/header.html | 5 | ||||
| -rw-r--r-- | templates/web/southampton/header.html | 5 | ||||
| -rw-r--r-- | web/css/_main.scss | 6 | ||||
| -rw-r--r-- | web/css/core.scss | 18 | ||||
| -rw-r--r-- | web/js/map-OpenLayers.js | 2 |
7 files changed, 42 insertions, 6 deletions
diff --git a/templates/web/barnet/header.html b/templates/web/barnet/header.html index 8270154ab..654e3d83c 100644 --- a/templates/web/barnet/header.html +++ b/templates/web/barnet/header.html @@ -1,5 +1,8 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html lang="[% lang_code %]"> +<!--[if lt IE 7]><html class="ie6 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="ie7 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="ie8 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]--> <head> <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/basic.css"> diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html index 0e78bfc43..d53f4cb58 100644 --- a/templates/web/fiksgatami/header.html +++ b/templates/web/fiksgatami/header.html @@ -1,5 +1,8 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html lang="[% lang_code %]"> +<!doctype html> +<!--[if lt IE 7]><html class="ie6 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="ie7 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="ie8 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]--> <head> <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> diff --git a/templates/web/lichfielddc/header.html b/templates/web/lichfielddc/header.html index e17e22b9d..863ef1c1d 100644 --- a/templates/web/lichfielddc/header.html +++ b/templates/web/lichfielddc/header.html @@ -1,5 +1,8 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="[% lang_code %]"> +<!--[if lt IE 7]><html class="ie6 oldie" xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="ie7 oldie" xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="ie8 oldie" xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><![endif]--> +<!--[if gt IE 8]><!--><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><!--<![endif]--> <head> <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> diff --git a/templates/web/southampton/header.html b/templates/web/southampton/header.html index 648027d8c..7b0f77e88 100644 --- a/templates/web/southampton/header.html +++ b/templates/web/southampton/header.html @@ -1,5 +1,8 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<!--[if lt IE 7]><html class="ie6 oldie" xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="ie7 oldie" xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="ie8 oldie" xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><![endif]--> +<!--[if gt IE 8]><!--><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><!--<![endif]--> <head> <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> <link rel="stylesheet" type="text/css" href="/cobrands/southampton/style.css" /> diff --git a/web/css/_main.scss b/web/css/_main.scss index 8b018677d..383e099a1 100644 --- a/web/css/_main.scss +++ b/web/css/_main.scss @@ -214,6 +214,12 @@ select, input, textarea { #header { font-size: 150%; } + h1 { + font-size: 140%; + } + h2 { + font-size: 130%; + } #navigation { position: static; border-top: solid 2px $header_colour; diff --git a/web/css/core.scss b/web/css/core.scss index ca8dcef27..4e2c50d06 100644 --- a/web/css/core.scss +++ b/web/css/core.scss @@ -688,9 +688,25 @@ $map_width: 500px; .banner { margin-right: 0; + clear: both; margin-top: 1em; } - + #text_map { + padding: 0.25em 0.5em; + font-size: 100%; + -moz-border-radius-topleft: 0; + -moz-border-radius-bottomleft: 1em; + -moz-border-radius-bottomright: 1em; + -webkit-border-top-left-radius: 0; + -webkit-border-bottom-left-radius: 1em; + -webkit-border-bottom-right-radius: 1em; + border-top-left-radius: 0; + border-bottom-left-radius: 1em; + border-bottom-right-radius: 1em; + } + #text_map_arrow { + display: none; + } } } diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index d3914a128..0f9974222 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -49,6 +49,7 @@ $(function(){ fixmystreet.drag.deactivate(); $('#side-form').hide(); $('#side').show(); + $('#sub_map_links').show(); fixmystreet.page = 'around'; }); @@ -317,6 +318,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { }); $('#side-form').show(); $('#side').hide(); + $('#sub_map_links').hide(); fixmystreet.page = 'new'; location.hash = 'report'; } |