diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-05-23 17:39:00 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-05-23 17:39:00 +0100 |
| commit | 7cb6bb21f713bc07a06ece5f4109cd6bd5a7f0b0 (patch) | |
| tree | eaff3aa286d8e1910b33c204c79b6837e109a216 /web | |
| parent | 9019fda388f9232181387e8cce1d28e8b89de1ee (diff) | |
| parent | 3b0e39a4c89e4c184f30c6131936dc63845d6a1f (diff) | |
Merge remote-tracking branch 'origin/master' into phonegap
Diffstat (limited to 'web')
123 files changed, 2726 insertions, 3706 deletions
diff --git a/web/cobrands/barnet/css/basic.css b/web/cobrands/barnet/css/basic.css deleted file mode 100644 index c3aa2c784..000000000 --- a/web/cobrands/barnet/css/basic.css +++ /dev/null @@ -1,74 +0,0 @@ -
-/* Basic Styles */
-
-body {
- color: #000;
- margin: 0;
- padding: 0;
- font: 13px Arial, Helvetica, Verdana, sans-serif;
- }
-
-h1, h2, h3, h4, h5, p, ol, ul, li, table, dl, dt, dd {
- line-height: 1.5em
- }
-
-a, a:link {text-decoration: underline; color: #006666}
-a:visited {color:#666}
-a:hover {text-decoration: none}
-
-img {
- border: none;
-}
-
-h1, h2, h3, h4, h5 {margin: 1em 0 0.5em 0;}
-
-h1 {font-size:2.7em; line-height:1.27em}
-h2 {font-size:1.93em;}
-h3 {font-size:1.308em;}
-h4 {font-size:1.077em;}
-h5 {font-size:1em;}
-
-ul {list-style-type: none; padding: 0;}
-
-ul ul, ol ul { padding: 0 0 0 15px; margin-top: 0;}
-
-ul li, ul ul li, ul ul ul li {margin: 0.3em 0 0 0; padding: 0 0 0 15px;}
-
-ul ul ul li {font-style: italic;}
-
-ol {padding: 0 0 0 20px;}
-
-ol ol, ul ol {
- margin-top: 0;
- padding: 0 0 0 30px;
- }
-
-ol li, ol ol li, ol ol ol li {
- margin: 0.3em 0 0 0;
- padding: 0;
- background: none;
- }
-
-ol ol li {list-style-type: lower-latin;}
-
-ol ol ol li {list-style-type: lower-roman;}
-ul ol li {background: none;}
-
-dl {padding: 0;}
-dt {font-weight: bold;}
-dd {margin: 0;}
-
-q {font-size: 120%;}
-
-blockquote {
- font-size: 122%;
- padding: 0;
- margin: 0 10px;
- }
-
-/* FixMyStreet additions */
-
-select, input, textarea {
- font-size: 99%;
-}
-
diff --git a/web/cobrands/barnet/css/dark.css b/web/cobrands/barnet/css/dark.css deleted file mode 100644 index b14780f4b..000000000 --- a/web/cobrands/barnet/css/dark.css +++ /dev/null @@ -1,144 +0,0 @@ -
-/*== DARK COLOR OVERIDES ==*/
-#iewrap, #proposition-image {background:#000; color:#fff}
-
-.online-services h2, .a-z h2 {background-image: url('../images/icon-online-services.png');}
-.a-z h2 {background:none}
-
-.online-services li a {background: url(../images/arrow-red.gif) no-repeat 6px 10px}
-.whats-on div {background-image: url('../images/icon-whats-on.png');}
-.council-meetings div {background-image: url('../images/icon-council-meetings.png');}
-.highlights h2 {background-image: url('../images/icon-highlights.png');}
-.media h2 {background-image: url('../images/icon-media-centre.png');}
-.browse-aloud p {background: url('../images/logo-browse-aloud.gif') no-repeat 10px 0;}
-
-.highlights h2 {border-color:#FFC000;}
-.media h2 {border-color: #591cca;}
-.online-services h2, .a-z h2 {border-color: #cc6666;}
-
-
-
-/*Green borders*/
-#pre-footer .box-right div {border: 1px solid #fff; border-bottom:medium none; border-top:medium none;}
-#main-propostion, #pre-footer {background:#1e3d3f url('../images/dark/main-prop-border.gif') repeat-y 35px 0pt;}
-#col-wrapper, #pre-footer .box-right div, #iewrap #col-wrapper {border-color:#008483}
-
-/*Headings and links*/
-.highlights h2, #col-left .highlights a {color:#f7ff9c;}
-.media h2, #col-left .media a {color:#d2cffc}
-
-#navigation-index h1, #navigation-index li a, #col-left h2, #col-left .link-bar a, #pre-footer a,
-#pre-footer a:link, #col-left .online-services li a, #col-left .online-services li a:link,
-#col-left .whats-on h2 a, #col-left .council-meetings h2 a, #iewrap .media p span, #pre-footer h2 {color:#fff}
-
-.whats-on div, .council-meetings div {background-color:#333}
-.link-bar {background:#333; border-color:#fff;}
-
-.media li {border-bottom:1px solid #323232}
-
-#navigation-index li a {border-color:#1E3D3F }
-
-#col-left .a-z li a {background:#1e3d3f; color:#fff}
-#col-left .a-z li a:hover {background:#1e3d3f; color:#fff}
-
-/*Righ column*/
-#col-right, #col-right div, #iewrap #col-right .useful-links ul {background: url('../images/dark/related-bg.gif');}
-
-/*Dynamic tab*/
-#col-right ul ul, #col-right li a.tab-on {background-color:#000; color:#fff}
-#col-right ul ul, #col-right li a.tab-on {border-color:#693a42}
-#col-right a, #col-right a:link {color:#fbccd2}
-
-/*Feed Icons*/
-#col-left .whats-on h2 .feed {background-image: url('../images/dark/rss-whats-on.gif')}
-#col-left .highlights h2 .feed {background-image: url('../images/dark/rss-highlights.gif')}
-#col-left .media h2 .feed {background-image: url('../images/dark/rss-media.gif')}
-
-/*Social and Useful Links Logos*/
-#col-right li a.leader-listens {background-image: url('../images/dark/link-images/logo-leader-listens.gif')}
-#col-right li a.whereilive {background-image: url('../images/dark/link-images/logo-whereilive.gif')}
-#col-right li a.facebook {background-image: url('../images/dark/link-images/logo-facebook.gif')}
-#col-right li a.twitter {background-image: url('../images/dark/link-images/logo-twitter.gif')}
-#col-right li a.you-tube {background-image: url('../images/dark/link-images/logo-youtube.gif')}
-#col-right li a.flickr {background-image: url('../images/dark/link-images/logo-flickr.gif')}
-#col-right li a.base {background-image: url('../images/dark/link-images/logo-base.gif')}
-#col-right li a.direct-me {background-image: url('../images/dark/link-images/logo-directme.gif')}
-#col-right li a.directgov {background-image: url('../images/dark/link-images/logo-directgov.gif')}
-#col-right li a.support-people {background-image: url('../images/dark/link-images/logo-supporting-people.gif')}
-
-/*Links arrows*/
-#navigation-index li a {background-image: url('../images/dark/arrow-green.gif')}
-.online-services li a {background-image: url('../images/dark/arrow-red.gif')}
-
-/*Navigation*/
-#navigation-index li a.current {background:transparent url(../images/dark/cnr-expanded-tab_nw.png) no-repeat left top;}
-#navigation-index li a.current .ne {background:transparent url(../images/dark/cnr-expanded-tab_ne.gif) no-repeat 0 0;}
-
-
-
-a, a:link {color:#99ffff}
-a, a:visited {color:#9a9a9a}
-strong, #pre-footer .social-bookmarking h2, #content form label {color:#fff;}
-
-/*=== Content Page Layout :: Colours and Customisations===*/
-
-#content{border: 1px solid #1e3e3e; border-width: 0 1px 0 1px}
-#wrap {background: url(../images/dark/wrap-border.gif) repeat-y 35px 0;}
-
-/*=== Content Page Layout Elements :: Colours and Customisations===*/
-
-h1, h2 {border-bottom: 1px solid #008184; color:#fff}
-h3, h4, h5 {color:#fff}
-
-#content a:focus, #content a:active {color:#fff; background: #008184; }
-
-#content blockquote, #content q {
- background: #204343 url('../images/dark/quote.gif') no-repeat 10px 10px;
- border: 1px solid #008184;
- border-width: 1px 0
- }
-#content q {background-image:none}
-
-#content ul li {background: url('../images/dark/arrow-green-small.gif') no-repeat 5px 5px}
-#content ul li ol li {background: none}
-#content ul li ul li, #content ol li ul li {background: url('../images/arrow-hyphen-small.gif') no-repeat 3px 10px}
-
-th {background:#008184; color:#fff}
-tr td {background:#1e3e3e}
-tr.even td {background:#0f1f1f}
-table.data td, table.data th {border-right: 3px solid #000}
-
- /* Navigation colours */
-
-#left-column #navigation, #left-column #online-services, #left-column #useful-links, #left-column #contact {
- background-image: url(../images/dark/main-prop-border.gif);
- background-position: 35px 0;
- background-repeat: repeat-y;
- }
-#left-column #online-services {background-image: url(../images/dark/red-border.gif);}
-#left-column #useful-links, #left-column #contact {background-image: url(../images/dark/grey-border.gif);}
-
-#left-column li a, #left-column li strong {color:#fff}
-
-#left-column #navigation {background-color:#1E3D3F}
-#left-column #online-services {background-color:#442c2c}
-#left-column #useful-links, #left-column #contact {background-color:#343434}
-
-#left-column #navigation h2 {color: #fff; border-color: #008184; background-image: url('../images/dark/icon-welcome.gif')}
-#left-column #online-services h2 {color:#fff; border-color: #cc6666; background-image: url('../images/dark/icon-online-services-small.gif')}
-#left-column #useful-links h2, #left-column #contact h2 {color:#fff; border-color: #999999; background-image: url('../images/dark/icon-useful-links-small.gif')}
-#left-column #contact h2 {background-image: url('../images/dark/icon-contact-small.gif')}
-
-#left-column #navigation li a {background-image: url('../images/dark/arrow-green-small.gif')}
-#left-column #online-services li a {background-image: url('../images/dark/arrow-red-small.gif')}
-#left-column #useful-links li a {background-image: url('../images/dark/arrow-grey-small.gif')}
-
-#left-column div a {color:#fff}
-#left-column li li strong {background-image: url('../images/arrow-current-nav.gif'); background-color: #008184; color:#fff}
-#left-column #navigation li li li li li a {background-image: url('../images/arrow-hyphen-small.gif'); background-position: 50px 14px}
-
- /* Forms colours */
-
-#content input[type|='text'] {border: 1px solid #008184}
-.error {color: #d04747}
-
diff --git a/web/cobrands/barnet/css/ie-dark.css b/web/cobrands/barnet/css/ie-dark.css deleted file mode 100644 index a0a7c3c41..000000000 --- a/web/cobrands/barnet/css/ie-dark.css +++ /dev/null @@ -1,84 +0,0 @@ -/*=========== Styles for IE version 5-6=======*/
-
-
-/*===Basic styles=======*/
-
-body {font-size: 80%;}
-
-#iewrap {width:expression(document.body.clientWidth < 790? "780px": document.body.clientWidth > 1382? "1380px" : "auto" );}
-
-
-#header {height:80px}
-#switcher {margin:-50px 23px 0 0}
-
-#navigation-index, #proposition-image {width:49.9%;}
-
-#main-propostion, #col-wrapper, #pre-footer, .info-bar, #col-right ul {height:1%}
-
-#header form .search-button input {padding: 5px 5px 8px 5px;}
-#header form {position:relative; top:-1px}
-#header form .search-button {margin:0; position:relative; left:5px}
-#header form .search-input input {position:relative; top:1px}
-
-#col-left {width: 66.6%;}
-#col-right {width:33.3%;}
-
-.box-left, .box-right, #col-right li {width:49.9%;}
-
-#navigation-index li a.current .ne {margin-right:-3px;}
-.menu p {padding: 3px 0 7px 0}
-
-#col-right ul {height:1%}
-#col-right ul ul {position: absolute}
-
-.media li {padding-bottom:5px}
-
-.social-links {height:420px}
-
-.highlights li {height: 81px}
-#col-right li li {height: 66px}
-
-#col-left .whats-on h2, #col-left .council-meetings h2 {margin:0 0 0 0;}
-#col-left h2 .feed {right:10px}
-
-.highlights ul {height:280px}
-.media ul {height:285px}
-#col-right .useful-links ul {height:175px}
-
-
-.tab-on {z-index:100}
-#col-right ul ul {z-index:50;}
-
-.link-bar, .online-services li a {height:1%}
-.a-z li {height:25px; width:25px;}
-#col-left .a-z li.numbers a {width:26px}
-.a-z ul {width:97%; margin-left:-6px}
-
-.box-left, .box-right {padding:0 0 9px 0;}
-.media {padding-bottom:0px}
-#pre-footer .box-right div {height:115px;}
-
-
-.browse-aloud p {margin-bottom:15px}
-#col-right #social-links-tabs {padding:0; margin:0}
-
-
-.menu {filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/expanded-tab.png', sizingMethod='scale'); background: none;}
-
-#navigation-index li a.current {zoom:1;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/cnr-expanded-tab_nw.png', sizingMethod='crop'); background: none;}
-
-#navigation-index h1 {background-image: url(../images/dark/icon-welcome.gif)}
-.online-services h2 {background-image:url(../images/dark/icon-online-services.gif);}
-.whats-on div {background-image:url(../images/dark/icon-whats-on.gif);}
-.council-meetings div {background-image:url(../images/dark/icon-council-meetings.gif);}
-.highlights h2 {background-image:url(../images/dark/icon-highlights.gif);}
-.media h2 {background-image:url(../images/dark/icon-media-centre.gif);}
-
-
-/*IE RELAXED OVERIDES*/
-
-#navigation-index li a.current {zoom:1;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/dark/cnr-expanded-tab_nw.png', sizingMethod='crop'); background: none;}
-
-
-
-
diff --git a/web/cobrands/barnet/css/ie-relaxed.css b/web/cobrands/barnet/css/ie-relaxed.css deleted file mode 100644 index dfee99e22..000000000 --- a/web/cobrands/barnet/css/ie-relaxed.css +++ /dev/null @@ -1,9 +0,0 @@ -
-/*IE RELAXED OVERIDES*/
-body {font-size: 100%;}
-.highlights ul {height:310px}
-.media ul {height:315px}
-#col-right .useful-links ul {height:405px}
-#pre-footer .box-right div {height:165px;}
-#col-left .a-z li.numbers a {width:30px}
-#col-right li li {height: 73px}
\ No newline at end of file diff --git a/web/cobrands/barnet/css/ie-seven-relaxed.css b/web/cobrands/barnet/css/ie-seven-relaxed.css deleted file mode 100644 index eeaaebf0a..000000000 --- a/web/cobrands/barnet/css/ie-seven-relaxed.css +++ /dev/null @@ -1,2 +0,0 @@ -/*IE7 RELAXED OVERIDES*/
-body {font-size: 100%;}
diff --git a/web/cobrands/barnet/css/ie-seven.css b/web/cobrands/barnet/css/ie-seven.css deleted file mode 100644 index 353e313f5..000000000 --- a/web/cobrands/barnet/css/ie-seven.css +++ /dev/null @@ -1,51 +0,0 @@ -/*===== styles for IE Seven ======*/
-
-body {font-size: 80%;}
-
-#switcher {margin-top:-50px}
-
-#main-propostion, #col-wrapper, #pre-footer, .info-bar, #col-right ul, .link-bar {height:1%}
-#navigation-index, #proposition-image, #navigation-index li, .menu li {width:49.99%;}
-
-#header form .search-button input {padding: 5px 5px 8px 5px;}
-#header form {position:relative; top:-1px}
-#header form .search-button {margin:0; position:relative; left:5px}
-
-#header form .search-input input {position:relative; top:1px}
-
-.box-left, .box-right, #col-right li {width:49.9%;}
-
-
-form .nw {top: 4px; left:0}
-form .ne {top: 4px; right:0}
-form .sw {bottom: 4px; left:0}
-form .se {bottom: 4px; right:0}
-.wide-row .nw, .wide-row .ne, .wide-row .sw, .wide-row .se {display:block}
-
-form .wide-row .nw {top: 3px}
-form .wide-row .ne {top: 3px}
-form .wide-row .sw {bottom: 0px}
-form .wide-row .se {bottom: 0px}
-
-form .submit-row .ne {right:-1px}
-form .submit-row .se {right:-1px}
-.submit-row div {padding: 3px 12px;}
-
-
-.required {vertical-align: top; padding-top: 0;}
-
-h1 {line-height:1.3em}
-#content .coloured, #content .data {border-spacing: expression(cellSpacing=1); /* for IE */}
-
-.menu p {padding: 3px 0 7px 0}
-
-#col-right .useful-links li {}
-
-.highlights li {min-height:81px;}
-.media li {padding-bottom:5px}
-#col-right #social-links-tabs {padding:0; margin:0}
-
-.browse-aloud p {margin-bottom:15px}
-.tab-on {margin-bottom:20px}
-
-#pre-footer {margin-top:5px}
diff --git a/web/cobrands/barnet/css/ie.css b/web/cobrands/barnet/css/ie.css deleted file mode 100644 index f3316c98b..000000000 --- a/web/cobrands/barnet/css/ie.css +++ /dev/null @@ -1,86 +0,0 @@ -/*=========== Styles for IE version 5-6=======*/
-
-
-/*===Basic styles=======*/
-
-body {font-size: 80%;}
-
-#iewrap {width:expression(document.body.clientWidth < 790? "780px": document.body.clientWidth > 1382? "1380px" : "auto" );}
-
-
-#header {height:80px}
-#switcher {margin:-50px 23px 0 0}
-
-#navigation-index, #proposition-image {width:49.9%;}
-
-#main-propostion, #col-wrapper, #pre-footer, .info-bar, #col-right ul {height:1%}
-
-#header form .search-button input {padding: 5px 5px 8px 5px;}
-#header form {position:relative; top:-1px}
-#header form .search-button {margin:0; position:relative; left:5px}
-#header form .search-input input {position:relative; top:1px}
-
-#col-left {width: 66.6%;}
-#col-right {width:33.3%;}
-
-h1 {line-height:1.3em}
-
-.box-left, .box-right, #col-right li {width:49.9%;}
-
-#navigation-index li a.current .ne {margin-right:-3px;}
-.menu p {padding: 3px 0 7px 0}
-
-#col-right ul {height:1%}
-#col-right ul ul {position: absolute}
-
-.media li {padding-bottom:5px}
-
-.social-links {height:420px}
-
-.highlights li {height: 81px}
-#col-right li li {height: 66px}
-
-#col-left .whats-on h2, #col-left .council-meetings h2 {margin:0 0 0 0;}
-#col-left h2 .feed {right:10px}
-
-.highlights ul {height:280px}
-.media ul {height:285px}
-#col-right .useful-links ul {height:175px}
-
-
-.tab-on {z-index:100}
-#col-right ul ul {z-index:50;}
-
-.link-bar, .online-services li a {height:1%}
-.a-z li {height:25px; width:25px;}
-#col-left .a-z li.numbers a {width:26px}
-.a-z ul {width:97%; margin-left:-6px}
-
-.box-left, .box-right {padding:0 0 9px 0;}
-.media {padding-bottom:0px}
-#pre-footer .box-right div {height:115px;}
-
-
-.browse-aloud p {margin-bottom:15px}
-#col-right #social-links-tabs {padding:0; margin:0}
-
-#navigation-index h1 {background-image: url(../images/icon-welcome.gif)}
-.online-services h2 {background-image:url(../images/icon-online-services.gif);}
-.whats-on div {background-image:url(../images/icon-whats-on.gif);}
-.council-meetings div {background-image:url(../images/icon-council-meetings.gif);}
-.highlights h2 {background-image:url(../images/icon-highlights.gif);}
-.media h2 {background-image:url(../images/icon-media-centre.gif);}
-
-
-#content blockquote {height: 100px}
-
-#content form, #content fieldset {position:relative}
-#left-column li a, #left-column li strong {height:1%}
-
-#content .coloured, #content .data {border-spacing: expression(cellSpacing=1); /* for IE */}
-
-#left-column {word-wrap: break-word}
-
-
-.required {vertical-align: top; padding-top: 0;}
-
diff --git a/web/cobrands/barnet/css/layout.css b/web/cobrands/barnet/css/layout.css index 1e1bf5d05..cad46b039 100644 --- a/web/cobrands/barnet/css/layout.css +++ b/web/cobrands/barnet/css/layout.css @@ -1,7 +1,8 @@ /* FixMyStreet additions */
/* Smaller map */
-#mysociety #map_box {
+#mysociety #map_box {
width: 380px;
+ margin-bottom: 8px;
}
#mysociety #map, #mysociety #drag {
width: 378px;
@@ -13,6 +14,23 @@ width: auto;
}
+#mysociety textarea {
+ border: 1px solid #999999;
+}
+
+/* fix (for the reports page) */
+#content #mysociety h1 span {
+ display: inline;
+ border: none;
+ padding: 0;
+}
+
+#mysociety #postcodeForm {
+ background-color: #E9E9EA;
+}
+#mysociety #postcodeForm label {
+ width: 100%;
+}
/*=========FROM CUSTOM=========*/
.cl {clear: both;}
@@ -70,61 +88,6 @@ h3, h4, h5, p, ol, ul, table, dl, address, form {margin-right: 5px; margin-left: h1, h2 {padding-left: 5px}
*/
- /* Navigation */
-
-#left-column h2 {
- margin:0 5px 15px 40px;
- padding: 6px 0 0 25px;
- font-size:1.245em;
- line-height:1.1em;
- background-repeat: no-repeat;
- background-position: top left;
- }
-
-#navigation h2 {font-size:1.692em; font-weight:normal; padding: 10px 0 6px 40px}
-
-#left-column div {margin-bottom:5px; padding: 5px 0 15px 0}
-
-#left-column ul, #left-column dl {
- margin:0;
- padding:0 0 0 35px;
- font-size: 1.08em
- }
-
-#left-column dl {padding: 0 5px 5px 40px}
-#left-column dt {margin: 10px 0 0 0}
-#left-column dd {padding:0; line-height:1.3em}
-
-#left-column dl a {
- text-decoration:underline;
- color:#000;
- }
-#left-column dl a:hover {text-decoration: none}
-
-#left-column ul ul {
- padding-left: 0;
- font-size: 1em
- }
-
-#left-column li {padding:0; margin:0}
-
-#left-column li a, #left-column li strong {
- padding: 5px 5px 5px 20px;
- display:block;
- background-repeat: no-repeat;
- background-position: 10px 11px;
- font-style: normal;
- font-weight: normal;
- text-decoration:none;
- color:#000;
- }
-
-#left-column li a:hover {text-decoration:underline}
-
-#left-column li li a, #left-column li li strong {padding-left:30px; background-position: 20px 11px;}
-#left-column li li li a, #left-column li li li strong {padding-left:40px; background-position: 30px 11px;}
-#left-column li li li li a, #left-column li li li li strong {padding-left:50px; background-position: 40px 11px;}
-#left-column li li li li li a, #left-column li li li li li strong {padding-left:60px; background-position: 50px 11px;}
/*=== Quotes =====*/
#content blockquote {margin:10px; min-height: 90px; padding-bottom: 10px}
@@ -170,229 +133,11 @@ legend { font-weight:bold
}
-/*=======form fields and labels=========*/
-
-/*
-#content label, form p, #content input, #content select, #content textarea, form .long-label {
- margin-bottom: 0.25em;
- margin-top: 0.25em;
- }
-#content form label {
- font-weight: bold;
- padding-right: 10px;
- width: 10em;
- float: left;
- text-align: left;
- color: #000;
- margin-top:10px
- }
-
-#content form .radio label, #content form .checkbox label {font-weight:normal; margin-top:0}
-
-form p, form h3 {margin-left:0}
-form p {font-weight: bold}
-*/
/*======= wide rows ======= */
#content textarea {padding: 5px;}
-/*====Required styling====*/
-.required {
- font-size:200%;
- padding:7px 0 0 0;
- line-height:0;
- vertical-align:middle;
- color:#008184
- }
-
-/*=========Header=========*/
-
-#header{
- padding: 0;
- margin: 0;
- min-height: 80px;
- text-align: center
- }
-
-#header {background: #34a3a4 url(../images/header-bg.gif) repeat-x bottom left;}
-#header img {position: absolute; top:8px; left: 37px}
-
-#header form {
- width: 320px;
- text-align: left;
- margin:0 auto;
- padding: 20px 0 0 0;
- }
-
-#header form div {float:left}
-
-#header form .search-input {background: url(../images/form-field_top.gif) no-repeat top left; padding:7px 0 0 0;}
-
-#header form .search-input input {
- width:207px;
- padding: 2px 5px 8px 5px;
- font-size:0.923em;
- color:#666666;
- border:none;
- background: url(../images/form-field_bottom.gif) no-repeat bottom left;
- }
-
-#header form .search-button {
- background: url(../images/search-button-top.gif) no-repeat top right;
- margin:0 0 0 4px;
- border-left: 1px solid #fff;
- }
-#header form .search-button input {
- border: none;
- background: url(../images/search-button-bottom.gif) no-repeat bottom right;
- padding: 3px 7px 8px 7px;
- margin:4px 0 0 0;
- font-weight:bold;
- font-size:0.923em;
- cursor: pointer
- }
-
-/*======== Switcher ========*/
-#switcher {float:right; margin:-20px 47px 0 0; text-align: left; }
-
-#switcher p {
- color: #fff;
- font-weight:bold;
- }
-
-#switcher li a, #switcher li strong {
- background-repeat:no-repeat;
- border:medium none;
- outline-style:none;
- outline-width:medium;
- text-indent:-999em;
- }
-
-#switcher .default a, .default strong {background-image:url(../images/style-switcher_default.gif); }
-#switcher .relaxed-light a, .relaxed-light strong {background-image:url(../images/style-switcher_default-relaxed.gif); }
-#switcher .dark a, .dark strong {background-image:url(../images/style-switcher_dark.gif); }
-#switcher .relaxed-dark a, .relaxed-dark strong {background-image:url(../images/style-switcher_dark-relaxed.gif); }
-
-#switcher li a, #switcher li strong {
- background-repeat:no-repeat;
- border:medium none;
- outline-style:none;
- outline-width:medium;
- text-indent:-999em;
- }
-
-#switcher p {
- font-size:1em;
- margin: 0;
- padding:0;
- width: auto; }
-
-#switcher ul {
- list-style-type:none;
- float:left;
- margin:0;
- padding:0;
- width:auto;
- }
-
-#switcher ul li {
- float:left;
- margin:0;
- padding:0;
- }
-
-#switcher li a, #switcher li strong {
- display:block;
- float:left;
- height:30px;
- margin:0;
- width:44px; }
-
-#switcher strong {background-position:0 -60px; }
-#switcher li a:focus, #switcher li a:active, #switcher a:hover {background-position:0 -30px; }
-/*== Homepage Right Column ==*/
-
-.browse-aloud p, p.browse-aloud {background: url('../images/logo-browse-aloud.gif') no-repeat 10px 0;}
-.browse-aloud p {
- font-size:1.235em;
- padding: 0 9px 0 60px;
- margin:10px 0 0 0;
- line-height:1.3em
- }
-
-p.browse-aloud {
- padding: 10px 0 5px 45px;
- margin: 0 5px -10px 40px;
- background-position: 0 10px;
- border-top: 1px solid #CC6666;
- }
-
-p.browse-aloud a {color:#34020b}
-
-/*====Pre-Footer====*/
-
-#pre-footer {padding: 0 35px;}
-#pre-footer div {padding: 0}
-
-#pre-footer .box-left {width: 66.66%; padding:0; margin:0}
-#pre-footer .box-right {width: 33.33%; padding: 0; margin:0}
-
-#pre-footer dl {margin:0; padding:0; float:left; width:25%; font-size:0.85em}
-#pre-footer dt {margin: 10px 0 0 0}
-
-#pre-footer dt, #pre-footer dd {padding: 0 0 0 10px}
-
-#pre-footer .box-right div {padding: 10px}
-#pre-footer h2 {font-size:1em; border:none; padding:0; margin:0}
-
-#pre-footer .box-right div {
- min-height:115px;
- border-top:none;
- border-bottom:none;
- margin-right:0;
- position:relative;
- overflow:hidden
- }
-
-#pre-footer ul, #pre-footer p, #pre-footer li {margin:0; padding:0}
-#pre-footer ul, #pre-footer h2, #pre-footer p {margin-left:110px}
-#pre-footer img {position:absolute; left:10px; top:10px}
-
-#pre-footer .box-right div.social-bookmarking {padding: 10px 15px}
-#pre-footer .social-bookmarking ul, #pre-footer .social-bookmarking h2, #pre-footer .social-bookmarking p {margin:0;}
-#pre-footer .social-bookmarking ul {margin: 8px 0 3px 0; overflow:hidden; width:100%}
-#pre-footer .social-bookmarking ul li {width: 49%; float:left; margin: 0 0 3px 0}
-#pre-footer .social-bookmarking ul li a {
- padding: 2px 0 2px 21px;
- background-position:0 3px;
- background-repeat: no-repeat;
- }
-
-#pre-footer .social-bookmarking h2 {color:#000}
-#pre-footer .social-bookmarking p {font-size: 0.85em}
-
-#pre-footer .social-bookmarking ul li.facebook a {background-image: url('../images/social-facebook.gif')}
-#pre-footer .social-bookmarking ul li.technorati a {background-image: url('../images/social-technorati.gif')}
-#pre-footer .social-bookmarking ul li.delicious a {background-image: url('../images/social-delicious.gif')}
-#pre-footer .social-bookmarking ul li.stumbleupon a {background-image: url('../images/social-stumbleupon.gif')}
-#pre-footer .social-bookmarking ul li.google a {background-image: url('../images/social-google.gif')}
-#pre-footer .social-bookmarking ul li.digg a {background-image: url('../images/social-digg.gif')}
-
-
-
-/*====Footer====*/
-
-#footer {
- clear: both;
- padding: 5px;
- margin:5px 0 0 0;
- }
-#footer ul {margin: 0 25px}
-#footer li {display:inline}
-/*== Footer colours + customisations ==*/
-#footer {background: #34a3a4 url(../images/header-bg.gif) repeat-x bottom left;}
-#footer a, #footer a:link {color:#fff}
diff --git a/web/cobrands/barnet/css/light.css b/web/cobrands/barnet/css/light.css deleted file mode 100644 index 62dc7e17d..000000000 --- a/web/cobrands/barnet/css/light.css +++ /dev/null @@ -1,142 +0,0 @@ -/*====== Light Colours and Images ======*/
-
-
-/*== Homepage Colours and Custimisations ==*/
-
-.online-services h2, .a-z h2 {
- background-image: url('../images/icon-online-services.png');
- color: #663333;
- border-color: #cc6666;
- }
-.a-z h2 {background:none}
-.online-services li a {background: url(../images/arrow-red.gif) no-repeat 6px 10px}
-#col-left .online-services li a, #col-left .online-services li a:link {color:#000}
-.whats-on div, .council-meetings div {
- background-color: #e5e5e5;
- border-bottom:1px solid #000;
- }
-
-#col-left .whats-on h2 a, #col-left .council-meetings h2 a {color:#000}
-.whats-on div {background-image: url('../images/icon-whats-on.png');}
-.council-meetings div {background-image: url('../images/icon-council-meetings.png');}
-
-.media li {border-bottom:1px solid #e5e5e5}
-.media p span {color:#666;}
-
-/* Homepage Highlights and Media*/
-
-.highlights h2 {
- background-image: url('../images/icon-highlights.png');
- border-color: #ffc000;
- }
-.highlights h2, #col-left .highlights a {color: #996600;}
-
-.media h2 {
- background-image: url('../images/icon-media-centre.png');
- border-color: #591cca;
- }
-.media h2, #col-left .media a {color: #6633cc;}
-
-#col-left .whats-on h2 .feed {background-image: url('../images/rss-whats-on.gif')}
-#col-left .highlights h2 .feed {background-image: url('../images/rss-highlights.gif')}
-#col-left .media h2 .feed {background-image: url('../images/rss-media.gif')}
-
-#col-left .a-z li a {color:#000; background: #d0e7e7}
-#col-left .a-z li a:hover {background: #f3e7e7}
-
-.link-bar {background: #e5e5e5; border-bottom: 1px solid #000}
-#col-left .link-bar a {color:#000}
-
-/*==== Homepage Tabs Colours and Custimisations ====*/
-
-#col-right, #col-right div, #iewrap #col-right .useful-links ul {background: url('../images/related-bg.gif');}
-
-#col-right a, #col-right a:link {color: #330000}
-
-#col-right ul {border-top: 1px solid #cc6666;}
-
-#col-right li a.leader-listens {background-image: url('../images/link-images/logo-leader-listens.gif')}
-#col-right li a.whereilive {background-image: url('../images/link-images/logo-whereilive.gif')}
-#col-right li a.facebook {background-image: url('../images/link-images/logo-facebook.gif')}
-#col-right li a.twitter {background-image: url('../images/link-images/logo-twitter.gif')}
-#col-right li a.you-tube {background-image: url('../images/link-images/logo-youtube.gif')}
-#col-right li a.flickr {background-image: url('../images/link-images/logo-flickr.gif')}
-
-#col-right li a.base {background-image: url('../images/link-images/logo-base.gif')}
-#col-right li a.direct-me {background-image: url('../images/link-images/logo-directme.gif')}
-#col-right li a.directgov {background-image: url('../images/link-images/logo-directgov.gif')}
-#col-right li a.support-people {background-image: url('../images/link-images/logo-supporting-people.gif')}
-
-
-#col-right ul ul {
- border-color: #eed0d0;
- background: #fff;
- }
-
-#col-right li a.tab-on {
- background-color:#fff;
- border-color: #eed0d0;
- }
-
-
-/*=== Content Page Layout :: Colours and Customisations===*/
-
-#content{border: 1px solid #d6eaea; border-width: 0 1px 0 1px}
-#wrap {background: url(../images/wrap-border.gif) repeat-y 35px 0;}
-
-/*=== Content Page Layout Elements :: Colours and Customisations===*/
-
-h1, h2 {border-bottom: 1px solid #008184; color:#003333}
-h3, h4, h5 {color:#003333}
-
-#content a:focus, #content a:active {color:#fff; background: #008184; }
-
-#content blockquote, #content q {
- background: #d8ebeb url('../images/quote.gif') no-repeat 10px 10px;
- border: 1px solid #008184;
- border-width: 1px 0
- }
-#content q {background-image:none}
-
-#content ul li {background: url('../images/arrow-green-small.gif') no-repeat 5px 5px}
-#content ul li ol li {background: none}
-#content ul li ul li, #content ol li ul li {background: url('../images/arrow-hyphen-small.gif') no-repeat 3px 10px}
-
-th {background:#008184; color:#fff}
-tr td {background:#f0f7f7}
-tr.even td {background:#d1e8e8}
-table.data td, table.data th {border-right: 3px solid #fff}
-
- /* Navigation colours */
-
-#left-column #navigation, #left-column #online-services, #left-column #useful-links, #left-column #contact {
- background-image: url(../images/main-prop-border.gif);
- background-position: 35px 0;
- background-repeat: repeat-y;
- }
-
-#left-column #navigation {background-color:#d8ebeb}
-#left-column #online-services {background-color:#f9f3f3}
-#left-column #useful-links, #left-column #contact {background-color:#e6e6e6}
-
-#left-column #navigation h2 {color: #003333; border-color: #008184; background-image: url('../images/icon-welcome.gif')}
-#left-column #online-services h2 {color:#663333; border-color: #cc6666; background-image: url('../images/icon-online-services-small.gif')}
-#left-column #useful-links h2, #left-column #contact h2 {color:#000; border-color: #999999; background-image: url('../images/icon-useful-links-small.gif')}
-#left-column #contact h2 {background-image: url('../images/icon-contact-small.gif')}
-
-#left-column #navigation li a {background-image: url('../images/arrow-green-small.gif')}
-#left-column #online-services li a {background-image: url('../images/arrow-red-small.gif')}
-#left-column #useful-links li a {background-image: url('../images/arrow-grey-small.gif')}
-
-#left-column li li strong {background-image: url('../images/arrow-current-nav.gif'); background-color: #008184; color:#fff}
-#left-column #navigation li li li li li a {background-image: url('../images/arrow-hyphen-small.gif'); background-position: 50px 14px}
-
- /* Forms colours */
-#content input[type|='text'] {border: 1px solid #008184}
-.error {color: #d04747}
-
-/*== Pre-Footer colours + customisations ==*/
-
-#pre-footer {background: #d4e9e9 url(../images/main-prop-border.gif) repeat-y 35px 0;}
-#pre-footer .box-right div {border: 1px solid #fff; border-bottom:medium none; border-top:medium none;}
-#pre-footer a, #pre-footer a:link {color:#000}
diff --git a/web/cobrands/barnet/css/print.css b/web/cobrands/barnet/css/print.css deleted file mode 100644 index aee3a0139..000000000 --- a/web/cobrands/barnet/css/print.css +++ /dev/null @@ -1,15 +0,0 @@ -
-
-* {border-color:#000; color:#000 !important; background: none !important}
-
-#iewrap #print-logo {display:block !important}
-
-#iewrap #header, #iewrap #left-column, #iewrap #footer, #pre-footer .box-right, #iewrap #main-propostion,
-#iewrap #col-right {display:none; }
-
-#iewrap h1, #iewrap h2 {padding-left:0}
-
-#iewrap #col-left, #iewrap #pre-footer .box-left {width:100%;}
-#iewrap #pre-footer dl {width:33%;}
-
-#iewrap #wrap, #iewrap #col-wrapper, #iewrap #content, #pre-footer {margin:0; padding:0; border: none}
\ No newline at end of file diff --git a/web/cobrands/barnet/css/relaxed.css b/web/cobrands/barnet/css/relaxed.css deleted file mode 100644 index 1b8226a56..000000000 --- a/web/cobrands/barnet/css/relaxed.css +++ /dev/null @@ -1,42 +0,0 @@ -/*== RELAXED LAYOUT ==*/
-
-body {font-size:100%}
-#main-propostion #navigation-index {width:66.6%}
-#navigation-index li {margin:0}
-#main-propostion #proposition-image {width:33.3%}
-
-#iewrap #col-left, #iewrap #col-right {width:100%; float:none}
-
-#col-right {clear:both}
-#col-right .cl {display:none}
-
-#col-right .browse-aloud, #col-right .social-links, #col-right .useful-links {
- float:left;
- width:33.3%;
- margin:0;
- }
-
-#col-right .browse-aloud {background:none}
-#col-right {background:none; margin-top:10px;}
-
-.index .box-right h2, .media ul, .council-meetings div, .index .link-bar {margin-right:5px}
-
-#navigation-index li a, .online-services li a {background-position: 6px 10px}
-
-#col-right ul {border-top:none;}
-#iewrap #col-right ul {margin: 0 5px}
-#iewrap #col-right ul ul {margin: -1px 0 0 0}
-
-#iewrap #col-right .tab-on {margin-bottom:0}
-#iewrap #col-right ul .tab-2 ul {margin-left:-101.2%;}
-
-#iewrap #col-right .social-links, #iewrap #col-right .useful-links {min-height:0px; padding-bottom:5px}
-#iewrap #col-right .useful-links {background: none;}
-#iewrap #col-right .useful-links ul {margin: 0 5px 0 0; min-height:384px;}
-
-#iewrap #col-wrapper {border:1px solid #E1E7E7; border-top:none; border-bottom:0}
-#iewrap #pre-footer {margin:0}
-
-#pre-footer .box-right div {min-height:185px}
-
-#content form .sw, #content form .se, #content form .nw, #content form .ne {display:none}
\ No newline at end of file diff --git a/web/cobrands/barnet/images/arrow-current-nav.gif b/web/cobrands/barnet/images/arrow-current-nav.gif Binary files differdeleted file mode 100644 index 5f3db021b..000000000 --- a/web/cobrands/barnet/images/arrow-current-nav.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/arrow-down.gif b/web/cobrands/barnet/images/arrow-down.gif Binary files differdeleted file mode 100644 index e8a1aec59..000000000 --- a/web/cobrands/barnet/images/arrow-down.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/arrow-green-small.gif b/web/cobrands/barnet/images/arrow-green-small.gif Binary files differdeleted file mode 100644 index 2e7f86ed7..000000000 --- a/web/cobrands/barnet/images/arrow-green-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/arrow-green.gif b/web/cobrands/barnet/images/arrow-green.gif Binary files differdeleted file mode 100644 index 040ac271f..000000000 --- a/web/cobrands/barnet/images/arrow-green.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/arrow-grey-small.gif b/web/cobrands/barnet/images/arrow-grey-small.gif Binary files differdeleted file mode 100644 index a4caf952d..000000000 --- a/web/cobrands/barnet/images/arrow-grey-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/arrow-hyphen-small.gif b/web/cobrands/barnet/images/arrow-hyphen-small.gif Binary files differdeleted file mode 100644 index 2bde8518b..000000000 --- a/web/cobrands/barnet/images/arrow-hyphen-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/arrow-hyphen.gif b/web/cobrands/barnet/images/arrow-hyphen.gif Binary files differdeleted file mode 100644 index c14a154ef..000000000 --- a/web/cobrands/barnet/images/arrow-hyphen.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/arrow-red-small.gif b/web/cobrands/barnet/images/arrow-red-small.gif Binary files differdeleted file mode 100644 index f51fafc15..000000000 --- a/web/cobrands/barnet/images/arrow-red-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/arrow-red.gif b/web/cobrands/barnet/images/arrow-red.gif Binary files differdeleted file mode 100644 index 611b2020f..000000000 --- a/web/cobrands/barnet/images/arrow-red.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/button-bg.gif b/web/cobrands/barnet/images/button-bg.gif Binary files differdeleted file mode 100644 index f10081020..000000000 --- a/web/cobrands/barnet/images/button-bg.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/cnr-expanded-tab_ne.gif b/web/cobrands/barnet/images/cnr-expanded-tab_ne.gif Binary files differdeleted file mode 100644 index c6c914865..000000000 --- a/web/cobrands/barnet/images/cnr-expanded-tab_ne.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/cnr-expanded-tab_nw.gif b/web/cobrands/barnet/images/cnr-expanded-tab_nw.gif Binary files differdeleted file mode 100644 index 8bd637634..000000000 --- a/web/cobrands/barnet/images/cnr-expanded-tab_nw.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/cnr-expanded-tab_nw.png b/web/cobrands/barnet/images/cnr-expanded-tab_nw.png Binary files differdeleted file mode 100644 index a58028725..000000000 --- a/web/cobrands/barnet/images/cnr-expanded-tab_nw.png +++ /dev/null diff --git a/web/cobrands/barnet/images/cnr-search-button.gif b/web/cobrands/barnet/images/cnr-search-button.gif Binary files differdeleted file mode 100644 index 5dc3da24b..000000000 --- a/web/cobrands/barnet/images/cnr-search-button.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/arrow-green-small.gif b/web/cobrands/barnet/images/dark/arrow-green-small.gif Binary files differdeleted file mode 100644 index 5c58d383d..000000000 --- a/web/cobrands/barnet/images/dark/arrow-green-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/arrow-green.gif b/web/cobrands/barnet/images/dark/arrow-green.gif Binary files differdeleted file mode 100644 index 4564d3e06..000000000 --- a/web/cobrands/barnet/images/dark/arrow-green.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/arrow-grey-small.gif b/web/cobrands/barnet/images/dark/arrow-grey-small.gif Binary files differdeleted file mode 100644 index 1b47cb21d..000000000 --- a/web/cobrands/barnet/images/dark/arrow-grey-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/arrow-red-small.gif b/web/cobrands/barnet/images/dark/arrow-red-small.gif Binary files differdeleted file mode 100644 index f9c2e1cf5..000000000 --- a/web/cobrands/barnet/images/dark/arrow-red-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/arrow-red.gif b/web/cobrands/barnet/images/dark/arrow-red.gif Binary files differdeleted file mode 100644 index b0c9d7d5d..000000000 --- a/web/cobrands/barnet/images/dark/arrow-red.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/cnr-expanded-tab_ne.gif b/web/cobrands/barnet/images/dark/cnr-expanded-tab_ne.gif Binary files differdeleted file mode 100644 index 7d2ef2d9e..000000000 --- a/web/cobrands/barnet/images/dark/cnr-expanded-tab_ne.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.gif b/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.gif Binary files differdeleted file mode 100644 index 03f1e20dd..000000000 --- a/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.png b/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.png Binary files differdeleted file mode 100644 index 66d9ec0f5..000000000 --- a/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.png +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/cnr-search-button.gif b/web/cobrands/barnet/images/dark/cnr-search-button.gif Binary files differdeleted file mode 100644 index 7bdb7ba0c..000000000 --- a/web/cobrands/barnet/images/dark/cnr-search-button.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/grey-border.gif b/web/cobrands/barnet/images/dark/grey-border.gif Binary files differdeleted file mode 100644 index d01106f1a..000000000 --- a/web/cobrands/barnet/images/dark/grey-border.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-contact-small.gif b/web/cobrands/barnet/images/dark/icon-contact-small.gif Binary files differdeleted file mode 100644 index 36b258e1d..000000000 --- a/web/cobrands/barnet/images/dark/icon-contact-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-council-meetings.gif b/web/cobrands/barnet/images/dark/icon-council-meetings.gif Binary files differdeleted file mode 100644 index 80faa8dda..000000000 --- a/web/cobrands/barnet/images/dark/icon-council-meetings.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-highlights.gif b/web/cobrands/barnet/images/dark/icon-highlights.gif Binary files differdeleted file mode 100644 index 682b66416..000000000 --- a/web/cobrands/barnet/images/dark/icon-highlights.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-media-centre.gif b/web/cobrands/barnet/images/dark/icon-media-centre.gif Binary files differdeleted file mode 100644 index 4a0c3269f..000000000 --- a/web/cobrands/barnet/images/dark/icon-media-centre.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-online-services-small.gif b/web/cobrands/barnet/images/dark/icon-online-services-small.gif Binary files differdeleted file mode 100644 index 59c969735..000000000 --- a/web/cobrands/barnet/images/dark/icon-online-services-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-online-services.gif b/web/cobrands/barnet/images/dark/icon-online-services.gif Binary files differdeleted file mode 100644 index ff4bc93fe..000000000 --- a/web/cobrands/barnet/images/dark/icon-online-services.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-useful-links-small.gif b/web/cobrands/barnet/images/dark/icon-useful-links-small.gif Binary files differdeleted file mode 100644 index 589550b80..000000000 --- a/web/cobrands/barnet/images/dark/icon-useful-links-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-welcome.gif b/web/cobrands/barnet/images/dark/icon-welcome.gif Binary files differdeleted file mode 100644 index 85afa6fa8..000000000 --- a/web/cobrands/barnet/images/dark/icon-welcome.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-whats-on.gif b/web/cobrands/barnet/images/dark/icon-whats-on.gif Binary files differdeleted file mode 100644 index e7d028a80..000000000 --- a/web/cobrands/barnet/images/dark/icon-whats-on.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/main-prop-border.gif b/web/cobrands/barnet/images/dark/main-prop-border.gif Binary files differdeleted file mode 100644 index 192c20d28..000000000 --- a/web/cobrands/barnet/images/dark/main-prop-border.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/quote.gif b/web/cobrands/barnet/images/dark/quote.gif Binary files differdeleted file mode 100644 index d9a4f7496..000000000 --- a/web/cobrands/barnet/images/dark/quote.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/red-border.gif b/web/cobrands/barnet/images/dark/red-border.gif Binary files differdeleted file mode 100644 index c8b56fa8c..000000000 --- a/web/cobrands/barnet/images/dark/red-border.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/related-bg.gif b/web/cobrands/barnet/images/dark/related-bg.gif Binary files differdeleted file mode 100644 index 7cd7cef31..000000000 --- a/web/cobrands/barnet/images/dark/related-bg.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/rss-highlights.gif b/web/cobrands/barnet/images/dark/rss-highlights.gif Binary files differdeleted file mode 100644 index dd7b416f0..000000000 --- a/web/cobrands/barnet/images/dark/rss-highlights.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/rss-media.gif b/web/cobrands/barnet/images/dark/rss-media.gif Binary files differdeleted file mode 100644 index 273c8c5f9..000000000 --- a/web/cobrands/barnet/images/dark/rss-media.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/rss-whats-on.gif b/web/cobrands/barnet/images/dark/rss-whats-on.gif Binary files differdeleted file mode 100644 index 60b752c8c..000000000 --- a/web/cobrands/barnet/images/dark/rss-whats-on.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/social-delicious.gif b/web/cobrands/barnet/images/dark/social-delicious.gif Binary files differdeleted file mode 100644 index 98955d90b..000000000 --- a/web/cobrands/barnet/images/dark/social-delicious.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/social-digg.gif b/web/cobrands/barnet/images/dark/social-digg.gif Binary files differdeleted file mode 100644 index b33602377..000000000 --- a/web/cobrands/barnet/images/dark/social-digg.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/social-facebook.gif b/web/cobrands/barnet/images/dark/social-facebook.gif Binary files differdeleted file mode 100644 index 072e5ac2d..000000000 --- a/web/cobrands/barnet/images/dark/social-facebook.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/social-google.gif b/web/cobrands/barnet/images/dark/social-google.gif Binary files differdeleted file mode 100644 index a3a11b3ce..000000000 --- a/web/cobrands/barnet/images/dark/social-google.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/social-stumbleupon.gif b/web/cobrands/barnet/images/dark/social-stumbleupon.gif Binary files differdeleted file mode 100644 index b9c4a1088..000000000 --- a/web/cobrands/barnet/images/dark/social-stumbleupon.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/social-technorati.gif b/web/cobrands/barnet/images/dark/social-technorati.gif Binary files differdeleted file mode 100644 index 0b7d2e299..000000000 --- a/web/cobrands/barnet/images/dark/social-technorati.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/wrap-border.gif b/web/cobrands/barnet/images/dark/wrap-border.gif Binary files differdeleted file mode 100644 index cf8c3d319..000000000 --- a/web/cobrands/barnet/images/dark/wrap-border.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/expanded-tab.png b/web/cobrands/barnet/images/expanded-tab.png Binary files differdeleted file mode 100644 index df8dd66b4..000000000 --- a/web/cobrands/barnet/images/expanded-tab.png +++ /dev/null diff --git a/web/cobrands/barnet/images/form-field_bottom.gif b/web/cobrands/barnet/images/form-field_bottom.gif Binary files differdeleted file mode 100644 index 63ec4d121..000000000 --- a/web/cobrands/barnet/images/form-field_bottom.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/form-field_top.gif b/web/cobrands/barnet/images/form-field_top.gif Binary files differdeleted file mode 100644 index a7b7e0d52..000000000 --- a/web/cobrands/barnet/images/form-field_top.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/header-bg.gif b/web/cobrands/barnet/images/header-bg.gif Binary files differdeleted file mode 100644 index 5e6a72ef9..000000000 --- a/web/cobrands/barnet/images/header-bg.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-contact-small.gif b/web/cobrands/barnet/images/icon-contact-small.gif Binary files differdeleted file mode 100644 index efed060d1..000000000 --- a/web/cobrands/barnet/images/icon-contact-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-council-meetings.gif b/web/cobrands/barnet/images/icon-council-meetings.gif Binary files differdeleted file mode 100644 index 1eca7dc68..000000000 --- a/web/cobrands/barnet/images/icon-council-meetings.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-council-meetings.png b/web/cobrands/barnet/images/icon-council-meetings.png Binary files differdeleted file mode 100644 index 28e0aea75..000000000 --- a/web/cobrands/barnet/images/icon-council-meetings.png +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-highlights.gif b/web/cobrands/barnet/images/icon-highlights.gif Binary files differdeleted file mode 100644 index e9b079445..000000000 --- a/web/cobrands/barnet/images/icon-highlights.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-highlights.png b/web/cobrands/barnet/images/icon-highlights.png Binary files differdeleted file mode 100644 index d812a2ad9..000000000 --- a/web/cobrands/barnet/images/icon-highlights.png +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-media-centre.gif b/web/cobrands/barnet/images/icon-media-centre.gif Binary files differdeleted file mode 100644 index b37eb9606..000000000 --- a/web/cobrands/barnet/images/icon-media-centre.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-media-centre.png b/web/cobrands/barnet/images/icon-media-centre.png Binary files differdeleted file mode 100644 index 5e1741618..000000000 --- a/web/cobrands/barnet/images/icon-media-centre.png +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-online-services-small.gif b/web/cobrands/barnet/images/icon-online-services-small.gif Binary files differdeleted file mode 100644 index 19f1c7d4e..000000000 --- a/web/cobrands/barnet/images/icon-online-services-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-online-services.gif b/web/cobrands/barnet/images/icon-online-services.gif Binary files differdeleted file mode 100644 index 1d79fb14b..000000000 --- a/web/cobrands/barnet/images/icon-online-services.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-online-services.png b/web/cobrands/barnet/images/icon-online-services.png Binary files differdeleted file mode 100644 index ef0297af7..000000000 --- a/web/cobrands/barnet/images/icon-online-services.png +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-useful-links-small.gif b/web/cobrands/barnet/images/icon-useful-links-small.gif Binary files differdeleted file mode 100644 index 1c4566127..000000000 --- a/web/cobrands/barnet/images/icon-useful-links-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-welcome.gif b/web/cobrands/barnet/images/icon-welcome.gif Binary files differdeleted file mode 100644 index 24c603a4a..000000000 --- a/web/cobrands/barnet/images/icon-welcome.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-welcome.png b/web/cobrands/barnet/images/icon-welcome.png Binary files differdeleted file mode 100644 index e6fb3c46a..000000000 --- a/web/cobrands/barnet/images/icon-welcome.png +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-whats-on.gif b/web/cobrands/barnet/images/icon-whats-on.gif Binary files differdeleted file mode 100644 index df96259a5..000000000 --- a/web/cobrands/barnet/images/icon-whats-on.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-whats-on.png b/web/cobrands/barnet/images/icon-whats-on.png Binary files differdeleted file mode 100644 index bba974359..000000000 --- a/web/cobrands/barnet/images/icon-whats-on.png +++ /dev/null diff --git a/web/cobrands/barnet/images/logo-barnet.gif b/web/cobrands/barnet/images/logo-barnet.gif Binary files differdeleted file mode 100644 index 5bcb70bb0..000000000 --- a/web/cobrands/barnet/images/logo-barnet.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/logo-browse-aloud.gif b/web/cobrands/barnet/images/logo-browse-aloud.gif Binary files differdeleted file mode 100644 index 16d51b63e..000000000 --- a/web/cobrands/barnet/images/logo-browse-aloud.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/main-prop-border.gif b/web/cobrands/barnet/images/main-prop-border.gif Binary files differdeleted file mode 100644 index 2799b45c6..000000000 --- a/web/cobrands/barnet/images/main-prop-border.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/navigation-bg.gif b/web/cobrands/barnet/images/navigation-bg.gif Binary files differdeleted file mode 100644 index 4abcb5896..000000000 --- a/web/cobrands/barnet/images/navigation-bg.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/prop-bg.png b/web/cobrands/barnet/images/prop-bg.png Binary files differdeleted file mode 100644 index eee3d4329..000000000 --- a/web/cobrands/barnet/images/prop-bg.png +++ /dev/null diff --git a/web/cobrands/barnet/images/quote.gif b/web/cobrands/barnet/images/quote.gif Binary files differdeleted file mode 100644 index cbcd770f8..000000000 --- a/web/cobrands/barnet/images/quote.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/related-bg.gif b/web/cobrands/barnet/images/related-bg.gif Binary files differdeleted file mode 100644 index 58c9f731a..000000000 --- a/web/cobrands/barnet/images/related-bg.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/rss-highlights.gif b/web/cobrands/barnet/images/rss-highlights.gif Binary files differdeleted file mode 100644 index 4a938a86d..000000000 --- a/web/cobrands/barnet/images/rss-highlights.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/rss-media.gif b/web/cobrands/barnet/images/rss-media.gif Binary files differdeleted file mode 100644 index 4e3f55f87..000000000 --- a/web/cobrands/barnet/images/rss-media.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/rss-whats-on.gif b/web/cobrands/barnet/images/rss-whats-on.gif Binary files differdeleted file mode 100644 index d4f44b861..000000000 --- a/web/cobrands/barnet/images/rss-whats-on.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/search-button-bottom.gif b/web/cobrands/barnet/images/search-button-bottom.gif Binary files differdeleted file mode 100644 index ae6404966..000000000 --- a/web/cobrands/barnet/images/search-button-bottom.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/search-button-top.gif b/web/cobrands/barnet/images/search-button-top.gif Binary files differdeleted file mode 100644 index bf4a13e0b..000000000 --- a/web/cobrands/barnet/images/search-button-top.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/social-delicious.gif b/web/cobrands/barnet/images/social-delicious.gif Binary files differdeleted file mode 100644 index 0f243ea90..000000000 --- a/web/cobrands/barnet/images/social-delicious.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/social-digg.gif b/web/cobrands/barnet/images/social-digg.gif Binary files differdeleted file mode 100644 index c836d1412..000000000 --- a/web/cobrands/barnet/images/social-digg.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/social-facebook.gif b/web/cobrands/barnet/images/social-facebook.gif Binary files differdeleted file mode 100644 index 96eef255f..000000000 --- a/web/cobrands/barnet/images/social-facebook.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/social-google.gif b/web/cobrands/barnet/images/social-google.gif Binary files differdeleted file mode 100644 index 491a23adf..000000000 --- a/web/cobrands/barnet/images/social-google.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/social-stumbleupon.gif b/web/cobrands/barnet/images/social-stumbleupon.gif Binary files differdeleted file mode 100644 index 8d24d01f4..000000000 --- a/web/cobrands/barnet/images/social-stumbleupon.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/social-technorati.gif b/web/cobrands/barnet/images/social-technorati.gif Binary files differdeleted file mode 100644 index ab83181b9..000000000 --- a/web/cobrands/barnet/images/social-technorati.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/style-switcher_dark-relaxed.gif b/web/cobrands/barnet/images/style-switcher_dark-relaxed.gif Binary files differdeleted file mode 100644 index e94c93959..000000000 --- a/web/cobrands/barnet/images/style-switcher_dark-relaxed.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/style-switcher_dark.gif b/web/cobrands/barnet/images/style-switcher_dark.gif Binary files differdeleted file mode 100644 index 094115ecd..000000000 --- a/web/cobrands/barnet/images/style-switcher_dark.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/style-switcher_default-relaxed.gif b/web/cobrands/barnet/images/style-switcher_default-relaxed.gif Binary files differdeleted file mode 100644 index 7bb6f7df9..000000000 --- a/web/cobrands/barnet/images/style-switcher_default-relaxed.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/style-switcher_default.gif b/web/cobrands/barnet/images/style-switcher_default.gif Binary files differdeleted file mode 100644 index 9e932af2f..000000000 --- a/web/cobrands/barnet/images/style-switcher_default.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/wrap-border.gif b/web/cobrands/barnet/images/wrap-border.gif Binary files differdeleted file mode 100644 index eb5ff2330..000000000 --- a/web/cobrands/barnet/images/wrap-border.gif +++ /dev/null diff --git a/web/cobrands/barnet/javascript/2008-portsurf.js b/web/cobrands/barnet/javascript/2008-portsurf.js deleted file mode 100644 index f9253a25a..000000000 --- a/web/cobrands/barnet/javascript/2008-portsurf.js +++ /dev/null @@ -1,93 +0,0 @@ -/**
-* Portsurf Ltd functions
-**/
-
-function resetMarkers(){
- $("#s1:first-child").html("default");
- $("#s2:first-child").html("relaxed light");
- $("#s3:first-child").html("dark");
- $("#s4:first-child").html("relaxed dark");
-}
-
-$(document).ready(function(){
-
- /**
- * Show the style switcher - it's hidden without javascript
- **/
- $("#switcher").show();
-
-
- /**
- * Clear the search box
- **/
- $(".search").focus(function(){
- if(this.value=="Please enter your search"){
- this.value="";
- }
- });
-
- /**
- * Highlight the appropriate style preference
- **/
-
-
- /**
- * Page loads
- **/
-
- // reset markers first
- resetMarkers();
-
- // set markers
- var sty=$.cookie('style');
- switch(sty){
- case "default":
- $("#s1:first-child").html("<strong>default</strong>");
- break;
-
- case "relaxed light":
- $("#s2:first-child").html("<strong>relaxed light</strong>");
- break;
-
- case "dark":
- $("#s3:first-child").html("<strong>dark</strong>");
- break;
-
- case "relaxed dark":
- $("#s4:first-child").html("<strong>relaxed dark</strong>");
- break;
-
- default:
- $("#s1:first-child").html("<strong>default</strong>");
- break;
-
- }
-
- /**
- * Clicks
- **/
-
- $("#s1").click(function(){
- resetMarkers();
- $("#s1:first-child").html("<strong>default</strong>");
- });
-
- $("#s2").click(function(){
- resetMarkers();
- $("#s2:first-child").html("<strong>relaxed light</strong>");
- });
-
- $("#s3").click(function(){
- resetMarkers();
- $("#s3:first-child").html("<strong>dark</strong>");
- });
-
- $("#s4").click(function(){
- resetMarkers();
- $("#s4:first-child").html("<strong>relaxed dark</strong>");
- });
-
- // Intentionally blank due to fake indenting...
-
-});
-
diff --git a/web/cobrands/barnet/javascript/jquery-1.2.6_common.js b/web/cobrands/barnet/javascript/jquery-1.2.6_common.js deleted file mode 100644 index 7b09750cc..000000000 --- a/web/cobrands/barnet/javascript/jquery-1.2.6_common.js +++ /dev/null @@ -1,31 +0,0 @@ -//jQuery 1.2.6 -(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else -return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else -return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else -selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else -return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else -this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else -return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else -jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&©&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else -script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else -for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else -for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else -jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else -ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&¬xml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&¬xml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&¬xml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else -while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else -while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[ret.length-1];if(m[1]=="#"&&elem&&elem.getElementById&&!jQuery.isXMLDoc(elem)){var oid=elem.getElementById(m[2]);if((jQuery.browser.msie||jQuery.browser.opera)&&oid&&typeof oid.id=="string"&&oid.id!=m[2])oid=jQuery('[@id="'+m[2]+'"]',elem)[0];ret=r=oid&&(!m[3]||jQuery.nodeName(oid,m[3]))?[oid]:[];}else{for(var i=0;ret[i];i++){var tag=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];if(tag=="*"&&ret[i].nodeName.toLowerCase()=="object")tag="param";r=jQuery.merge(r,ret[i].getElementsByTagName(tag));}if(m[1]==".")r=jQuery.classFilter(r,m[2]);if(m[1]=="#"){var tmp=[];for(var i=0;r[i];i++)if(r[i].getAttribute("id")==m[2]){tmp=[r[i]];break;}r=tmp;}ret=r;}t=t.replace(re2,"");}}if(t){var val=jQuery.filter(t,r);ret=r=val.r;t=jQuery.trim(val.t);}}if(t)ret=[];if(ret&&context==ret[0])ret.shift();done=jQuery.merge(done,ret);return done;},classFilter:function(r,m,not){m=" "+m+" ";var tmp=[];for(var i=0;r[i];i++){var pass=(" "+r[i].className+" ").indexOf(m)>=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i<rl;i++){var a=r[i],z=a[jQuery.props[m[2]]||m[2]];if(z==null||/href|src|selected/.test(m[2]))z=jQuery.attr(a,m[2])||'';if((type==""&&!!z||type=="="&&z==m[5]||type=="!="&&z!=m[5]||type=="^="&&z&&!z.indexOf(m[5])||type=="$="&&z.substr(z.length-m[5].length)==m[5]||(type=="*="||type=="~=")&&z.indexOf(m[5])>=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i<rl;i++){var node=r[i],parentNode=node.parentNode,id=jQuery.data(parentNode);if(!merge[id]){var c=1;for(var n=parentNode.firstChild;n;n=n.nextSibling)if(n.nodeType==1)n.nodeIndex=c++;merge[id]=true;}var add=false;if(first==0){if(node.nodeIndex==last)add=true;}else if((node.nodeIndex-last)%first==0&&(node.nodeIndex-last)/first>=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else -for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i<args.length)jQuery.event.proxy(fn,args[i++]);return this.click(jQuery.event.proxy(fn,function(event){this.lastToggle=(this.lastToggle||0)%i;event.preventDefault();return args[this.lastToggle++].apply(this,arguments)||false;}));},hover:function(fnOver,fnOut){return this.bind('mouseenter',fnOver).bind('mouseleave',fnOut);},ready:function(fn){bindReady();if(jQuery.isReady)fn.call(document,jQuery);else -jQuery.readyList.push(function(){return fn.call(this,jQuery);});return this;}});jQuery.extend({isReady:false,readyList:[],ready:function(){if(!jQuery.isReady){jQuery.isReady=true;if(jQuery.readyList){jQuery.each(jQuery.readyList,function(){this.call(document);});jQuery.readyList=null;}jQuery(document).triggerHandler("ready");}}});var readyBound=false;function bindReady(){if(readyBound)return;readyBound=true;if(document.addEventListener&&!jQuery.browser.opera)document.addEventListener("DOMContentLoaded",jQuery.ready,false);if(jQuery.browser.msie&&window==top)(function(){if(jQuery.isReady)return;try{document.documentElement.doScroll("left");}catch(error){setTimeout(arguments.callee,0);return;}jQuery.ready();})();if(jQuery.browser.opera)document.addEventListener("DOMContentLoaded",function(){if(jQuery.isReady)return;for(var i=0;i<document.styleSheets.length;i++)if(document.styleSheets[i].disabled){setTimeout(arguments.callee,0);return;}jQuery.ready();},false);if(jQuery.browser.safari){var numStyles;(function(){if(jQuery.isReady)return;if(document.readyState!="loaded"&&document.readyState!="complete"){setTimeout(arguments.callee,0);return;}if(numStyles===undefined)numStyles=jQuery("style, link[rel=stylesheet]").length;if(document.styleSheets.length!=numStyles){setTimeout(arguments.callee,0);return;}jQuery.ready();})();}jQuery.event.add(window,"load",jQuery.ready);}jQuery.each(("blur,focus,load,resize,scroll,unload,click,dblclick,"+"mousedown,mouseup,mousemove,mouseover,mouseout,change,select,"+"submit,keydown,keypress,keyup,error").split(","),function(i,name){jQuery.fn[name]=function(fn){return fn?this.bind(name,fn):this.trigger(name);};});var withinElement=function(event,elem){var parent=event.relatedTarget;while(parent&&parent!=elem)try{parent=parent.parentNode;}catch(error){parent=elem;}return parent==elem;};jQuery(window).bind("unload",function(){jQuery("*").add(document).unbind();});jQuery.fn.extend({_load:jQuery.fn.load,load:function(url,params,callback){if(typeof url!='string')return this._load(url);var off=url.indexOf(" ");if(off>=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("<div/>").append(res.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else -xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else -jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else -for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else -s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else -e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;i<timers.length;i++)if(!timers[i]())timers.splice(i--,1);if(!timers.length){clearInterval(jQuery.timerId);jQuery.timerId=null;}},13);}},show:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.show=true;this.custom(0,this.cur());if(this.prop=="width"||this.prop=="height")this.elem.style[this.prop]="1px";jQuery(this.elem).show();},hide:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0);},step:function(gotoEnd){var t=now();if(gotoEnd||t>this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})(); - -// Cookies -function createCookie(name,value,days){if(days){var date=new Date();date.setTime(date.getTime()+(days*24*60*60*1000));var expires="; expires="+date.toGMTString();} -else var expires="";document.cookie=name+"="+value+expires+"; path=/";} -function readCookie(name){var nameEQ=name+"=";var ca=document.cookie.split(';');for(var i=0;i<ca.length;i++){var c=ca[i];while(c.charAt(0)==' ')c=c.substring(1,c.length);if(c.indexOf(nameEQ)==0)return c.substring(nameEQ.length,c.length);} -return null;} -function eraseCookie(name){createCookie(name,"",-1);} - diff --git a/web/cobrands/barnet/javascript/jquery-cookie-min.js b/web/cobrands/barnet/javascript/jquery-cookie-min.js deleted file mode 100644 index 37fe78ad6..000000000 --- a/web/cobrands/barnet/javascript/jquery-cookie-min.js +++ /dev/null @@ -1,10 +0,0 @@ -/**
- * Cookie plugin
- *
- * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- *
- */
-jQuery.cookie=function(name,value,options){if(typeof value!='undefined'){options=options||{};if(value===null){value='';options.expires=-1;}var expires='';if(options.expires&&(typeof options.expires=='number'||options.expires.toUTCString)){var date;if(typeof options.expires=='number'){date=new Date();date.setTime(date.getTime()+(options.expires*24*60*60*1000));}else{date=options.expires;}expires='; expires='+date.toUTCString();}var path=options.path?'; path='+(options.path):'';var domain=options.domain?'; domain='+(options.domain):'';var secure=options.secure?'; secure':'';document.cookie=[name,'=',encodeURIComponent(value),expires,path,domain,secure].join('');}else{var cookieValue=null;if(document.cookie&&document.cookie!=''){var cookies=document.cookie.split(';');for(var i=0;i<cookies.length;i++){var cookie=jQuery.trim(cookies[i]);if(cookie.substring(0,name.length+1)==(name+'=')){cookieValue=decodeURIComponent(cookie.substring(name.length+1));break;}}}return cookieValue;}};
\ No newline at end of file diff --git a/web/cobrands/barnet/javascript/styleswitch.js b/web/cobrands/barnet/javascript/styleswitch.js deleted file mode 100644 index c4afb0b28..000000000 --- a/web/cobrands/barnet/javascript/styleswitch.js +++ /dev/null @@ -1,26 +0,0 @@ -/**
-* Styleswitch stylesheet switcher built on jQuery
-* Under an Attribution, Share Alike License
-* By Kelvin Luck ( http://www.kelvinluck.com/ )
-**/
-
-$(document).ready(function() {
- $('.styleswitch').click(function()
- {
- switchStylestyle(this.getAttribute("rel"));
- return false;
- });
- var c = readCookie('style');
- if (c) switchStylestyle(c);
-});
-
-function switchStylestyle(styleName)
-{
- $('link[@rel*=style][@title]').each(function(i)
- {
- this.disabled = true;
- if (this.getAttribute('title') == styleName) this.disabled = false;
- });
- createCookie('style', styleName, 365);
-}
-
diff --git a/web/cobrands/bromley/_colours.scss b/web/cobrands/bromley/_colours.scss new file mode 100644 index 000000000..c0376274e --- /dev/null +++ b/web/cobrands/bromley/_colours.scss @@ -0,0 +1,8 @@ +/* COLOURS */ + +$primary: rgb(76,120,168); +$primary_b: #000000; +$primary_text: #ffffff; + +$contrast1: #00BD08; +$contrast2: #AA8D11; diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss new file mode 100644 index 000000000..4594f832f --- /dev/null +++ b/web/cobrands/bromley/base.scss @@ -0,0 +1,7 @@ +@import "../fixmystreet/_h5bp"; +@import "./_colours"; +@import "../fixmystreet/_mixins"; +@import "compass"; + +@import "../fixmystreet/_base"; + diff --git a/web/cobrands/bromley/config.rb b/web/cobrands/bromley/config.rb new file mode 100644 index 000000000..cab97b18f --- /dev/null +++ b/web/cobrands/bromley/config.rb @@ -0,0 +1,25 @@ +# Require any additional compass plugins here. + +# Set this to the root of your project when deployed: +http_path = "/" +css_dir = "" +sass_dir = "" +images_dir = "" +javascripts_dir = "" + +# You can select your preferred output style here (can be overridden via the command line): +# output_style = :expanded or :nested or :compact or :compressed + +# To enable relative paths to assets via compass helper functions. Uncomment: +# relative_assets = true + +# 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 diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss new file mode 100644 index 000000000..3dc34c6c7 --- /dev/null +++ b/web/cobrands/bromley/layout.scss @@ -0,0 +1,11 @@ +@import "_colours"; +@import "../fixmystreet/_layout"; + +body { + background: #fff; +} + +#front-main { + background: $primary; +} + diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss new file mode 100644 index 000000000..644b015b5 --- /dev/null +++ b/web/cobrands/fixmystreet/_base.scss @@ -0,0 +1,1482 @@ +/* HEADINGS and TYPOGRAPHY */ + +body { + font-family: MuseoSans, Helmet, Freesans, sans-serif; + margin:0; + font-size:1em; + line-height:1.5; + color: #222; + background-color: #fff; +} + + +p { + font-size: 1em; + font-weight: normal; + margin:0 0 1em 0; +} + +small{ + font-family: Helmet, Freesans, sans-serif; + font-style: italic; + font-size: 0.8125em; + line-height: 1.2307em; +} + +h1 { + font-family: 'Museo300-display', MuseoSans, Helmet, Freesans, sans-serif; + font-size: 2em; + line-height: 1em; + font-weight: normal; + margin-top: 0.5em; + margin-bottom: 0.5em; +} +#front-main h1 { + margin-top: 0.7em; +} +h1#reports_heading span { + display: none; +} +h1#reports_heading a { + display: block; + font-size: 50%; +} + +h2 { + font-family:'Museo300-display', MuseoSans, Helmet, Freesans, sans-serif; + font-size: 1.5em; /*24px*/ + line-height: 1.3333em; /*32px*/ + font-weight: normal; + margin-top: 1.333333333em; /*32px*/ + margin-bottom: 0.666666666em; /*16px*/ +} + +h3 { + font-size: 1.25em; + line-height: 1.20em; + margin-top: 1.2em; + margin-bottom: 0.8em; + font-weight: normal; +} + +h4 { + font-size: 1em; + font-weight: normal; + margin-bottom: 1em; +} + +// default list styles +ul, ol { + font-size: 1em; + margin-bottom: 2em; + margin-left: 2em; + padding:0; +} + +li{ + margin-bottom: 0.5em; +} + +ul li{ + list-style: square; +} + +ol li { + list-style:decimal; +} + +// lets you have a traditional ol but with nicely styled numbers +// for older browsers it just falls back to the normal ol +ol.big-numbers { + padding: 0; + margin: 0; + counter-reset: li; // reset counter to be 'li' instead of a number + > li { + position: relative; + list-style: none; + padding:0 0 0 2.5em; + margin-bottom:2em; + &:before { + content: counter(li); // set the content to be whatever the 'li' var is + counter-increment: li; // add to the counter var + position: absolute; + left: 0; + top:-0.2em; + color:#ccc; + line-height:1; + font: { + family: Helmet, Freesans, sans-serif; + weight:bold; + size:2.5em; + } + } + } +} + +dl { + margin: 0; + padding: 0; + dt { + font-size: 1em; + line-height: 1.5em; + font-weight: bold; + } + dd { + font-weight: 1em; + line-height: 1.5em; + margin:0 0 1em 0; + } +} + +blockquote { + p:before { + content: '“'; + } + p:after { + content: '”'; + } +} + +pre { + font-family: monospace; +} + +img { + //do this otherwise IE will just not display + //any img without a height defined + height:auto; +} + +select, input, textarea { + font-size: 99%; + max-width: 95%; +} +// To deal with bug from drop-down being wider than holder +select { + width: 100%; +} + +// links +a, +a:visited { + text-decoration:none; + color:#0BA7D1; + &:hover, + &:active { + text-decoration:underline; + color:#0D7CCE; + } +} + +// custom type +.small-print { + @extend small; + margin-bottom: 1.2307em; + color:#666666; +} +.meta{ + color:#555555; + font-style: italic; + margin-bottom: 0px; +} +.meta-2{ + font-family: Helmet, Freesans, sans-serif; + color:#666666; + font-style: italic; + font-size: 0.75em; +} + +h4.static{ + font-family: Helmet, Freesans, sans-serif; + text-transform: uppercase; + font-size: 0.875em; + line-height: 1.71428em; + color:#666; + margin-top: 2em; +} +h4.static-with-rule{ + @extend.static; + background: #f6f6f6; + border-top: 0.25em solid $primary; + margin-bottom:0.25em; + padding: 0.5em 1em; +} + +/* FORMS */ + +// input placeholders, these need to be on separate lines as if the browser +// can't understand a selector it will invalidate the whole line. +::-webkit-input-placeholder { + color: #666666; + font: { + style:italic; + size:0.9375em; + } +} +:-moz-placeholder { + color:#666666; + font: { + style:italic; + size:0.9375em; + } +} +:-ms-placeholder { + color:#666666; + font: { + style:italic; + size:0.9375em; + } +} +//this only gets used when the browser doesn't support @placeholder +.placeholder { + color:#666666; + font: { + style:italic; + size:0.9375em; + } +} + +// wrap anything inside the form in a fieldset to give +// us the right spacing +fieldset { + margin: 1em; +} + +input[type=text], +input[type=password], +input[type=email], +input[type=file], +textarea { + width: 100%; + // adjust so the sides line up + padding: 0.5em; + margin: 0 0 0 -0.5em; +} + +textarea { + border: 0.125em solid #888888; + @include border-radius(0.25em); + display: block; + font-size: 1em; + line-height: 1.5em; + font-family: Helmet, Freesans, sans-serif; + min-height:8em; +} + +input[type=text], +input[type=password], +input[type=email], +input[type=file] { + border: 0.125em solid #888888; + @include border-radius(0.25em); + display: block; + font-size: 1em; + line-height: 1em; +} +input[type=file] { + margin-bottom:1em; +} + +label{ + display: block; + margin-top: 1.25em; + margin-bottom: 0.25em; + font-weight: bold; + &.inline{ + display: inline; + padding: 0 2em 0 1em; + font-weight: normal; + } +} + +// grey background, full width box +.form-box { + margin: 0 -2em 0.25em -2em; + background:#eeeeee; + padding:1em 2em 1em 2em; + max-width:26em; + >input[type=text] { + margin-bottom:1em; + } + .title { + font-size:1.25em; + margin:0.5em 0; + } + h5 { + margin:0; + font: { + size:1.125em; + weight:normal; + } + strong { + font-size:2em; + margin-right:0.25em; + } + } +} +// IE6 doesn't extend the grey box back with the above negative margins, and +// the password box falls off screen for some reason. Just have boring margins, +// it looks okay. +.ie6 .form-box { + margin: 0 0 0.25em 0; +} + +.form-txt-submit-box { + min-height:3em; + input[type=password], + input[type=text], + input[type=email] { + width: 65%; + float:left; + } + input[type=submit] { + float:right; + width:28%; + margin-right:0.25em; + padding-top:0.7em; + padding-bottom:0.6em; + } +} + +.checkbox-group { + margin:1em 0; +} + + +// form errors +div.form-error, +p.form-error { + @include inline-block; + background:#ff0000; + color:#fff; + padding:0 0.5em; + margin:0 0 0 -0.5em; + @include border-radius(0.25em 0.25em 0 0); +} + +input.form-error, +textarea.form-error { + border-color:#ff0000; + @include border-radius(0 0.25em 0.25em 0.25em); +} + +ul.error { + background:#ff0000; + color:#fff; + padding:0 0.5em; + margin:0 0 0 -0.5em; + @include border-radius(0.25em); +} + +// don't display valid error boxes as now the page jump +// won't be until the user submits, which is fine +div.label-valid, +p.label-valid { + display:none !important; + visibility: hidden; +} + + + +/*** LAYOUT ***/ + +// Padding creates page margins on mobile +.container{ + padding: 0 1em 1em; +} + +// Use full width to reverse .container margins +.full-width { + margin: 0 -1em; +} + +// #site-header creates grey bar in mobile +// .nav-wrapper-2 is used on desktop +#site-header{ + border-top: 0.25em solid $primary; + height: 3em; + @include background(linear-gradient(#000, #222 10%, #222 90%, #000)); + .container { + min-height:4em; + } +} +#site-logo{ + display: block; + width: 175px; + height: 40px; + top: 0.4em; + background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAK8AAAAoCAYAAACIJ6oVAAAACW9GRnMAAAADAAAAAwB3k5ejAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAAABmJLR0QA/wD/AP+gvaeTAAAag0lEQVR42u1cB1RWx7YeBBW7YAOViL0bNSomdsWADVsQbEHFiAUUMYmiokEUWzQiiQ0VNSC2gFiJmthbiF1jwxaNGr0pKra8t1be3r/frLc99/zwo7nv3rzFWWuv/z9zZs6ZM/PtPd/eM3OUyj1yj9wj98g9co/cI/fIPXKP3MPaYQfJY6Po/LlH7vFvBa09ST6SIiROJM7ZiBPy5kPZXBDnHv8W0OYHGCuSeJB4kniReFsRL+TxQBkngDhPbpPmHv8XRx4AjoFXiaQFSUDXrl2XxMfHp585c+b2nyZHZmbmM742b968gx4eHvO5DElzkgokhXKtcO7xrz7sAbQKAF7AoEGDEk+ePPnznzk8tm3bdhUg7kFSE5QiJ1bY7jXkrxyB/pX5/4o2yD0EcKuQdHdzc5t14MCBm3++5rFy5cqjdL9AKMMbJAWzAbB0DLlODlmIPeSvdBrNnFNr97LmyL4OsOQ97bNoA/nuf1eA/yX1zCOA69uxY8eEhw8f/mEGxrt37z5OS0vLWLZs2QmS4yzr168/d/Xq1V+sAfjKlSu/kjLMpHv7AMD5TCprJ7h2XvDtAqgXS2EhOq0g8jgiv5Z8ooNtbRj5fAfcI5+VexkBlhf5XvXZRsXVz3fEOxrbQL+7I/LlNVFio2Lb/YeBNqt62uXkRvlAFboDuP9lQgOudenSZRmsqI+Js+bj6en58erVq/cT/31uLH/p0qUHAHALUAj7LJzEQuDcpUlcScqRlBfC52VJypCUElEOluIkRdG5OYl4GJ9fVNyrENKlpcsD0DgiulIczy+G/DmNtkjFLYj7lCRxsfL+Lnh3JwC6gEGBHYVS531FZfpXWVppoMzqabOy2aMBmjNHNVrcCxcuPPL29l4D0LYkqQzQlICUhJSB5W5ZtWrV4KNHj14xs8C4T010cB4rIbkycBbrkLyF6EVTIU1IGpHUJ6lFUg31qowoR3nUqbCNIJLALQqleQP3egPnRXHdwQAyZ4CpEp5fAfmLCMDb2QjcfKgzg9Id79YQ7/82yTv49UC71EWblxdALo46lUT/FLeifLZSjFelIXZZjFTaQBQX+HFGGxdA22YLYDvciBs+4NSpUy85ZhcvXnxUtmzZhXTNTzhdjrh5ATxMx3eLocNKIK9fbGzsXiOAU1JSTsKJqyDogx1AUQgdX33RRDX84EqV8G2cWrdzkfpqx0KVzML/dy5WX1H6+n3LVdKsUPUR5W/DFn3BeBV8ap2KS5hmUZBK6NBC2TSGUXHY0tc4s0EtObFWLW3R0HLvGkgvIqhBQbwrP6dB0gwVfixJLY+brIYivwuAmF1H2IkITxGU4/LvvPnmm73IZ1hAo9axe/fu3dBtyP8vX76cnpSUFPPWW291pbyNAXStwNXQBzWggC7oH0dh3ewNw7Y138HeRPKYgNnOCl+3N3B3R9TFBW3H9ayNOruhTQvZAmBtdVtOnz59i9HiAri+JFVFRxhjv+1I2nIHwmLqYZTL+JoBGFGI5riPvei8orB0jffHq9V/nlR/2iLV3dUQKtNrz1K1ls/TE9UKWGU3aLcjGi6PlUbOJxWHFUHfmxUEI051XC8M4DrBOjauV035PU9XmSJ/M1jEElByBxM+Z2diccsAhG0GDx4c/vTp0yfZOcTPnj17PGnSpEjE2LmeLVJTU2fytT/++OPR2rVrxwIc5dAWBcVQbSb5BdfXfkdBIVnxbAcDHSggRPP34qhL7QEDBrz3+PHju1xXUsY0KGEVWOKCot2scl0GYYDkqcx5GzZsuAoWVwL3pTAaNfCqmJiY/dOmTdtepUqVkRjGCgsrymX9jBSCoxiIA1cUw1l+vJgltuzdTI0a5quWaBD17ahS+3dWyQFd1PoAH7V2YFeV9Mte9RtfG9lbxVKZYUsi1PKbX6sf1sxU8zDEVhVDfgHhTDkYnKLCAFpF0BJf/dzf96t/QIGbAqzOqCdb4noknbZ+rjbr/Fti1Rb4BA0wnBcXzzZyZiNVYOvTysvLa/QTOnIS1RkzZswcKtufhQGt02/dunUOxqUOlLm0GKpL4rlaSor3K442KQUr6WrCsx0NQC8oRuNSUMYy4t6l0CZcl3a7du3aIN/Bx8cnCLSokhjlTWlXHjyo6cyZM1PlTRYvXnxWcFMJXEsYjfNLsGdkZPzm7u4+AR1WWHQM/6/JjpzRiYP19YCV1p1YHABi5ehHMlGDgv4vImFQstMXTTLtYqq6xtdG+CkeIUJJRpAMIunJIEAjVUCjlxDOV0HhlDmjgSvAWncK7afmScv+ebj6ktOhnOVxvyp6AufXfS+UiOXgCnUcINLWuhyeXUTwOQfh7GmOXVkrzqFDh743gvO77777nQzFtfnz51/ZvXv3P8Xdjx07dpHKch9EyHTqmwy0ZRu8n6YTtdA+daGEdZFWHe9WFXnrgXc3wm8dXC8HQBaDOKNdKkAJ6+J59fFfP/dNKFP/DRs27JJ1DQkJ+ZzxBT5fDm2W18z62kMTOh0+fPiatLrly5efi8Z3FhaKh/NuNCQdN/Dih+XKlfuCrnVFHkcxdORHx7XcsmXLd7Icz8RhKtlJOEBFAI5GAOAYAd5Z3DEkYSRs5UcBsKMgnBZM8gFGjHehHPXQcFVQP1eA1RXnVdBpDdDB/Yf0VMv5mZmH1XP+ZQtP6e8DrDVQhvN3mT/2Bb3ReS9sVDcofTjA7mHo7BIiMqCpRzncsyksdsiNGzfuybaaM2fObUrn9tpFso1kO1naMzIP9eF1Sud+WCTTf/jhBx7lPibpizq9O3r06BHdu3dn49SN/Y8uXboMjYyMjECaN/qlPeevXbt2/wkTJkSNHz9+6sSJE6d07dr1A1xvjHatiBGpGoDavH79+j2nTJkykekMCyxqJ1CbzlDu8BUrVqTLugYEBKxD27VHm5REW9mbOWqs7YPkDQhk12F1KyNPHoCqyZAhQ5YbeHEm8eI4QS+KoHNc8ELa4lRh6yvL8lQyGspZEPoCsEK1AL4PBHiZuzG37Q1g98RzuSEGX9umLl3dqi6nr1aH331bjYFT6H1vtzpJVOJAYrTFKjUBmGvDAniwk8V5yNFLpvP3GDxMS/iZqTHq1t1v1GP+/8lQtRwK2hSWgYH+/i+wultj1XX+/SFFMVj4+X1C+6pgvvf5FLUWHasjNU5oG1aeeuMDVeC5ZPXt9e2KrecUo1Ul0Nyi9H0kTEk2QFK++OKLi3rka9u27ba4uLhT1mjF7du3f2Jg7N279xudRqBMSEtLO2Ri/UIqVqw4jhTie7N7Xbt27RJhYSzA2Bwc35OBfvz48QNWYv0Z/v7+bIBC33777bnEdZ+Z5SO29DQiIiISylFeWN+XwMuJHrxmwVD5HdCSUoKjcWN7Hjly5KoB6GxlhsG6FMMQyB3Uvm7dur0BwqLoMJ+ff/75kVwLIcCrCb/kvdwofQV4QxgQJB0x7LSBBejC6XKY3xRjsU4DjenEoT/Eu/FzO++Gg8fCXBlKGx7zsdrPafR7Lay/Osv/iaKwUg+G5eBO8x3ZR8XytZ+/VY/oPJn/39+jHtD/8axo4YFqmr7/jkUW2uMhvGp3KJDn5c0qXbxnjNl0/DfffHM/Ojr6LLXrJsqTSLKahEOYrBjsJGY7jc90S57L/tDH8uXLvyfOvd4auCTIevfuPR2+S0CbNm0mZOdg8j3p3mup3Las8q2hg+7ZGlgqjpH/Jb5rAWTfvn1TDaQ5DtalqAAVA8ybAWcSt+0HE18WYPWdPXt2CvG2Y2JCgs1/B+OiHhPwaurgho7uJTo1FEO3D0DbCuIFCxw8O+wFgDZ8qr4BleCw1fBdi9VeTv9tv/oFvHhonw7UkZT29Kh60ruDmg6rzkNWRPwU9T3Ay4DdTdY3E+BfAgBzPYZf2vSCc48frA7R+TpR14mgMcNH9VHzOe3BQXUfitZU8MG27Jjy9SdH1dNypVUMpS0MDw8/klXn3r17N5PXjgwdOnQv5Wc+vpLF19f3W+K+L810Mg08ceLEPZ4JpTyLs7rvo0eP/qhVq9aeS5cuPZTp5PQ9Jyucyb8y/dy5czwicNtFG6kO5X1Gxu4R0ZYnxsmqUqVK7SJl/IfxfkxB2UBWqlTpI1CHqsBpfiN4LYAkLdhqANRwkHZHEX8tExwcHGpFm9nK9AJ/GkpcZ6fgWu2FV+vNDZgFePWzCoMHNpZeP1mnK0wN2ELe3qXOkLU7xUMy7sHgHTm4u1rFedfMVNypH4EDM4gnEhe1DOuJ09UBOp9B97nL53GTLVZ6NMDLYJ+wYor6jq9FjVAXmGdGh6gzfL47TrEjO4mt8wc91ApOozo8BHhWCfBGCD4+lhy6Xzn9owEW3t4FSsejhy+PEnxtzzJ1hs4/ZctLsiwxMTHDligDWc9MomSpXAZA3iyvp6en/waawbQn3lj+/Pnzj4lrniOjdYKu7xk1atRlQ2TomZOTE1M8ph03k5KSXrLWrVu33kUU4qBMO3v2LJfhUZkxcHP16tUvlSHacJrSj82aNeu+TO/Wrdt3lB6LfmiTleW1Bbw6YlCLONV4s8a7fPny79u3b88g/nRw+vTppw2TEZ5iFs57xIgRu3II3l7ZxXhxDw5lhQQCvEkzLPyQKUIQGiK8UW21+PER9Yyvpy1Qly38NNnSuJPxzv0wBH6Ynqgy+HqPdhagby7trLZoh6xBDZVAaZ+TNb/A58sjFY8wbJEXE2e9z2lvuKhpAC5TnbEzQ9VGTj+9wQLQQeDWrPBBGtidW6p4Op9KEgUQx/fo0eMQ04XsAMyRnPbt26dwGZL1higEh/o47LmAJM5YFqBlLr2RncHk5OS78vrmzZufR0VFPWGZOnXqk4SEhKfyOjlkNzZs2HDfUOYZ5X3M+Vm+/PLLpyYO6AkC70vWumfPnvvZsMCPaYoR+J84r1Xa4OHhEYuCxcRkgx87ZmZrHqwd48aNW4uhX8/RdyAivs8G8BYCBWkkLS/9j4Q11U6bDyy7J8Irwwf3UCuF5R2l4574P2POGHVU34/B2LCmZTIjHKDtBiUI5ogB5+n1rtoJbpm0eOIL7rv1c3WtbhW1Rd/DtaQFMBz2m8fOGqcHvWexgiOhOKPdXNT0J0fUU77WvIFlmGXqEhwx5IWy/UijADtqJOPwjmy5OeLD9UvhYXbAgAFn4uPjf6LDlIsePHjwBqxvgkwnHnwPwGWFiDUZOdkqL0UoMsFIO7I7ZsyY8Ss9O0cxaQIvW/H0Tz/99I5M79Wr1y5Qru5wrMsgKmNvk8M2cuTINPDI8rDAvjzTxjNutlbu9OnTd8ELK+LhFodt3bp1P2ThsJmBt6ch2sBg8IfT1RoTEc1wPuSDnjQsUt61s9QeWNNeiEow4KM8PdQmfT/msRiixiCfFxTiA81l+3VSKTr85FJCJT06pJ6T/EFD/U1QjpMY5hmQM86nqB85fUhPC6BDYGXZoR2/ef4Lpwy0hYE65ViSushp00daLN8ETTWaNWs2kxc4YaIoHg7aWljHHdWrVz9u5JIAIoN3hUw7deoU98VnHBdnhTApswD14RFoHoM9J0D8+OOPf2NqkZMykydPvkrP2j937txbMt3f3387RswOwF4JEfHKPlTGAINlY1D4M3B5jYOtFeOlke7u7hGYKXECeDnOGZiRkfG7lVCZGXg5IN5NgDcIw20bALsO4oz1YX0H6fgswDsM+bshijDl6lb1C19/SADk35VR6qgBvMxHA/VQjg7/BMP5fLrveWm5yeouxzUG3ifMW/nauEGWKEAwrD5b9dAmddQXfI2pCysD0w9xPgWdFtKiRYso2Z59+vTZzJQEws9bzzy8Y8eOF02A+E+8FuCdBwX7zKTMVCgajwafkOF5yRrSkK8pQCZ+Lf+jo6MfBgUFsRN6hSzvU0OZ56JM5rRp0zj/A+a4zKlpJGGHOi0mJua6LMdRCPSHF6IyzmbgtTpJwR4nhugxrq6uy2y1uBwGWbNmzV6yCkMBXBfEbS2TFLycMotJCiN4XTEJ4CPA2xtOTj1YdL1MsBomVAJouF4qwDsCjhxTgSCmEnzt+Br1j5qV1F62onze09NiOd8XtCFIPPMjPcTzcEY0I15f+2qOhb9OR2NbuO3qGS9CbKAtwXj+e1CeieeS1S2+Hh6ojiyJeAH01HmWGTkdnQg2zjoxn61fv34SLORCOGXbiGteN+aD5V1mQhsWA8ALTcA7DgrGijaGOO9LsWIC3iM4axxZuEWO2E9jx479NTw8nO/LjteJuLi4+4YyPKrdRpmbVOZHzk+08UcGLRRwQ2xsbIbB8qahPp0RuSopfC/bpod59oa0Ywd5opnWwMr8t1+/filhYWFzQkJCRoF/yo2XeoEOW8dAXg+cxfSwnQl4LVO1AkjdkF+vFtNz7+5Qlr5Dfckh+V/wcARhAIufl5oFa/msThW1lWOys0LVMU67tUPdAfgGIgw2WjxT0xRfXP+IhvjNidHqYNN6lqF4JIDPMlIriADve6A0DOLRYf1VKl/fu0zdvoPJD3YkoQD87KE8cWDmkPEGgKVLl57kqXuz6WFymq+Cty42hr849IaIRKIJeEdj5OFJnaCBAwcmGfOQI/5b48aNf/Lz87vLkQSdHhkZeZnK7CSak25WpnLlyjepzB1ZhrB2AkoWv3DhwvPGrWODBw9eWbNmzYGYCHIFHhyyXJjDIRd9kwcPHvy3fKAZcDt06JCITqklZo2KiEXFhbWzxyDPYmGO2bJIF1hYbwGkjrDG5eAE6kUgOjLhN9xPLcJs11FwZLaaI27vVD9x+vyxlijEIkQHFmlLuG62+panUJvVVzPIKiZx2u1dFqsRAP7VGjN+vrCiQbjWA9d55m3wp2HqK1j3C6P6Wix6Tyh1Z0xbR/OEhn6nQ6ssceRIMaXNEY8xHGbMCYdkgMI68+Kcz+7du2c6WrZq1Wq3CXiHgy55QVF5Zu26Lc/FGhgOE65OSEi4aksZcjq/Rz1jrM0IkqJuxCSVO/o4b46WRNoAXLlU0sGwLE4D1+LsGaMU7CQalkQqAd6CmCLmKdx2ArztkFZGLK4uhHOeqeqqJwREmbCNn6k0/n8pVV0Dt5wEbz6SeaiOAnRppZbqYZ+Fp5phkVpAkd6E5W+NurTCeSP89wv2f8FrxfN7gKO3BzAj5n6oDuvroX0tjloYLHR7WGm2Op8QfThrS3/cuXPncfv27ZOxWIlj7pM2btx43Cxvy5Yt93F+fX7z5s07GJ084fwygAe5ubnNJh77Y3a+TaNGjZYitMfPXrB169ZrWZUhpXrYpEmTzxHhmUQOabzZrhu6z2a0sekkhU2L0c2A6+XltQ4aWh2W1sGwQt5ZL0Y3c/asLEaXi8IdQQe44m8f+VKtYgE1qCrWyOYTnLo6+PD7q6aq5OS5ageDlukATwIQr9zu722ZIBgq+B0P06ETBqsEGub3MB0Y1E0lcoyYZ+j6d7YAvROsvd6dUQHOZzWxa6MygM0dP2DlVJWS8pn6evsXKhUWWYPdYtW83nkxJY3JjSkAT1sMk01gyblukQ0aNEhYsmTJaZ4h41k1uYpv//79t4hiHECYbiIc1AGIrIyLior6+tChQze4T3mkGzZsGFOZhHbt2m2h9Ovp6emXaUifjb7wELtWvDESRJGzuIWfw7F8rSh8v8mTJ+/mDbqgTYNQX6Y+M8jp2sIgNpYhH+cAlZmB0VDXM5wNIQcJOA878VT2KO/EQZtkCd5stwFJKsGai0o2Ewu9C8O0l0JHsvMUyFuHbt++/dTGbUByR0F+0AI3TKN6QOoirZjYjqMXsLshOuENkASAh/bDaqo+GCk6wRK2BA14D40fgvf6EJZwCIb8ZmJNcHE828mwZ64UQNwI1KYPnu2H83aoF9dlPCnVCQZv7DiLUxkm1v7qXRD1Ubf3cT0SK+rmCJmNSMh4gMEfz2gL8PfGO0UgX7SYAIkUDqI/Ro2aYtuTfP4YKNhsPHcWyoehjTujPdviPQaiDbMq0wWWXrfVSNQzCr8jhEJVQJvne60NmGvWrHmAEEckXlqvKHoLvwyMQBoWFhidMxs3YCpBOwrC03wD4KmK/3qFfV6xraQA7ueul+QBMJ5il0crWO76WIdRFZZGfwXIB0D2FTz2HXSq3v5j3KGcXyxkL4nRqyEsrTc6pyM6mOnHcDcXNVPP8vF/dHZLWHO9SLw8/Agdv9bKOAiKHwjL1QdOrCcsdm28W13UXc889jUosb9Q5OZil4Xek2jt+QOFUuqy9TAKVcPo0wLva61MC7HvsB7q2QH16YN8nZFeQ1BEh9fe+s7Wd9OmTTd5Kphn5tgzDQoKWsa/c+fOPbxv376fXmPru3E/WSGAsjTE2bArVy7mkRshK4NG1IBUB1h1eK0UOkkvQK8uFly/BStYB2B0Mdl4adzbpeuqlzjWBpjadG+rAu/vUdenBatFHMb7MU39LNYxhGEmqQHi2kXFAvnSOdiAWRWAKy12PbiLGHgjOLSN8V+/Y23xjsXENh+z5zcRG18bIr2iWORfAv8r2lCmrNgVbqxnQyttb/93+uiIvdhpIPdO5TX5foJxC7qTYVdzCbG1pbDYU6WBUkI0ptlWl+x23UoFchKWq/mCCS9WrklhAL/hahkiB8BKVzVsbM33Clvfi4hvWBRC2RJi0X1Zw/uVMXnHvIKKGZ9fVnxuwEXsoCgk9r4VsqFMcbEH0KyeLugLY9vbvA3+3/25JzvDxzekmH2Uwvjxj/xWNhbmEx1kb9jDVkA0aEHxDQRbvndgBLDeC8cWx4ccv8iv5qidHPudGWpx4sLh4HTEUOtq2GWc04+O5M/Be0kpYPKthOyeb/zYiYNhZ7AtZfKa7CEskEW9cvStif+UD+3l5NNFdla+wmKfxRdZrH1S6VW+NGPcvu6K4a8N+O4QTFoMA//sgOG7AqxRfisjyqt+7slaG2TXJsqG59v6XFvK2NJXr/Rlk7/rJ07tXhH4r/uNLxnqc9JbfOCQdRA7MHTcuAJGI7013i6Hdcuujn/FRwn/6ue+rpF6pQ7J/bi07dZXR0D05soqcI7qiA2LLmJLvIP6z/uW2P+7jsn9rL/tAJYOpLP4LoLx80u5wLXx+B+cTUKEm3GYQAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMi0wNS0wMlQxOTo0Njo1MSswMTowMBx1tHgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTItMDUtMDJUMTk6NDY6NTErMDE6MDBtKAzEAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAABJRU5ErkJggg==') no-repeat; + text-indent: -999999px; + position: absolute; + z-index:2; +} +.ie6 #site-logo { + background: url('/cobrands/fixmystreet/images/ie_logo.gif') 0 -5px no-repeat; +} +.ie7 #site-logo { + background: url('/cobrands/fixmystreet/images/sprite.png') -3px -3px no-repeat; +} + +// this is a skip to nav for mobile users only +#nav-link { + width: 50px; + height: 48px; + background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAwCAMAAABkKdmIAAAACW9GRnMAAAAFAAADlACdjNY6AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAABEVBMVEUAAAAiIiIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsJAAAAABPQAAAAAAlHgBnVAAAAACSdwAAAAAAAAAaFQAAAAAAAAAAAAAAAACRdgCqigAAAAAAAABHOgDCnwAAAACriwCAaAApIQDOqABIOwCgggBqVwB8ZQDVrgCwkADjuQCafgDftgDetQCqigDrwADHogDGoQDFoAD1yADzxgDyxQDwxAD/0AD///+ZbHkYAAAAWXRSTlMAAAECAwQFBgkLDA0OEBESExQVFxgeHyEkJSkqMTI2Oj0/Q0RHSEpOT1FSVVtmZmxsdX6Kj5ebnp+goaenqKmru7y9vsTY3uPk5OTl5+zs7e7x9PX3+Pr7/fI8qpUAAAABYktHRFoDu6WiAAABMklEQVRIx+3T2VLCMBSA4ZjU1hhpUKgWlaq0VSuutYg7IJuIogKKvv+LSM2AelNOuHCGGf77b7KcBKGwT2AzYej/CIYSPCBEhRKVCILVBJQkVCwIS0NJmglCYhkoycSIINyBEocPiAsl7ljkeypTMhHko9tpD+t0QavUSjcX+bDzy9vSPYj0zg523LDtvaNCD3aWh11ziXMeT64fP0OPX1xbmCVEXdyqwm/sNEWJMr96LXHJb4fLczR1IjWXx83kyv6r3CiLG05VdvpXd9IP5n36XyaStGCiNSS6XYaRsq0LgpnlNyGi6VsMC6IZXlAfLeqBZ2iCIELNbFBpvLQjempUgqxJxb76KdT0/Fw+spzvmVRB6McYlu24ETm2ZfwW/b1pTOeR6Uwj6E8YkxFhjMbuC8zPYpEN6mT7AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDEyLTA1LTAyVDE5OjQ2OjUxKzAxOjAwHHW0eAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMi0wNS0wMlQxOTo0Njo1MSswMTowMG0oDMQAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAAElFTkSuQmCC') no-repeat; + display: block; + text-indent: -999999px; + position: absolute; + right:2em; + top:-2px; + &:hover { + top:2px; + } +} + + +#main-nav{ + ul{ + @include list-reset-soft; + li{ + a, span { + display: block; + padding: 0.5em 1em; + background:#f6f6f6; + color:#333; + font-size: 1.25em; + border-bottom: 0.25em solid #333; + } + a:hover, span.hover { + background: #333; + color:#fff; + text-decoration: none; + } + span { + background-color: #ccc; + } + } + &#mysoc-menu{ + li { + a { + background:$primary; + &#mysoc-logo { + background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIkAAAAyCAMAAABf9whNAAAACW9GRnMAAADwAAAAJgAMZizzAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAAANlBMVEUAAAAiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiL///90WH2CAAAAEHRSTlMADx8vP09fb3+Pn6+/z9/v+t8hjgAAAAFiS0dEEeK1PboAAAGqSURBVFjD7ZbNjtwgEAY/oIE2YKj3f9ocPDOZ3eN6FCUKdWsJQ+H+saXNZrPZbDabzf/GovwdIhH8LUzHn/PqI32Jcw1v0fjidQf30EZPqmMURXeT5F5kbYwqSQbeWpAU6xg961pT+mgm+WR4Ke6SzG9JwQRWB6iaTClCzQBLknT0AibZAnCBSx2ALACGQ5JOznsmq1TA82LKIalC6Jwh5seaMGdUWKxiJQpclWVqLNlJsxThUIB6z8Qft3FQgEODrs4qUuj9qoljpAr2euKkmxVIjzrpTBUI90xMGgzJQGrMAEUGrGKQn6c7/HbngT1MMqRO1wdNDA6WpNgW5Ld38s1kuLt7fPbO5Lg7Z76ZaLJoV3WAa6wsxbmiyrMMruyMVxc3SaqvAv+YSQWS1Fs9oAi8jQKmsGB4zwJXgdO9VWnAkaUAHJ81CTAkLYAm5ZbB/QhSmm9d7Ff7Splr5jaI90zMgpQsScHsGmRFUsheH6O1jecR5m5BZlFSzF5NkpJ7lMJ85etDlPWjHdMJ6aMiFdYPdgzw6Q90Yvwo2+fM+3dps9lsNpvNP8gvi7UYry9B6TcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTItMDUtMDJUMTk6NDY6NTErMDE6MDAcdbR4AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEyLTA1LTAyVDE5OjQ2OjUxKzAxOjAwbSgMxAAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAASUVORK5CYII='); + background-repeat:no-repeat; + text-indent:-999999px; + } + } + } + } + } +} +.ie6 #main-nav ul#mysoc-menu li a#mysoc-logo { + background: url('/cobrands/fixmystreet/images/ie_mysoc_logo.gif') center no-repeat; +} +.ie7 #main-nav ul#mysoc-menu li a#mysoc-logo { + background: url('/cobrands/fixmystreet/images/sprite.png') -240px -38px no-repeat; +} + +//defines where the table caption is (login stuff on mob, nav menu on desktop) +.wrapper { + width:100%; + display:table; + caption-side:bottom; +} +// this is the user's logged in details or the login link etc +#user-meta { + p { + position: relative; + background:$primary; + padding:1em 6em 1em 1em; + a { + position: absolute; + right:1em; + @include inline-block; + text-transform:uppercase; + font-size:0.75em; + background:#333; + padding:0.25em 0.75em; + color:#fff; + @include border-radius(0.25em); + } + } +} + + +// #key-tools is the list that's pulled out an stick to the bottom of the page of desktop, below is mostly just aesthetic +.shadow-wrap { + @extend .full-width; + ul#key-tools{ + @include list-reset-soft; + margin-bottom: 1em; + display: table; + width:100%; + li{ + display: table-cell; + vertical-align: bottom; + text-align: center; + border-right:0.25em solid #fff; + &:last-child { + border-right:none; + } + a { + display: block; + background-color: #f5f5f5; + background-repeat: no-repeat; + color:#333; + padding:4em 2em 1em 2em; + text-transform:uppercase; + font: { + size:0.6875em; + family: Helmet, Freesans, sans-serif; + } + &:hover, &.hover, &.active { + text-decoration:none; + background-color:#333; + color:#fff; + } + &.abuse { + background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-position:center -2424px; + } + &.feed { + background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-position:center -2563px; + } + &.chevron { + background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-position:center -2716px; + } + &.hover, &.active { + background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-position:center -2064px; + } + } + } + } +} + +//because display:table doesn't work we float +.ie6, .ie7 { + .shadow-wrap { + ul#key-tools{ + background:#f5f5f5; + li{ + float:left; + a { + padding-left:1.5em; + padding-right:3em; + } + } + } + } +} +.ie6 .shadow-wrap ul#key-tools li a { + &.abuse { + background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite.gif'); + background-position: right 0px; + } + &.feed { + background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite.gif'); + background-position: right -58px; + } + &.chevron { + background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite.gif'); + background-position: right -116px; + } + &:hover { + background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite_dark.gif'); + } +} + + +//footer blocks +#footer-mobileapps { + @extend .full-width; + padding:1em; + h4 { + margin:0; + } + ul { + @include list-reset-soft; + li { + border-bottom:1px solid #AFAFAF; + &:last-child { + border-bottom:none; + } + a { + display:block; + padding:0.5em 0; + } + } + } +} + +#footer-help { + ul { + @include list-reset-soft; + li { + border-bottom:1px solid #AFAFAF; + &:last-child { + border-bottom:none; + } + h4 { + margin:0.75em 0 0.25em 0; + } + p { + font-size:0.75em; + } + } + } +} + + + +/*BUTTONS*/ + +// Default style set for buttons, inputs and .btn class. Red and green class available. + +button, input[type=submit],.btn{ + @include button-reset; +} + +.green-btn, +button.green-btn, +input.green-btn{ + @include button-reset(#9FDE23, #7FB900, #5B9700, #fff, #9FDE23, #7FB900, #5B9700, #fff); +} + +.red-btn, +button.red-btn, +input.red-btn{ + @include button-reset(#FF0038, #BF002A, #80001C, #fff, #FF0038, #BF002A, #80001C, #fff); +} + +.final-submit, +input.final-submit { + margin:1em 0.5em; + float:right; +} + +.button-right, +.button-left, +a.button-right, +a.button-left { + @include inline-block; + cursor:pointer; + font-size: 1em; + line-height: 1; + margin:0; + border:1px solid #999; + color:#333; + background: #eee; + @include border-radius(4px); + &:hover{ + color:#fff; + background:#777; + text-decoration: none; + border:1px solid #666; + } +} +.button-right, +a.button-right, +:hover.button-right, +a:hover.button-right { + padding:1em 3em 1em 1em; + background-image: url('/cobrands/fixmystreet/images/sprite.png'); + background-repeat:no-repeat; + background-position:right -686px; +} + +.button-left, +a.button-left, +:hover.button-left, +a:hover.button-left { + padding:1em 1em 1em 3em; + background-image: url('/cobrands/fixmystreet/images/sprite.png'); + background-repeat:no-repeat; + background-position:-18px -802px; +} + +.big-green-banner { + position: relative; + z-index:1000; + top:-1.75em; + background: $contrast1; + color: #fff; + padding:1em; + text: { + transform:uppercase; + align:center; + } + font-size:0.875em; + &:before { + content: ""; + left:-0.5em; + top:0; + position: absolute; + width: 0; + height: 0; + border-left: 0.5em solid transparent; + border-bottom: 0.5em solid #4B8304; + } +} + +.banner { + position: relative; + z-index:1100; + p { + position: absolute; + top:-1.95em; + right:0; + @include inline-block; + font-size:0.6875em;//11px + line-height:1em; + padding:0.5em 1em; + margin:0; + color:#1a1a1a; + background: #ccc; + text: { + transform:uppercase; + align:center; + } + &:before { + content: ""; + left:-0.5em; + top:0; + position: absolute; + width: 0; + height: 0; + border-left: 0.5em solid transparent; + border-bottom: 0.5em solid #888; + } + &#fixed { + color:#fff; + background: $contrast1; + &:before { + border-bottom: 0.5em solid #4B8304; + } + } + } +} + +/*OTHER*/ + +.plain-list { + @include list-reset-soft; + li { + margin-bottom:1em; + } +} + +.issue-list{ + margin: 0 0 1em 0; + padding: 0; + border-bottom: 0.25em solid $primary; + li{ + list-style: none; + background: #f6f6f6; + margin: 0.25em 0 0 0; + padding: 0.5em 1em; + display:block; + .update-wrap { + display:table; + width:100%; + .update-text, + .update-img { + display:table-cell; + vertical-align:top; + p { + margin-bottom: 0.5em; + } + } + .update-img { + text-align:right; + img { + margin:-0.5em -1em 0 0.5em; + height:auto; + } + } + } + } +} +//display:table fixes +.ie7, .ie7 { + .issue-list li .update-wrap { + .update-text { + float:left; + width:19em; + } + .update-img { + float:right; + } + } +} + +.issue-list-a { + margin: 0 0 1em 0; + padding: 0; + border-bottom: 0.25em solid $primary; + li { + list-style: none; + margin:0; + padding:0; + a { + margin: 0.25em 0 0 0; + display:table; + background: #f6f6f6; + color:#222222; + width:100%; + &:hover { + text-decoration:none; + color:#222222; + background:#e6e6e6; + } + .text, + .img { + display:table-cell; + vertical-align:top; + } + .img { + text-align:right; + img { + height:auto; + } + } + .text { + padding:0.25em 1em; + h4 { + margin:0; + } + small { + color:#666; + } + } + } + >p { + margin: 0.25em 0 0 0; + padding: 0.5em 1em; + background: #f6f6f6; + } + } +} +.list-a { + @extend .issue-list-a; + a { + padding:0.5em 1em; + font-weight:bold; + } +} +//display:table fixes +.ie6, .ie7 { + .issue-list-a { + overflow:hidden; + li a { + clear:both; + width:auto; + display:block; + overflow:hidden; + .text { + float:left; + width:18em; + } + .img { + width:6.25em; + float:right; + } + } + } +} +.ie6 .issue-list-a li a { + height:5.5em; + .img img { + height:60px; + } +} + +// fancybox gallery images have a magnifying glass in the corner +.update-img { + a { + @include inline-block; + position:relative; + span { + position:absolute; + top:0; + right:0; + display:block; + width:20px; + height:20px; + opacity: 0.5; + background:#fff url(images/sprite.png) -16px -1098px no-repeat; + //hide text - http://nicolasgallagher.com/another-css-image-replacement-technique/ + font: 0/0 a; + color: transparent; + } + &:hover span { + opacity: 1; + } + } +} +//bit of a hack - as we can't use em's, push the span out to the right +//by how much it would be if the user did not resize the text +.issue-list li .update-wrap .update-img a span { + right:-16px; + top:-8px; +} + +.problem-header { + margin-bottom:1em; +} +.problem-header .update-img { + float: right; + margin-left: 0.5em; + margin-bottom: 0.5em; +} + +// map stuff +#map_box{ + @extend .full-width; + background: #333; + height: 29em; + margin-bottom: 1em; + overflow: hidden; + position: relative; + #map { + width:100%; + height:100%; + } +} + +// OpenLayers fix for navigation being top right +// Left and right so that zoom can be left, pan right. +#fms_pan_zoom { + right: 0.5em !important; + top: 0.5em !important; + left: 0.5em !important; +} +// The left and right of the above causes the navigation to move off-screen left in IE6. +// XXX Need to check IE7 +.ie6 #fms_pan_zoom { + left: auto !important; +} + +// Openlayers map controls (overrides) +#fms_pan_zoom_panup, +#fms_pan_zoom_pandown, +#fms_pan_zoom_panleft, +#fms_pan_zoom_panright, +#fms_pan_zoom_zoomin, +#fms_pan_zoom_zoomout { + width:36px !important; + height:36px !important; + text-indent:-999999px; + opacity:0.85; + background:url('/cobrands/fixmystreet/images/sprite.png') no-repeat; + &:hover { + opacity:1; + } + filter: none !important; // Override OpenLayers PNG handling of the navigation +} + +#fms_pan_zoom_zoomworld { + display:none !important; + visibility:none !important; +} + +#fms_pan_zoom_panup { + background-position:-42px -222px; + right:30px !important; + left: auto !important; + top:0 !important; +} +#fms_pan_zoom_pandown { + background-position:-42px -282px; + right:30px !important; + left: auto !important; + top:72px !important; +} +#fms_pan_zoom_panleft { + background-position:-12px -252px; + width:48px !important; + right:48px !important; + left: auto !important; + top:36px !important; +} +#fms_pan_zoom_panright { + background-position:-60px -252px; + width:48px !important; + right:0 !important; + left: auto !important; + top:36px !important; +} +#fms_pan_zoom_zoomin { + background-position:-152px -223px; + height:44px !important; + left:0 !important; + top:0 !important; +} +#fms_pan_zoom_zoomout { + background-position:-152px -259px; + height:44px !important; + left:0 !important; + top:44px !important; +} + +//hide pins, show old reports etc +#sub_map_links { + position: absolute; + left: 0; + right:0; + bottom: 0; + z-index: 1100; + background:#333; + background:rgba(0, 0, 0, 0.7); + margin:0; + a { + @include inline-block; + font-size:0.6875em; + color:#fff; + padding:0.6em 3em 0.5em 1em; + background-repeat:no-repeat; + &#hide_pins_link { + background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-position: right -3976px; + } + &#all_pins_link { + background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-position: right -4022px; + } + &#map_permalink { + background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-position: right -4070px; + } + &.feed { + background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-position: right -3936px; + } + &:hover { + background-color:#000; + text-decoration:none; + } + } +} + +.ie6 #sub_map_links a { + &#hide_pins_link { + background-image:url('/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif'); + background-position: right 1px; + } + &#all_pins_link { + background-image:url('/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif'); + background-position: right -45px; + } + &#map_permalink { + background-image:url('/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif'); + background-position: right -93px; + } +} + +#mob_sub_map_links { + position: absolute; + z-index:1100; + bottom:0; + display:table; + margin:0; + width:100%; + background:rgba(0, 0, 0, 0.7); + a { + color:#fff; + width:50%; + padding:0.5em 0; + font-size:1em; + display:table-cell; + text-align:center; + &:hover { + background:#000; + text-decoration:none; + } + } + &.map_complete { + background:none; + display:block; + border-bottom:4px solid #fff; + a#try_again { + display:block; + margin:0 auto 6em auto; + background:rgba(0, 0, 0, 0.8); + @include border-radius(0.5em); + } + a#mob_ok { + position:absolute; + right:1em; + bottom:0; + height:20px; + padding-top:30px; + display:block; + width:4em; + background:#fff url('/cobrands/fixmystreet/images/sprite.png') 12px -4140px no-repeat; + color:#000; + } + } +} + +.mobile-map-banner { + margin:0; + position: absolute; + top:0; + left:0; + right:0; + font-size:0.75em; + background:rgba(0, 0, 0, 0.7); + padding:0.75em 30px; + a { + @include button-reset(#333, #1a1a1a, #1a1a1a, #fff, #333, #1a1a1a, #1a1a1a, #fff); + font: { + weight:normal; + size:0.875em; + } + line-height:1; + padding:0.5em 0.75em; + position:absolute; + left:0.3em; + top:0.3em; + } +} + +.olControlAttribution { + bottom: 3.25em !important; + right: 0.25em !important; + left: 0.25em !important; + color: #222222; + font-size:0.75em !important; +} +.olControlAttribution img { + vertical-align: bottom; +} +.olControlPermalink { + bottom: 3px !important; + right: 3px; +} + +/* Drag is only present in noscript form. XXX Copy from core. */ +#drag { + input, img { + position: absolute; + border: none; + max-width: none; + } + input { + cursor: crosshair; + background-color: #cccccc; + } + img { + cursor: move; + } + img.pin { + z-index: 100; + background-color: inherit; + } + a img.pin { + cursor: pointer; + cursor: hand; + } +} + +// only on mobile, this is a sidebar on desk (#report-a-problem-sidebar) +a.rap-notes-trigger, +a:hover.rap-notes-trigger { + display:block; + width:90%; + padding-left:5%; + padding-right:5%; +} +.rap-notes { + margin:1em 0; +} + +//report a problem tabs +#problems-nav { + padding:0 1em; + overflow:hidden; + border-bottom:0.25em solid #333; + ul { + @include list-reset-soft; + display:table; + width:100%; + li { + display:table-cell; + border-right:0.25em solid #fff; + &:last-child { + border-right:none; + } + a { + display:block; + background:#e2e2e2; + color:#333; + padding:1em; + text: { + transform:uppercase; + align:center; + } + &:hover { + text-decoration:none; + background:#e6e6e6; + } + &.active { + background:#333; + color:#fff; + } + } + } + } +} + +//display:table fixes +.ie6, .ie7 { + #problems-nav { + clear:both; + margin:0; + padding:0; + ul li { + float:left; + } + } +} + + +table.nicetable { + width:100%; + margin-bottom:2em; + thead { + border-bottom:0.25em solid #ccc; + th { + font-size:0.75em; + } + } + tr { + &.a { + background:#f6f6f6; + } + &:nth-child(even) { + background:#f6f6f6; + } + &.gone { + color: #666666; + background-color: #cccccc; + } + &:hover { + background:#FFF5CC; + cursor:pointer; + } + td { + padding:0.25em; + a { + &:hover { + text-decoration:none; + } + } + } + } + .title { + text-align:left; + } + .data { + width:12%; + } +} + +.promo { + @extend .full-width; + background:$primary; + padding:1em; + margin-bottom:1em; + overflow:hidden; + position: relative; + .close-promo { + position:absolute; + top:0.5em; + right:0.5em; + display:block; + width:16px; + height:16px; + text-indent:-999999px; + background:url(images/sprite.png) -341px -263px no-repeat; + @include border-radius(4px); + &:hover { + background:#222 url(images/sprite.png) -341px -223px no-repeat; + } + } +} + +.alert { + @extend .full-width; + background:#ff0000; + padding:1em; + margin-bottom:1em; + color:#fff; + a, a:hover { + color:$primary; + } +} + +.pagination { + text-align:center; + padding:0.5em 1em; + background:#eee; + position:relative; + .prev { + position:absolute; + left:0.5em; + } + .next { + position:absolute; + right:0.5em; + } + a { + @include inline-block; + background:$primary; + padding-left:0.5em; + padding-right:0.5em; + color:#1a1a1a; + &:hover { + color:#1a1a1a; + text-decoration:none; + background:$primary/1.1; + } + } +} + +// this is a bit of a hack to get some differentation between desk and mobile +.desk-only { + display:none !important; +} + +// hide anything with this class if js is working +.js .hidden-js { + display: none; + visibility: hidden; +} + +// hide anything with this class if js is NOT working +.no-js .hidden-nojs { + display: none !important; + visibility: hidden; +} + + +/* Front page */ +#front-main { + text-align:center; + h2 { + font: { + style:italic; + family: Helmet, Freesans, sans-serif; + size:1.1875em; + } + color:#4d4d4d; + } + #postcodeForm { + @extend .full-width; + padding:1em; + color: $primary_text; + background: $primary; + font-family: Helmet, Freesans, sans-serif; + label { + margin:0; + } + div { + display:table; + width:100%; + background:#fff; + border:1px solid $primary_b; + input#pc { + display:table-cell; + margin:0; + padding:0.25em 2%; + width:82%; + border:none; + background:none; + line-height:1.5em; + } + input#submit { + display:table-cell; + border:none; + padding:0; + margin:0; + width:14%; + height:35px; + background:#000; + color:#fff; + text-transform:uppercase; + @include border-radius(0); + &:hover { + background:#333; + } + } + } + } + a#geolocate_link { + @include inline-block; + vertical-align:top; + background:#1a1a1a; + color:#C8C8C8; + padding:0.5em; + font: { + family: Helmet, Freesans, sans-serif; + size:0.8125em; + } + @include border-radius(0 0 0.25em 0.25em); + &:hover { + text-decoration:none; + background:#2a2a2a; + } + } +} + +#front-howto { + #front_stats { + display:table; + width:100%; + color: $primary_text; + background: $primary; + font-family: Helmet, Freesans, sans-serif; + div { + display:table-cell; + text-align:center; + padding:1em; + line-height:1.25em; + font: { + size:0.8125em; + weight:bold; + } + big { + display:block; + margin-bottom:0.5em; + font-size:1.5385em; + } + } + } +} + +#front-recently { + .issue-list-a { + border-bottom:none; + margin-bottom:0; + } +} + +#alerts { + ul { + margin-bottom: 1em; + } + li { + padding: 0em; + margin-bottom: 0.5em; + } + .a { + background: #f6f6f6; + } + img[width="16"] { + float: right; + } +} + diff --git a/web/cobrands/fixmystreet/_colours.scss b/web/cobrands/fixmystreet/_colours.scss index 8179f470d..2463cdeeb 100644 --- a/web/cobrands/fixmystreet/_colours.scss +++ b/web/cobrands/fixmystreet/_colours.scss @@ -1,11 +1,8 @@ /* COLOURS */ -$colour_dark: #4e1602; -$colour: #c23704; -$colour_alt: #ffeeaa; - - $primary: #FFD000; +$primary_b: #F3B11E; +$primary_text: #222; $contrast1: #00BD08; -$contrast2: #AA8D11;
\ No newline at end of file +$contrast2: #AA8D11; diff --git a/web/cobrands/fixmystreet/_h5bp.scss b/web/cobrands/fixmystreet/_h5bp.scss index 30ebcbfe1..f4078cca6 100644 --- a/web/cobrands/fixmystreet/_h5bp.scss +++ b/web/cobrands/fixmystreet/_h5bp.scss @@ -256,12 +256,11 @@ td { vertical-align: top; } Inlined to avoid required HTTP connection: h5bp.com/r ========================================================================== */ +/* mySociety removal: bits of * and :after */ @media print { - * { background: transparent !important; color: black !important; box-shadow:none !important; text-shadow: none !important; filter:none !important; -ms-filter: none !important; } /* Black prints faster: h5bp.com/s */ + * { box-shadow:none !important; text-shadow: none !important; filter:none !important; -ms-filter: none !important; } /* Black prints faster: h5bp.com/s */ a, a:visited { text-decoration: underline; } - a[href]:after { content: " (" attr(href) ")"; } abbr[title]:after { content: " (" attr(title) ")"; } - .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; } /* Don't show links for images, or javascript/internal links */ pre, blockquote { border: 1px solid #999; page-break-inside: avoid; } thead { display: table-header-group; } /* h5bp.com/t */ tr, img { page-break-inside: avoid; } diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss new file mode 100644 index 000000000..6a32ea010 --- /dev/null +++ b/web/cobrands/fixmystreet/_layout.scss @@ -0,0 +1,1060 @@ +@import "compass"; +@import "_mixins"; + +//hacks for desk/mob only stuff +.desk-only { + display:block !important; +} +.mob-only { + display:none !important; +} + +body { + background: #1A1A1A url(/cobrands/fixmystreet/images/tile.jpg) 0 0 repeat; +} + +h1 { + margin-top: 0; +} + +// Page wrapper and header bits follow + +.container{ + margin: 0 auto; + padding: 0em; + width: 60em; + position: relative; + z-index:1; +} + +//z-index stack order gets reset to 0 in ie6/7 if you position anything, +//so to fix things we give it a high value (don't ask me why) +//see: http://brenelz.com/blog/squish-the-internet-explorer-z-index-bug/ +//this affects #site-logo +.ie6, .ie7 { + .container { + z-index:100; + } +} + +.wrapper{ + display: table; + caption-side: top; + width: 100%; + .table-cell { + display:table-cell; + } +} + +//pad the top of the wrapper to allow space for the menu to fit in +//when its positioned absolute below +.ie6, .ie7 { + .wrapper { + padding-top:4em; + } +} + +.nav-wrapper{ + display: table-caption; + .nav-wrapper-2{ + width: 100%; + min-height: 4em; + position: absolute; + border-top:4px solid #1a1a1a; + @include border-image(url(/cobrands/fixmystreet/images/tile-y-border.jpg) 4 0 0 0); + border-left:0; + border-right:0; + z-index:2; + } +} + +//position absolute the menu as ie doesn't like display:table +.ie6, .ie7 { + .nav-wrapper { + position: absolute; + top:0; + left:0; + width:100%; + .nav-wrapper-2 { + // position static as well so we fix lots of the z-index issues + position:static; + } + } +} + +// Resets a lot of the mobile styling. #site-header only used to help position logo on desktop +#site-header { + height: auto; + background: none; + border-top: 0px; + .container { + position: static;//reset position so the nav links become clickable + } +} +#site-logo { + top: 0.9em; + position: absolute; + z-index: 3; +} +.ie6, .ie7 { + #site-header { + height:3em; + .container { + //ie broken z-index bug: the site-logo won't appear if we don't do this + //doesn't seem to render the nav link unclickable like in other browsers + position: relative; + } + } + #site-logo { + position: absolute; + top:-3.25em; + } +} +#nav-link { + left:-999999px; +} +#main-nav{ + margin: 0 auto; + padding: 0em; + width: 60em; + ul{ + list-style: none; + padding: 0px; + margin: 0px; + float:right; + li{ + list-style: none; + display: inline; + margin: 0px; + padding: 0px; + float:left; + a, + span { + display: block; + color:#fff; + background: none; + border-bottom: none; + } + } + &#main-menu{ + li{ + a, span{ + padding: 0.75em; + font-size: 0.9em; + } + a:hover{ + background:#444; + @include background(linear-gradient(#000, #444 10%, #444 95%, #111)); + } + a.report-a-problem-btn { + background:$primary; + padding:0.25em; + margin:0.5em; + color:#333; + @include border-radius(0.25em); + &:hover { + background:$primary/1.1; + } + } + span { + color:$primary; + } + } + } + &#mysoc-menu{ + padding: 0em 0.5em; + margin-left: 0.25em; + background:$primary url(/cobrands/fixmystreet/images/tile-y.jpg); + @include border-radius(0 0 0.375em 0.375em); + li{ + a{ + background:none; + color:#000; + text-transform: uppercase; + font-size: 0.6875em; + padding: 1.3em 0.7em 1em 0.7em; + &#mysoc-logo { + width:84px; + height:16px; + background-position: -20px -5px; + opacity: 0.8; + &:hover { + opacity: 1; + } + } + &:hover{ + color:#fff; + } + } + } + } + } +} +.ie7 #main-nav ul#mysoc-menu li a#mysoc-logo { + background-position: -260px -43px; +} + +// .content Is the white box + +// The narrow single column box +.content{ + width: 27em; + margin-top: 3em; + background: #fff; + padding: 1em; + padding-bottom: 3em; + margin-left: 0.5em; + margin-bottom: -1em; + @include box-shadow(0px 0px 6px 1px #000); +} +.ie6, .ie7, .ie8 { + .content { + // If no box-shadow, just want a boring black border to stand it out from the map. + border: 1px solid black; + //take off margins so we line up properly + margin: 0; + } +} +//weird margining thing for ie8 +.ie8 .content { + margin-top:3em; +} + +// map page - has fixed header and different styling +body.mappage { + .container { + width: auto; + } + .content { + float:left; + } + #main-nav ul#main-menu li a, + #main-nav ul#main-menu li span { + padding: 1.4em 0.75em 1.35em 0.75em; + } + #main-nav ul#main-menu li a.report-a-problem-btn { + padding: 0.5em; + margin:0.9em 0.25em 0.85em 0.25em; + } + .nav-wrapper{ + .nav-wrapper-2{ + position: fixed; + background: #222; + @include background(linear-gradient(#000, #222 10%, #222 90%, #000)); + } + } + #site-logo{ + position: fixed; + } +} +.ie6, .ie7 { + body.mappage { + // The below is *mandatory* to allow pins/zoom to be clickable in IE6/7. Do NOT remove. + .container { + float: left; + width: 27em; + margin-left: 1.4em; + } + .nav-wrapper{ + z-index:1; + .nav-wrapper-2 { + position:static; + } + } + #site-logo { + position: absolute; + } + } +} +.ie6 { + body.mappage { + .container { + margin-left: 0.7em; + } + } +} +//ie8 needs different stuff on .nav-wrapper so we +//have to define all the rest of it again as this resets +//the z-index base yet again :S +.ie8 { + body.mappage { + .nav-wrapper{ + position: relative; + z-index:0; + .nav-wrapper-2 { + position:static; + } + } + #site-logo { + position: absolute; + } + } +} + + + +// full width page +body.fullwidthpage { + .content { + width: 57em; + } + .intro { + width:40em; + } +} +// two thirds width page, also has option for a sidebar which can be sticky or not +body.twothirdswidthpage { + @extend .fullwidthpage; + .content { + width:40em; + position: relative; + aside { + background:#eee; + position:absolute; + left:42em; + top:0; + z-index: -1; + width:13em; + padding:1em; + @include box-shadow(0px 0px 6px 1px #000); + h2 { + margin-top: 0; + } + img { + margin-bottom: 0.25em; + } + } + .sticky-sidebar { + position: absolute; + left:42em; + z-index: -1; + aside { + position: fixed; + top:7em; + left:auto; + } + } + } +} +//as ie6 doesn't like 'fixed' we will make it absolute again +.ie6 body.twothirdswidthpage .content .sticky-sidebar { + position:static; + aside { + position:absolute; + left:42em; + top:0; + } +} + + +// table wrapper - this enables anything to become a +// table with div children as table cells +.tablewrapper { + display:table; + width:100%; + padding:0 0 1em 0; + >div { + display:table-cell; + width:50%; + } + .full-width { + width:auto; + margin:0; + } +} + +//fix table to be a block for ie, float the children +.ie6, .ie7 { + .tablewrapper { + display:block; + div {//ie6 doesn't support '>div', so we'll go with the somewhat risker 'div' + width:48%; + display:block; + float: left; + border:none !important; + } + } +} + +// adds border to the top and goes full width +.bordered { + margin:0 -1em; + padding:0 1em; + width:auto; + border-top:0.25em solid $primary; +} + +//footer blocks +#footer-mobileapps { + border-right:1em solid #fff; + background:none; + padding:0; + @include box-shadow(inset rgba(0, 0, 0, 0) 0 0 0); + h2 { + color:#222; + margin-top:0; + } + ul { + @include list-reset; + li { + border-bottom:none; + float:left; + margin:0 1em 1em 0; + a { + color:#222; + padding:0; + width: 96px; + height: 32px; + margin:0 auto; + text-indent: -999999px; + background: url(/cobrands/fixmystreet/images/sprite.png) -12px -3610px no-repeat; + opacity: 0.8; + &:hover { + opacity: 1; + } + &.m-app-iphone { + background-position: -12px -3610px; + } + &.m-app-droid { + background-position: -12px -3756px; + } + &.m-app-nokia { + background-position: -12px -3820px; + width:74px; + } + } + } + } +} +.ie6, .ie7 { + #footer-mobileapps { + margin:0 0.5em; + margin-right:2%; + } +} +.ie6 #footer-mobileapps ul li a { + background:url(/cobrands/fixmystreet/images/ie_mobileapps.gif) -1px -1px no-repeat; + &.m-app-droid { + background-position: -1px -148px; + } + &.m-app-nokia { + background-position: -1px -212px; + width:74px; + } +} + +#footer-help { + border-left:1em solid #fff; + ul { + display:table; + li { + display:table-cell; + border-bottom:none; + &:last-child { + border-left:1.25em solid #fff; + } + } + } +} +.ie6, .ie7 { + #footer-help { + margin-left:2%; + ul { + width:100%; + li { + float:left; + width:45% + } + } + } +} + + +// map box (fallback for non js really as most users +// will have fullscreen map) +#map_box{ + position: absolute; + height: 29em; + width: 29em; + right: 1em; + top: 3em; + z-index:1; +} + +// Pull OpenLayers navigation down a bit +#fms_pan_zoom { + top: 4.75em !important; +} + +// push zoom back over to right +#fms_pan_zoom_zoomin { + left:auto !important; + right:30px; + top:130px !important; +} +#fms_pan_zoom_zoomout { + left:auto !important; + right:30px; + top:174px !important; +} + +.olControlAttribution { + bottom:0.5em !important; + left: auto !important; +} + +#sub_map_links { + left:auto; + bottom:auto; + bottom:2em; + #map_links_toggle { + display:block; + cursor: pointer; + position:absolute; + left:-1em; + width:1em; + height:100%; + background:#000 url(/cobrands/fixmystreet/images/sprite.png) right -4119px no-repeat; + @include border-radius(0.25em 0 0 0.25em); + &:hover { + left:-1.5em; + //use border so we don't have to redefine the background-position + border-right:0.5em solid #000; + } + &.closed { + background-position: right -4159px; + } + } +} +.ie6 #sub_map_links #map_links_toggle { + height:1.75em; + background:#000 url('images/ie_sub_map_links_sprite.gif') center -143px no-repeat; + &.closed { + background-position: center -183px; + } +} + +// log in bit, pokes above the .content div +#user-meta{ + display:block; + position: relative; + max-width: 57em; + margin:0 auto; + p { + @include inline-block; + position:absolute; + top:1em; + height:2em; + padding:0.25em 6em 0.5em 0.5em; + @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); + a { + top:0.5em; + right:0.5em; + font-size:0.6875em; + padding:0.5em 0.75em; + line-height:1em; + &:hover { + text-decoration:none; + background:#444; + } + } + } +} +.ie6, .ie7 { + #user-meta { + z-index:1; + p { + top:-2em; + } + } +} +.ie6 #user-meta { + width:57em; //ie6 doesn't like max-width +} + + + +// Wraps around #key-tools box - sticks to the bottom of the screen on desktop +.shadow-wrap { + position:fixed; + z-index:10; //this is just to ensure anythign inside .content that has position set goes sites it + bottom: 0; + width: 29em; + overflow: hidden; + padding-top: 3em; + ul#key-tools { + border-top: 0.25em solid $primary; + margin: 0; + @include box-shadow(-0em 0px 1em 1em #fff); + li { + border:none; + a { + font-size: 0.75em; + color:#666; + padding: 0.5em 1.5em 0.5em 0; + text-transform:none; + &.abuse { + background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-position:right -2935px; + } + &.feed { + background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-position:right -3074px; + } + &.chevron { + background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-position:right -3225px; + } + &.hover { + background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-position:right -1876px; + } + } + } + &.singleton { + li { + text-align:right; + a { + padding-right:3em; + } + } + } + } + &.static { + padding:0 0 1em 0; + position: static; + } +} +// The padding is for the fading out when it's fixed positioned, which it isn't in IE6. +.ie6 .shadow-wrap { + padding-top: 0; +} + +// pokes over the RHS with a little triangle +.big-green-banner { + top:auto; + right:-1.25em; + margin-left:-2em; + font-size:1.375em; + padding:1em 3em 1em 1em; + background: $contrast1 url(/cobrands/fixmystreet/images/sprite.png) right -2188px no-repeat; + &:before { + right:0; + left:auto; + top:-0.5em; + position: absolute; + border-top: 0.5em solid transparent; + border-left: 0.5em solid #4B8304; + border-bottom:none; + } +} +.ie6 .big-green-banner { + background: $contrast1 url(/cobrands/fixmystreet/images/ie_green_chevron.gif) right center no-repeat; +} + +.banner { + // state banners + p { + top:-2.25em; + padding:1em; + &:before { + left:-0.75em; + border-left: 0.75em solid transparent; + border-bottom: 0.75em solid #888; + } + &#fixed { + padding-top:5em; + background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-position:-324px -326px; + background-repeat:no-repeat; + &:before { + border-bottom: 0.75em solid #4B8304; + } + } + } +} +.ie6 .banner p { + top:-1.5em; + &#fixed { + background-image:url(/cobrands/fixmystreet/images/ie_fixed.gif); + background-position:center 0.75em; + } +} + + +// for pulling elements fullwidth regardless +// of .contents' padding +.full-width{ + margin: 0 0 0em -1em; + width: 29em; +} + +/*FORMS*/ +input[type=text], +input[type=password], +input[type=email], +textarea{ + width: 25em; +} +.form-box { + max-width:25em; +} + + +/* form errors */ +div.form-error, +p.form-error { + display:block; + width:24.7em; +} + +input.form-error, +textarea.form-error { + @include border-radius(0 0 0.25em 0.25em); +} + + +// Report a problem sidebar notes +#report-a-problem-sidebar { + position:absolute; + z-index:-1;//push behind .content, .container resets z-index for this + left:29.5em; + top:5em; + width:15em; + @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); + .sidebar-tips { + background:#eeeeee; + padding:1em; + font-size:0.75em; + } + .sidebar-notes { + background:#333333; + padding:1em; + color:#ffffff; + font-size:0.75em; + } +} +.ie6, .ie7 { + #report-a-problem-sidebar { + left: 29em; // 0.5em left margin gone on .content in IE6/7, so reduce this accordingly. + } +} + +.no-js .general-sidebar-notes, +.no-js #report-a-problem-sidebar { + position: static; + width: auto; + @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0); + .sidebar-tips, + .sidebar-notes { + font-size:1em; + } +} + +// More general sidebar notes +.general-sidebar-notes { + position: absolute; + left:29.5em; + width:15em; + z-index: -1; //push behind .content, .container resets z-index for this + @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); + p { + background:#eeeeee; + font-size:0.75em; + padding:0.75em; + margin:0; + &.dark { + background:#333333; + color:#ffffff; + } + } +} + +// Frontpage + +body.frontpage { + .table-cell { + // we do this so we can have full screen width elements + >.container { + width:100%; + } + .content { + margin:14em auto 0 auto; + } + } + .nav-wrapper-2{ + height:6em; + } + #site-header{ + height:9em; + } + #site-logo{ + top:3em; + width: 300px; + height: 60px; + background: url('/cobrands/fixmystreet/images/sprite.png') -2px -108px no-repeat; + } + #user-meta { + z-index:10; + p { + top:-4em; + right:0; + color:#FFD000; + background:none; + @include box-shadow(rgba(0, 0, 0, 0) 0 0 0); + a { + background:#fff; + color:#1a1a1a; + &:hover { + background:#ddd; + } + } + } + } +} +//logo fix +.ie6, .ie7, .ie8 { + body.frontpage { + #site-logo { + position:relative; + width:60em; + margin:0 auto; + } + } +} +.ie6, .ie7 { + body.frontpage { + #site-header { + height:3em; + } + #site-logo { + top:-1em; + } + #user-meta p { + top:-2em; + } + } +} +.ie6 body.frontpage #site-logo { + background:url(/cobrands/fixmystreet/images/ie_front_logo.gif) 0 0 no-repeat; +} +//weird margining thing for ie8 +.ie8 body.frontpage { + #front-main { + top:-12em; + } + .table-cell .content { + margin-top:12em; + } +} + +// big yellow bit full screen width +#front-main { + color: $primary_text; + background: $primary url(/cobrands/fixmystreet/images/tile-y.jpg); + position:absolute; + width:100%; + left:0; + top:-15em; + #front-main-container { + max-width: 57em; + margin:0 auto; + } + h2 { + font-style:normal; + margin:0; + color:#222; + } + #postcodeForm { + background:none; + overflow:hidden; + margin-right:0.5em; + label { + 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; + height:1.5em; + width:16em; + } + input#submit { + display:block; + float:right; + width:3em; + height:2.3em; + padding-top:0.2em; + } + } + } + a#geolocate_link { + background:none; + color:#222; + margin:-1em 0 0.5em 0; + &:hover { + text-decoration:underline; + background:none; + } + } +} +.ie6, .ie7 { + #front-main { + top:2em; + } +} + + +#front-howto { + border-right:1em solid #fff; + #front_stats { + background:none; + border-top:0.25em solid $primary; + padding-top:1em; + div { + big { + color:$primary; + font-size:3.2308em; + } + } + } +} +.ie6, .ie7 { + #front_stats { + div { + width:8em; + float:left; + } + } +} + +#front-recently { + border-left:1em solid #fff; +} + +#front-howto h2, +#front-recently h2 { + margin-top:0; +} + + +.ie6, .ie7 { + .tablewrapper { + #front-howto { + margin-right:2%; + } + #front-recently { + margin-left:2%; + } + } +} + + + + +/* MEDIA QUERIES */ +@media only screen and (min-width: 48em) and (max-width: 61em) { + .container { + width: 100%; + } + /*FORMS*/ + input[type=text], + input[type=password], + input[type=email], + textarea{ + width: 95%; + } + + // Remove central positioning of mainmenu and float right. + // Left padding is to ensure no overlap of the site-logo + // Background styling replicates header styling + + #main-nav{ + width: auto; + float:right; + padding-left: 180px; + } + .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 + #site-header { + height:6em; + } + // Pull OpenLayers navigation down a bit more + #fms_pan_zoom { + top: 7em !important; + } + + //fix the left margin on login bit + #user-meta { + p { + left:1em; + } + } + body.frontpage { + #user-meta { + p { + left:auto; + } + } + } + + //Map becomes percentage width + #map_box{ + left: 32em; + width:auto; + } + + //put the RAP notes into the main copy area + // Note: Also used for the non-JS case. + #report-a-problem-sidebar, + .general-sidebar-notes { + 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 + .full-width{ + width: auto; + margin: 0em -1em 0 -1em; + } + + //make fullpage auto width + body.fullwidthpage .content { + width: auto; + } + + //make twothirdswidthpage nearly as small as main + //.content: just enough to still fit the sidebar in + body.twothirdswidthpage { + .content { + width:30em; + .sticky-sidebar { + left:32em; + top:30em; + aside { + top:9em; + } + } + } + } +} diff --git a/web/cobrands/fixmystreet/_mixins.scss b/web/cobrands/fixmystreet/_mixins.scss index f77152dd6..4c7bc5af8 100644 --- a/web/cobrands/fixmystreet/_mixins.scss +++ b/web/cobrands/fixmystreet/_mixins.scss @@ -3,7 +3,7 @@ cursor:pointer; font:{ size: 0.875em; - family: 'Helvetica', 'Arial', sans-serif; + family: Helmet, Freesans, sans-serif; weight:bold; } text-transform:uppercase; diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index bda29f2cb..21cc16cb4 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -8,1534 +8,5 @@ @import "_colours"; @import "_mixins"; @import "compass"; - - -/* HEADINGS and TYPOGRAPHY */ - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_300-webfont.eot'); - src: url('fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/MuseoSans_300-webfont.woff') format('woff'), - url('fonts/MuseoSans_300-webfont.ttf') format('truetype'), - url('fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_300_Italic-webfont.eot'); - src: url('fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/MuseoSans_300_Italic-webfont.woff') format('woff'), - url('fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'), - url('fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg'); - font-weight: normal; - font-style: italic; -} - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_500-webfont.eot'); - src: url('fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/MuseoSans_500-webfont.woff') format('woff'), - url('fonts/MuseoSans_500-webfont.ttf') format('truetype'), - url('fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg'); - font-weight: bold; - font-style: normal; -} - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_500_Italic-webfont.eot'); - src: url('fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/MuseoSans_500_Italic-webfont.woff') format('woff'), - url('fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'), - url('fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg'); - font-weight: bold; - font-style: italic; -} - -@font-face { - font-family: 'Museo300-display'; - src: url('fonts/Museo300-Regular-webfont.eot'); - src: url('fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/Museo300-Regular-webfont.woff') format('woff'), - url('fonts/Museo300-Regular-webfont.ttf') format('truetype'), - url('fonts/Museo300-Regular-webfont.svg#Museo300') format('svg'); - font-weight: normal; - font-style: normal; -} - - -/* Opera has a bug (from around 10.5 upwards to current 11.6) with showing the - * table caption *at all* if the header is set to a font-face :( */ -noindex:-o-prefocus, #site-header { - font-family: sans-serif; -} - - -body { - font-family: 'MuseoSans', 'Helvetica', 'Arial', sans-serif; - margin:0; - font-size:1em; - line-height:1.5; - color:#222; -} - - -p { - font-size: 1em; - font-weight: normal; - margin:0 0 1em 0; -} - -small{ - font-family: 'helvetica', 'arial',sans-serif; - font-style: italic; - font-size: 0.8125em; - line-height: 1.2307em; -} - -h1 { - font-family:'Museo300-display', 'Helvetica', 'Arial', sans-serif; - font-size: 2em; - line-height: 1em; - font-weight: normal; - margin-top: 0.5em; - margin-bottom: 0.5em; -} -#front-main h1 { - margin-top: 0.7em; -} -h1#reports_heading span { - display: none; -} -h1#reports_heading a { - display: block; - font-size: 50%; -} - -h2 { - font-family:'Museo300-display', 'Helvetica', 'Arial', sans-serif; - font-size: 1.5em; /*24px*/ - line-height: 1.3333em; /*32px*/ - font-weight: normal; - margin-top: 1.333333333em; /*32px*/ - margin-bottom: 0.666666666em; /*16px*/ -} - -h3 { - font-size: 1.25em; - line-height: 1.20em; - margin-top: 1.2em; - margin-bottom: 0.8em; - font-weight: bold -} - -h4 { - font-size: 1em; - font-weight: bold; - margin-bottom: 1em; -} - -// default list styles -ul, ol { - font-size: 1em; - margin-bottom: 2em; - margin-left: 2em; - padding:0; -} - -li{ - margin-bottom: 0.5em; -} - -ul li{ - list-style: square; -} - -ol li { - list-style:decimal; -} - -// lets you have a traditional ol but with nicely styled numbers -// for older browsers it just falls back to the normal ol -ol.big-numbers { - padding: 0; - margin: 0; - counter-reset: li; // reset counter to be 'li' instead of a number - > li { - position: relative; - list-style: none; - padding:0 0 0 2.5em; - margin-bottom:2em; - &:before { - content: counter(li); // set the content to be whatever the 'li' var is - counter-increment: li; // add to the counter var - position: absolute; - left: 0; - top:-0.2em; - color:#eeeeee; - line-height:1; - font: { - family: 'helvetica', 'arial', sans-serif; - weight:bold; - size:2.5em; - } - } - } -} - -dl { - margin: 0; - padding: 0; - dt { - font-size: 1em; - line-height: 1.5em; - font-weight: bold; - } - dd { - font-weight: 1em; - line-height: 1.5em; - margin:0 0 1em 0; - } -} - -blockquote { - p:before { - content: '“'; - } - p:after { - content: '”'; - } -} - -pre { - font-family: monospace; -} - -img { - //do this otherwise IE will just not display - //any img without a height defined - height:auto; -} - -select, input, textarea { - font-size: 99%; - max-width: 95%; -} - - -// links -a, -a:visited { - text-decoration:none; - color:#0BA7D1; - &:hover, - &:active { - text-decoration:underline; - color:#0D7CCE; - } -} - -// custom type -.small-print { - @extend small; - margin-bottom: 1.2307em; - color:#888888; -} -.meta{ - color:#555555; - font-style: italic; - margin-bottom: 0px; -} -.meta-2{ - font-family: 'helvetica', 'arial',sans-serif; - color:#888888; - font-style: italic; - font-size: 0.75em; -} - -h4.static{ - font-family: 'helvetica', 'arial',sans-serif; - text-transform: uppercase; - font-size: 0.875em; - line-height: 1.71428em; - color:#888; - margin-top: 2em; -} -h4.static-with-rule{ - @extend.static; - background: #f6f6f6; - border-top: 0.25em solid $primary; - margin-bottom:0.25em; - padding: 0.5em 1em; -} - -/* FORMS */ - -// input placeholders, these need to be on separate lines as if the browser -// can't understand a selector it will invalidate the whole line. -::-webkit-input-placeholder { - color: #888888; - font: { - style:italic; - size:0.9375em; - } -} -:-moz-placeholder { - color:#888888; - font: { - style:italic; - size:0.9375em; - } -} -:-ms-placeholder { - color:#888888; - font: { - style:italic; - size:0.9375em; - } -} -//this only gets used when the browser doesn't support @placeholder -.placeholder { - color:#888888; - font: { - style:italic; - size:0.9375em; - } -} - -// wrap anything inside the form in a fieldset to give -// us the right spacing -fieldset { - margin: 1em; -} - -input[type=text], -input[type=password], -input[type=email], -input[type=file], -textarea { - width: 100%; - // adjust so the sides line up - padding: 0.5em; - margin: 0 0 0 -0.5em; -} - -textarea { - border: 0.125em solid #888888; - @include border-radius(0.25em); - display: block; - font-size: 1em; - line-height: 1.5em; - font-family: 'helvetica', 'arial', sans-serif; - min-height:8em; -} - -input[type=text], -input[type=password], -input[type=email], -input[type=file] { - border: 0.125em solid #888888; - @include border-radius(0.25em); - display: block; - font-size: 1em; - line-height: 1em; -} -input[type=file] { - margin-bottom:1em; -} - -label{ - display: block; - margin-top: 1.25em; - margin-bottom: 0.25em; - font-weight: bold; - &.inline{ - display: inline; - padding: 0 2em 0 1em; - font-weight: normal; - } -} - -// grey background, full width box -.form-box { - margin: 0 -2em 0.25em -2em; - background:#eeeeee; - padding:1em 2em 1em 2em; - max-width:26em; - >input[type=text] { - margin-bottom:1em; - } - .title { - font-size:1.25em; - margin:0.5em 0; - } - h5 { - margin:0; - font: { - size:1.125em; - weight:normal; - } - strong { - font-size:2em; - margin-right:0.25em; - } - } -} -// IE6 doesn't extend the grey box back with the above negative margins, and -// the password box falls off screen for some reason. Just have boring margins, -// it looks okay. -.ie6 .form-box { - margin: 0 0 0.25em 0; -} - -.form-txt-submit-box { - min-height:3em; - input[type=password], - input[type=text], - input[type=email] { - width: 65%; - float:left; - } - input[type=submit] { - float:right; - width:28%; - margin-right:0.25em; - padding-top:0.7em; - padding-bottom:0.6em; - } -} - -.checkbox-group { - margin:1em 0; -} - - -// form errors -div.form-error, -p.form-error { - @include inline-block; - background:#ff0000; - color:#fff; - padding:0 0.5em; - margin:0 0 0 -0.5em; - @include border-radius(0.25em 0.25em 0 0); -} - -input.form-error, -textarea.form-error { - border-color:#ff0000; - @include border-radius(0 0.25em 0.25em 0.25em); -} - -ul.error { - background:#ff0000; - color:#fff; - padding:0 0.5em; - margin:0 0 0 -0.5em; - @include border-radius(0.25em); -} - -// don't display valid error boxes as now the page jump -// won't be until the user submits, which is fine -div.label-valid, -p.label-valid { - display:none !important; - visibility: hidden; -} - - - -/*** LAYOUT ***/ - -// Padding creates page margins on mobile -.container{ - padding: 0 1em; -} - -// Use full width to reverse .container margins -.full-width { - margin: 0 -1em; -} - -// #site-header creates grey bar in mobile -// .nav-wrapper-2 is used on desktop -#site-header{ - border-top: 0.25em solid $primary; - height: 3em; - @include background(linear-gradient(#000, #222 10%, #222 90%, #000)); - .container { - min-height:4em; - } -} -#site-logo{ - display: block; - width: 175px; - height: 40px; - top: 0.4em; - background: url('images/sprite.png') -3px -3px no-repeat; - text-indent: -999999px; - position: absolute; - z-index:2; -} -.ie6 #site-logo { - background: url('images/ie_logo.gif') 0 -5px no-repeat; -} -// this is a skip to nav for mobile users only -#nav-link { - width: 50px; - height: 48px; - background: url('images/sprite.png') -5px -916px no-repeat; - display: block; - text-indent: -999999px; - position: absolute; - right:2em; - top:-2px; - &:hover { - top:2px; - } -} - - -#main-nav{ - ul{ - @include list-reset-soft; - li{ - a, span { - display: block; - padding: 0.5em 1em; - background:#f6f6f6; - color:#333; - font-size: 1.25em; - border-bottom: 0.25em solid #333; - } - a:hover, span.hover { - background: #333; - color:#fff; - text-decoration: none; - } - } - &#mysoc-menu{ - li { - a { - background:$primary; - &#mysoc-logo { - background-image:url('images/sprite.png'); - background-repeat:no-repeat; - background-position:-240px -38px; - text-indent:-999999px; - } - } - } - } - } -} -.ie6 #main-nav ul#mysoc-menu li a#mysoc-logo { - background: url('images/ie_mysoc_logo.gif') center no-repeat; -} -//defines where the table caption is (login stuff on mob, nav menu on desktop) -.wrapper { - width:100%; - display:table; - caption-side:bottom; -} -// this is the user's logged in details or the login link etc -#user-meta { - p { - position: relative; - background:$primary; - padding:1em 6em 1em 1em; - a { - position: absolute; - right:1em; - @include inline-block; - text-transform:uppercase; - font-size:0.75em; - background:#333; - padding:0.25em 0.75em; - color:#fff; - @include border-radius(0.25em); - } - } -} - - -// #key-tools is the list that's pulled out an stick to the bottom of the page of desktop, below is mostly just aesthetic -.shadow-wrap { - @extend .full-width; - ul#key-tools{ - @include list-reset-soft; - margin-bottom: 1em; - display: table; - width:100%; - li{ - display: table-cell; - vertical-align: bottom; - text-align: center; - border-right:0.25em solid #fff; - &:last-child { - border-right:none; - } - a { - display: block; - background-color: #f5f5f5; - background-repeat: no-repeat; - color:#333; - padding:4em 2em 1em 2em; - text-transform:uppercase; - font: { - size:0.6875em; - family: 'helvetica', 'arial', sans-serif; - } - &:hover, &.hover, &.active { - text-decoration:none; - background-color:#333; - color:#fff; - } - &.abuse { - background-image:url('images/sprite.png'); - background-position:center -2424px; - } - &.feed { - background-image:url('images/sprite.png'); - background-position:center -2563px; - } - &.chevron { - background-image:url('images/sprite.png'); - background-position:center -2716px; - } - &.hover, &.active { - background-image:url('images/sprite.png'); - background-position:center -2064px; - } - } - } - } -} - -//because display:table doesn't work we float -.ie6, .ie7 { - .shadow-wrap { - ul#key-tools{ - background:#f5f5f5; - li{ - float:left; - a { - padding-left:1.5em; - padding-right:3em; - } - } - } - } -} -.ie6 .shadow-wrap ul#key-tools li a { - &.abuse { - background-image:url('images/ie_key_tools_sprite.gif'); - background-position: right 0px; - } - &.feed { - background-image:url('images/ie_key_tools_sprite.gif'); - background-position: right -58px; - } - &.chevron { - background-image:url('images/ie_key_tools_sprite.gif'); - background-position: right -116px; - } - &:hover { - background-image:url('images/ie_key_tools_sprite_dark.gif'); - } -} - - -//footer blocks -#footer-mobileapps { - @extend .full-width; - padding:1em; - h4 { - margin:0; - } - ul { - @include list-reset-soft; - li { - border-bottom:1px solid #AFAFAF; - &:last-child { - border-bottom:none; - } - a { - display:block; - padding:0.5em 0; - } - } - } -} - -#footer-help { - ul { - @include list-reset-soft; - li { - border-bottom:1px solid #AFAFAF; - &:last-child { - border-bottom:none; - } - h4 { - margin:0.75em 0 0.25em 0; - } - p { - font-size:0.75em; - } - } - } -} - - - -/*BUTTONS*/ - -// Default style set for buttons, inputs and .btn class. Red and green class available. - -button, input[type=submit],.btn{ - @include button-reset; -} - -.green-btn, -button.green-btn, -input.green-btn{ - @include button-reset(#9FDE23, #7FB900, #5B9700, #fff, #9FDE23, #7FB900, #5B9700, #fff); -} - -.red-btn, -button.red-btn, -input.red-btn{ - @include button-reset(#FF0038, #BF002A, #80001C, #fff, #FF0038, #BF002A, #80001C, #fff); -} - -.final-submit, -input.final-submit { - margin:1em 0.5em; - float:right; -} - -.button-right, -.button-left, -a.button-right, -a.button-left { - @include inline-block; - cursor:pointer; - font-size: 1em; - line-height: 1; - margin:0; - border:1px solid #999; - color:#333; - background: #eee; - @include border-radius(4px); - &:hover{ - color:#fff; - background:#777; - text-decoration: none; - border:1px solid #666; - } -} -.button-right, -a.button-right, -:hover.button-right, -a:hover.button-right { - padding:1em 3em 1em 1em; - background-image: url('images/sprite.png'); - background-repeat:no-repeat; - background-position:right -686px; -} - -.button-left, -a.button-left, -:hover.button-left, -a:hover.button-left { - padding:1em 1em 1em 3em; - background-image: url('images/sprite.png'); - background-repeat:no-repeat; - background-position:-18px -802px; -} - -.big-green-banner { - position: relative; - z-index:1000; - top:-1.75em; - background: $contrast1; - color: #fff; - padding:1em; - text: { - transform:uppercase; - align:center; - } - font-size:0.875em; - &:before { - content: ""; - left:-0.5em; - top:0; - position: absolute; - width: 0; - height: 0; - border-left: 0.5em solid transparent; - border-bottom: 0.5em solid #4B8304; - } -} - -.banner { - position: relative; - z-index:1100; - p { - position: absolute; - top:-1.95em; - right:0; - @include inline-block; - font-size:0.6875em;//11px - line-height:1em; - padding:0.5em 1em; - margin:0; - color:#1a1a1a; - background: #ccc; - text: { - transform:uppercase; - align:center; - } - &:before { - content: ""; - left:-0.5em; - top:0; - position: absolute; - width: 0; - height: 0; - border-left: 0.5em solid transparent; - border-bottom: 0.5em solid #888; - } - &#fixed { - color:#fff; - background: $contrast1; - &:before { - border-bottom: 0.5em solid #4B8304; - } - } - } -} - -/*OTHER*/ - -.plain-list { - @include list-reset-soft; - li { - margin-bottom:1em; - } -} - -.issue-list{ - margin: 0 0 1em 0; - padding: 0; - border-bottom: 0.25em solid $primary; - li{ - list-style: none; - background: #f6f6f6; - margin: 0.25em 0 0 0; - padding: 0.5em 1em; - display:block; - .update-wrap { - display:table; - width:100%; - .update-text, - .update-img { - display:table-cell; - vertical-align:top; - p { - margin-bottom: 0.5em; - } - } - .update-img { - text-align:right; - img { - margin:-0.5em -1em 0 0.5em; - height:auto; - } - } - } - } -} -//display:table fixes -.ie7, .ie7 { - .issue-list li .update-wrap { - .update-text { - float:left; - width:19em; - } - .update-img { - float:right; - } - } -} - -.issue-list-a { - margin: 0 0 1em 0; - padding: 0; - border-bottom: 0.25em solid $primary; - li { - list-style: none; - margin:0; - padding:0; - a { - margin: 0.25em 0 0 0; - display:table; - background: #f6f6f6; - color:#222222; - width:100%; - &:hover { - text-decoration:none; - color:#222222; - background:#e6e6e6; - } - .text, - .img { - display:table-cell; - vertical-align:top; - } - .img { - text-align:right; - img { - height:auto; - } - } - .text { - padding:0.25em 1em; - h4 { - margin:0; - } - small { - color:#808080; - } - } - } - >p { - margin: 0.25em 0 0 0; - padding: 0.5em 1em; - background: #f6f6f6; - } - } -} -.list-a { - @extend .issue-list-a; - a { - padding:0.5em 1em; - font-weight:bold; - } -} -//display:table fixes -.ie6, .ie7 { - .issue-list-a { - overflow:hidden; - li a { - clear:both; - width:auto; - display:block; - overflow:hidden; - .text { - float:left; - width:18em; - } - .img { - width:6.25em; - float:right; - } - } - } -} -.ie6 .issue-list-a li a { - height:5.5em; - .img img { - height:60px; - } -} - -// fancybox gallery images have a magnifying glass in the corner -.update-img { - a { - @include inline-block; - position:relative; - span { - position:absolute; - top:0; - right:0; - display:block; - width:20px; - height:20px; - opacity: 0.5; - background:#fff url(images/sprite.png) -16px -1098px no-repeat; - //hide text - http://nicolasgallagher.com/another-css-image-replacement-technique/ - font: 0/0 a; - color: transparent; - } - &:hover span { - opacity: 1; - } - } -} -//bit of a hack - as we can't use em's, push the span out to the right -//by how much it would be if the user did not resize the text -.issue-list li .update-wrap .update-img a span { - right:-16px; - top:-8px; -} - -.problem-header { - margin-bottom:1em; -} -.problem-header .update-img { - float: right; - margin-left: 0.5em; - margin-bottom: 0.5em; -} - -// map stuff -#map_box{ - @extend .full-width; - background: #333; - height: 29em; - margin-bottom: 1em; - overflow: hidden; - position: relative; - #map { - width:100%; - height:100%; - } -} - -// OpenLayers fix for navigation being top right -// Left and right so that zoom can be left, pan right. -#fms_pan_zoom { - right: 0.5em !important; - top: 0.5em !important; - left: 0.5em !important; -} -// The left and right of the above causes the navigation to move off-screen left in IE6. -// XXX Need to check IE7 -.ie6 #fms_pan_zoom { - left: auto !important; -} - -// Openlayers map controls (overrides) -#fms_pan_zoom_panup, -#fms_pan_zoom_pandown, -#fms_pan_zoom_panleft, -#fms_pan_zoom_panright, -#fms_pan_zoom_zoomin, -#fms_pan_zoom_zoomout { - width:36px !important; - height:36px !important; - text-indent:-999999px; - opacity:0.85; - background:url('images/sprite.png') no-repeat; - &:hover { - opacity:1; - } - filter: none !important; // Override OpenLayers PNG handling of the navigation -} - -#fms_pan_zoom_zoomworld { - display:none !important; - visibility:none !important; -} - -#fms_pan_zoom_panup { - background-position:-42px -222px; - right:30px !important; - left: auto !important; - top:0 !important; -} -#fms_pan_zoom_pandown { - background-position:-42px -282px; - right:30px !important; - left: auto !important; - top:72px !important; -} -#fms_pan_zoom_panleft { - background-position:-12px -252px; - width:48px !important; - right:48px !important; - left: auto !important; - top:36px !important; -} -#fms_pan_zoom_panright { - background-position:-60px -252px; - width:48px !important; - right:0 !important; - left: auto !important; - top:36px !important; -} -#fms_pan_zoom_zoomin { - background-position:-152px -223px; - height:44px !important; - left:0 !important; - top:0 !important; -} -#fms_pan_zoom_zoomout { - background-position:-152px -259px; - height:44px !important; - left:0 !important; - top:44px !important; -} - -//hide pins, show old reports etc -#sub_map_links { - position: absolute; - left: 0; - right:0; - bottom: 0; - z-index: 1100; - background:#333; - background:rgba(0, 0, 0, 0.7); - margin:0; - a { - @include inline-block; - font-size:0.6875em; - color:#fff; - padding:0.6em 3em 0.5em 1em; - background-repeat:no-repeat; - &#hide_pins_link { - background-image:url('images/sprite.png'); - background-position: right -3976px; - } - &#all_pins_link { - background-image:url('images/sprite.png'); - background-position: right -4022px; - } - &#map_permalink { - background-image:url('images/sprite.png'); - background-position: right -4070px; - } - &.feed { - background-image:url('images/sprite.png'); - background-position: right -3936px; - } - &:hover { - background-color:#000; - text-decoration:none; - } - } -} - -.ie6 #sub_map_links a { - &#hide_pins_link { - background-image:url('images/ie_sub_map_links_sprite.gif'); - background-position: right 1px; - } - &#all_pins_link { - background-image:url('images/ie_sub_map_links_sprite.gif'); - background-position: right -45px; - } - &#map_permalink { - background-image:url('images/ie_sub_map_links_sprite.gif'); - background-position: right -93px; - } -} - -#mob_sub_map_links { - position: absolute; - z-index:1100; - bottom:0; - display:table; - margin:0; - width:100%; - background:rgba(0, 0, 0, 0.7); - a { - color:#fff; - width:50%; - padding:0.5em 0; - font-size:1em; - display:table-cell; - text-align:center; - &:hover { - background:#000; - text-decoration:none; - } - } - &.map_complete { - background:none; - display:block; - border-bottom:4px solid #fff; - a#try_again { - display:block; - margin:0 auto 6em auto; - background:rgba(0, 0, 0, 0.8); - @include border-radius(0.5em); - } - a#mob_ok { - position:absolute; - right:1em; - bottom:0; - height:20px; - padding-top:30px; - display:block; - width:4em; - background:#fff url('images/sprite.png') 12px -4140px no-repeat; - color:#000; - } - } -} - -.mobile-map-banner { - margin:0; - position: absolute; - top:0; - left:0; - right:0; - font-size:0.75em; - background:rgba(0, 0, 0, 0.7); - padding:0.75em 30px; - a { - @include button-reset(#333, #1a1a1a, #1a1a1a, #fff, #333, #1a1a1a, #1a1a1a, #fff); - font: { - weight:normal; - size:0.875em; - } - line-height:1; - padding:0.5em 0.75em; - position:absolute; - left:0.3em; - top:0.3em; - } -} - -.olControlAttribution { - bottom: 3.25em !important; - right: 0.25em !important; - left: 0.25em !important; - color: #222222; - font-size:0.75em !important; -} -.olControlAttribution img { - vertical-align: bottom; -} -.olControlPermalink { - bottom: 3px !important; - right: 3px; -} - -/* Drag is only present in noscript form. XXX Copy from core. */ -#drag { - input, img { - position: absolute; - border: none; - max-width: none; - } - input { - cursor: crosshair; - background-color: #cccccc; - } - img { - cursor: move; - } - img.pin { - z-index: 100; - background-color: inherit; - } - a img.pin { - cursor: pointer; - cursor: hand; - } -} - -// only on mobile, this is a sidebar on desk (#report-a-problem-sidebar) -a.rap-notes-trigger, -a:hover.rap-notes-trigger { - display:block; - width:90%; - padding-left:5%; - padding-right:5%; -} -.rap-notes { - margin:1em 0; -} - -//report a problem tabs -#problems-nav { - padding:0 1em; - overflow:hidden; - border-bottom:0.25em solid #333; - ul { - @include list-reset-soft; - display:table; - width:100%; - li { - display:table-cell; - border-right:0.25em solid #fff; - &:last-child { - border-right:none; - } - a { - display:block; - background:#e2e2e2; - color:#333; - padding:1em; - text: { - transform:uppercase; - align:center; - } - &:hover { - text-decoration:none; - background:#e6e6e6; - } - &.active { - background:#333; - color:#fff; - } - } - } - } -} - -//display:table fixes -.ie6, .ie7 { - #problems-nav { - clear:both; - margin:0; - padding:0; - ul li { - float:left; - } - } -} - - -table.nicetable { - width:100%; - margin-bottom:2em; - thead { - border-bottom:0.25em solid #ccc; - th { - font-size:0.75em; - } - } - tr { - &.a { - background:#f6f6f6; - } - &:nth-child(even) { - background:#f6f6f6; - } - &.gone { - color: #666666; - background-color: #cccccc; - } - &:hover { - background:#FFF5CC; - cursor:pointer; - } - td { - padding:0.25em; - a { - &:hover { - text-decoration:none; - } - } - } - } - .title { - text-align:left; - } - .data { - width:12%; - } -} - -.promo { - @extend .full-width; - background:$primary; - padding:1em; - margin-bottom:1em; - overflow:hidden; - position: relative; - .close-promo { - position:absolute; - top:0.5em; - right:0.5em; - display:block; - width:16px; - height:16px; - text-indent:-999999px; - background:url(images/sprite.png) -341px -263px no-repeat; - @include border-radius(4px); - &:hover { - background:#222 url(images/sprite.png) -341px -223px no-repeat; - } - } -} - -.alert { - @extend .full-width; - background:#ff0000; - padding:1em; - margin-bottom:1em; - color:#fff; - a, a:hover { - color:$primary; - } -} - -.pagination { - text-align:center; - padding:0.5em 1em; - background:#eee; - position:relative; - .prev { - position:absolute; - left:0.5em; - } - .next { - position:absolute; - right:0.5em; - } - a { - @include inline-block; - background:$primary; - padding-left:0.5em; - padding-right:0.5em; - color:#1a1a1a; - &:hover { - color:#1a1a1a; - text-decoration:none; - background:$primary/1.1; - } - } -} - -// this is a bit of a hack to get some differentation between desk and mobile -.desk-only { - display:none !important; -} - -// hide anything with this class if js is working -.js .hidden-js { - display: none; - visibility: hidden; -} - -// hide anything with this class if js is NOT working -.no-js .hidden-nojs { - display: none !important; - visibility: hidden; -} - - -/* Front page */ -#front-main { - text-align:center; - h2 { - font: { - style:italic; - family: 'helvetica', 'arial', sans-serif; - size:1.1875em; - } - color:#4d4d4d; - } - #postcodeForm { - @extend .full-width; - padding:1em; - background:$primary; - font-family: 'helvetica', 'arial', sans-serif; - label { - margin:0; - } - div { - display:table; - width:100%; - background:#fff; - border:1px solid #F3B11E; - input#pc { - display:table-cell; - margin:0; - padding:0.25em 2%; - width:82%; - border:none; - background:none; - line-height:1.5em; - } - input#submit { - display:table-cell; - border:none; - padding:0; - margin:0; - width:14%; - height:35px; - background:#000; - color:#fff; - text-transform:uppercase; - @include border-radius(0); - &:hover { - background:#333; - } - } - } - } - a#geolocate_link { - @include inline-block; - vertical-align:top; - background:#1a1a1a; - color:#C8C8C8; - padding:0.5em; - font: { - family: 'helvetica', 'arial', sans-serif; - size:0.8125em; - } - @include border-radius(0 0 0.25em 0.25em); - &:hover { - text-decoration:none; - background:#2a2a2a; - } - } -} - -#front-howto { - #front_stats { - display:table; - width:100%; - background:$primary; - font-family: 'helvetica', 'arial', sans-serif; - div { - display:table-cell; - text-align:center; - padding:1em; - line-height:1.25em; - font: { - size:0.8125em; - weight:bold; - } - big { - display:block; - margin-bottom:0.5em; - font-size:1.5385em; - } - } - } -} - -#front-recently { - .issue-list-a { - border-bottom:none; - margin-bottom:0; - } -} - -#alerts { - ul { - margin-bottom: 1em; - } - li { - padding: 0em; - margin-bottom: 0.5em; - } - .a { - background: #f6f6f6; - } - img[width="16"] { - float: right; - } -} +@import "_base"; diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 0db8334fb..9d5151189 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -503,6 +503,7 @@ $.fn.drawer = function(id, ajax) { $('.container').on('click', '#alert_email_button', function(e){ e.preventDefault(); var form = $('<form/>').attr({ method:'post', action:"/alert/subscribe" }); + form.append($('<input name="alert" value="Subscribe me to an email alert" type="hidden" />')); $('#alerts input[type=text], #alerts input[type=hidden], #alerts input[type=radio]:checked').each(function() { var $v = $(this); $('<input/>').attr({ name:$v.attr('name'), value:$v.val(), type:'hidden' }).appendTo(form); @@ -560,9 +561,11 @@ $.fn.drawer = function(id, ajax) { /* * Fancybox fullscreen images */ - $('a[rel=fancy]').fancybox({ - 'overlayColor': '#000000' - }); + if (typeof $.fancybox == 'function') { + $('a[rel=fancy]').fancybox({ + 'overlayColor': '#000000' + }); + } /* * heightfix the desktop .content div diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png Binary files differindex 68de30268..61c27b32a 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 ff75409ec..ff7080c11 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -1,1066 +1,68 @@ - -@import "compass"; -@import "_colours"; -@import "_mixins"; - -//hacks for desk/mob only stuff -.desk-only { - display:block !important; -} -.mob-only { - display:none !important; -} - -body { - background: #1A1A1A url(images/tile.jpg) 0 0 repeat; -} - -h1 { - margin-top: 0; -} - -// Page wrapper and header bits follow - -.container{ - margin: 0 auto; - padding: 0em; - width: 60em; - position: relative; - z-index:1; -} - -//z-index stack order gets reset to 0 in ie6/7 if you position anything, -//so to fix things we give it a high value (don't ask me why) -//see: http://brenelz.com/blog/squish-the-internet-explorer-z-index-bug/ -//this affects #site-logo -.ie6, .ie7 { - .container { - z-index:100; - } -} - -.wrapper{ - display: table; - caption-side: top; - width: 100%; - .table-cell { - display:table-cell; - } -} - -//pad the top of the wrapper to allow space for the menu to fit in -//when its positioned absolute below -.ie6, .ie7 { - .wrapper { - padding-top:4em; - } -} - -.nav-wrapper{ - display: table-caption; - .nav-wrapper-2{ - width: 100%; - min-height: 4em; - position: absolute; - border-top:4px solid #1a1a1a; - @include border-image(url(images/tile-y-border.jpg) 4 0 0 0); - border-left:0; - border-right:0; - z-index:2; - } -} - -//position absolute the menu as ie doesn't like display:table -.ie6, .ie7 { - .nav-wrapper { - position: absolute; - top:0; - left:0; - width:100%; - .nav-wrapper-2 { - // position static as well so we fix lots of the z-index issues - position:static; - } - } -} - -// Resets a lot of the mobile styling. #site-header only used to help position logo on desktop -#site-header { - height: auto; - background: none; - border-top: 0px; - .container { - position: static;//reset position so the nav links become clickable - } -} -#site-logo { - top: 0.9em; - position: absolute; - z-index: 3; -} -.ie6, .ie7 { - #site-header { - height:3em; - .container { - //ie broken z-index bug: the site-logo won't appear if we don't do this - //doesn't seem to render the nav link unclickable like in other browsers - position: relative; - } - } - #site-logo { - position: absolute; - top:-3.25em; - } -} -#nav-link { - left:-999999px; -} -#main-nav{ - margin: 0 auto; - padding: 0em; - width: 60em; - ul{ - list-style: none; - padding: 0px; - margin: 0px; - float:right; - li{ - list-style: none; - display: inline; - margin: 0px; - padding: 0px; - float:left; - a, - span { - display: block; - color:#fff; - background: none; - border-bottom: none; - } - } - &#main-menu{ - li{ - a, span{ - padding: 0.75em; - font-size: 0.9em; - } - a:hover{ - background:#444; - @include background(linear-gradient(#000, #444 10%, #444 95%, #111)); - } - a.report-a-problem-btn { - background:$primary; - padding:0.25em; - margin:0.5em; - color:#333; - @include border-radius(0.25em); - &:hover { - background:$primary/1.1; - } - } - span { - color:$primary; - } - } - } - &#mysoc-menu{ - padding: 0em 0.5em; - margin-left: 0.25em; - background:$primary url(images/tile-y.jpg); - @include border-radius(0 0 0.375em 0.375em); - li{ - a{ - background:none; - color:#000; - text-transform: uppercase; - font-size: 0.6875em; - padding: 1.3em 0.7em 1em 0.7em; - &#mysoc-logo { - width:84px; - height:16px; - background-position:-260px -43px; - opacity: 0.8; - &:hover { - opacity: 1; - } - } - &:hover{ - color:#fff; - } - } - } - } - } +@font-face { + font-family: 'MuseoSans'; + src: url('fonts/MuseoSans_300-webfont.eot'); + src: url('fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/MuseoSans_300-webfont.woff') format('woff'), + url('fonts/MuseoSans_300-webfont.ttf') format('truetype'), + url('fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'MuseoSans'; + src: url('fonts/MuseoSans_300_Italic-webfont.eot'); + src: url('fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/MuseoSans_300_Italic-webfont.woff') format('woff'), + url('fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'), + url('fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg'); + font-weight: normal; + font-style: italic; +} + +@font-face { + font-family: 'MuseoSans'; + src: url('fonts/MuseoSans_500-webfont.eot'); + src: url('fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/MuseoSans_500-webfont.woff') format('woff'), + url('fonts/MuseoSans_500-webfont.ttf') format('truetype'), + url('fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg'); + font-weight: bold; + font-style: normal; +} + +@font-face { + font-family: 'MuseoSans'; + src: url('fonts/MuseoSans_500_Italic-webfont.eot'); + src: url('fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/MuseoSans_500_Italic-webfont.woff') format('woff'), + url('fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'), + url('fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg'); + font-weight: bold; + font-style: italic; +} + +@font-face { + font-family: 'Museo300-display'; + src: url('fonts/Museo300-Regular-webfont.eot'); + src: url('fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/Museo300-Regular-webfont.woff') format('woff'), + url('fonts/Museo300-Regular-webfont.ttf') format('truetype'), + url('fonts/Museo300-Regular-webfont.svg#Museo300') format('svg'); + font-weight: normal; + font-style: normal; +} + +/* Opera has a bug (from around 10.5 upwards to current 11.6) with showing the + * table caption *at all* if the header is set to a font-face :( */ +noindex:-o-prefocus, #site-header { + font-family: sans-serif; +} + +h3, h4 { + font-weight: bold; } +@import "_colours"; +@import "_layout"; - - -// .content Is the white box - -// The narrow single column box -.content{ - width: 27em; - margin-top: 3em; - background: #fff; - padding: 1em; - padding-bottom: 3em; - margin-left: 0.5em; - margin-bottom: -1em; - @include box-shadow(0px 0px 6px 1px #000); -} -.ie6, .ie7, .ie8 { - .content { - // If no box-shadow, just want a boring black border to stand it out from the map. - border: 1px solid black; - //take off margins so we line up properly - margin: 0; - } -} -//weird margining thing for ie8 -.ie8 .content { - margin-top:3em; -} - -// map page - has fixed header and different styling -body.mappage { - .content { - float:left; - } - #main-nav ul#main-menu li a, - #main-nav ul#main-menu li span { - padding: 1.4em 0.75em 1.35em 0.75em; - } - #main-nav ul#main-menu li a.report-a-problem-btn { - padding: 0.5em; - margin:0.9em 0.25em 0.85em 0.25em; - } - .nav-wrapper{ - .nav-wrapper-2{ - position: fixed; - background: #222; - @include background(linear-gradient(#000, #222 10%, #222 90%, #000)); - } - } - #site-logo{ - position: fixed; - } -} -.ie6, .ie7 { - body.mappage { - // The below is *mandatory* to allow pins/zoom to be clickable in IE6/7. Do NOT remove. - .container { - float: left; - width: 27em; - margin-left: 1.4em; - } - .nav-wrapper{ - z-index:1; - .nav-wrapper-2 { - position:static; - } - } - #site-logo { - position: absolute; - } - } -} -.ie6 { - body.mappage { - .container { - margin-left: 0.7em; - } - } -} -//ie8 needs different stuff on .nav-wrapper so we -//have to define all the rest of it again as this resets -//the z-index base yet again :S -.ie8 { - body.mappage { - .nav-wrapper{ - position: relative; - z-index:0; - .nav-wrapper-2 { - position:static; - } - } - #site-logo { - position: absolute; - } - } -} - - - -// full width page -body.fullwidthpage { - .content { - width: 57em; - } - .intro { - width:40em; - } -} -// two thirds width page, also has option for a sidebar which can be sticky or not -body.twothirdswidthpage { - @extend .fullwidthpage; - .content { - width:40em; - position: relative; - aside { - background:#eee; - position:absolute; - left:42em; - top:0; - z-index: -1; - width:13em; - padding:1em; - @include box-shadow(0px 0px 6px 1px #000); - h2 { - margin-top: 0; - } - img { - margin-bottom: 0.25em; - } - } - .sticky-sidebar { - position: absolute; - left:42em; - z-index: -1; - aside { - position: fixed; - top:7em; - left:auto; - } - } - } -} -//as ie6 doesn't like 'fixed' we will make it absolute again -.ie6 body.twothirdswidthpage .content .sticky-sidebar { - position:static; - aside { - position:absolute; - left:42em; - top:0; - } -} - - -// table wrapper - this enables anything to become a -// table with div children as table cells -.tablewrapper { - display:table; - width:100%; - padding:0 0 1em 0; - >div { - display:table-cell; - width:50%; - } - .full-width { - width:auto; - margin:0; - } -} - -//fix table to be a block for ie, float the children -.ie6, .ie7 { - .tablewrapper { - display:block; - div {//ie6 doesn't support '>div', so we'll go with the somewhat risker 'div' - width:48%; - display:block; - float: left; - border:none !important; - } - } -} - -// adds border to the top and goes full width -.bordered { - margin:0 -1em; - padding:0 1em; - width:auto; - border-top:0.25em solid $primary; -} - -//footer blocks -#footer-mobileapps { - border-right:1em solid #fff; - background:none; - padding:0; - @include box-shadow(inset rgba(0, 0, 0, 0) 0 0 0); - h2 { - color:#222; - margin-top:0; - } - ul { - @include list-reset; - li { - border-bottom:none; - float:left; - margin:0 1em 1em 0; - a { - color:#222; - padding:0; - width: 96px; - height: 32px; - margin:0 auto; - text-indent: -999999px; - background: url(images/sprite.png) -12px -3610px no-repeat; - opacity: 0.8; - &:hover { - opacity: 1; - } - &.m-app-iphone { - background-position: -12px -3610px; - } - &.m-app-iphone-streetreport { - background-position: -12px -3678px; - height:50px; - } - &.m-app-droid { - background-position: -12px -3756px; - } - &.m-app-nokia { - background-position: -12px -3820px; - width:74px; - } - } - } - } -} -.ie6, .ie7 { - #footer-mobileapps { - margin:0 0.5em; - margin-right:2%; - } -} -.ie6 #footer-mobileapps ul li a { - background:url(images/ie_mobileapps.gif) -1px -1px no-repeat; - &.m-app-iphone-streetreport { - background-position: -1px -69px; - height:50px; - } - &.m-app-droid { - background-position: -1px -148px; - } - &.m-app-nokia { - background-position: -1px -212px; - width:74px; - } -} - -#footer-help { - border-left:1em solid #fff; - ul { - display:table; - li { - display:table-cell; - border-bottom:none; - &:last-child { - border-left:1.25em solid #fff; - } - } - } -} -.ie6, .ie7 { - #footer-help { - margin-left:2%; - ul { - width:100%; - li { - float:left; - width:45% - } - } - } -} - - -// map box (fallback for non js really as most users -// will have fullscreen map) -#map_box{ - position: absolute; - height: 29em; - width: 29em; - right: 1em; - top: 3em; - z-index:1; -} - -// Pull OpenLayers navigation down a bit -#fms_pan_zoom { - top: 4.75em !important; -} - -// push zoom back over to right -#fms_pan_zoom_zoomin { - left:auto !important; - right:30px; - top:130px !important; -} -#fms_pan_zoom_zoomout { - left:auto !important; - right:30px; - top:174px !important; -} - -.olControlAttribution { - bottom:0.5em !important; - left: auto !important; -} - -#sub_map_links { - left:auto; - bottom:auto; - bottom:2em; - #map_links_toggle { - display:block; - cursor: pointer; - position:absolute; - left:-1em; - width:1em; - height:100%; - background:#000 url(images/sprite.png) right -4119px no-repeat; - @include border-radius(0.25em 0 0 0.25em); - &:hover { - left:-1.5em; - //use border so we don't have to redefine the background-position - border-right:0.5em solid #000; - } - &.closed { - background-position: right -4159px; - } - } -} -.ie6 #sub_map_links #map_links_toggle { - height:1.75em; - background:#000 url('images/ie_sub_map_links_sprite.gif') center -143px no-repeat; - &.closed { - background-position: center -183px; - } -} - -// log in bit, pokes above the .content div -#user-meta{ - display:block; - position: relative; - max-width: 57em; - margin:0 auto; - p { - @include inline-block; - position:absolute; - top:1em; - height:2em; - padding:0.25em 6em 0.5em 0.5em; - @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); - a { - top:0.5em; - right:0.5em; - font-size:0.6875em; - padding:0.5em 0.75em; - line-height:1em; - &:hover { - text-decoration:none; - background:#444; - } - } - } -} -.ie6, .ie7 { - #user-meta { - z-index:1; - p { - top:-2em; - } - } -} -.ie6 #user-meta { - width:57em; //ie6 doesn't like max-width -} - - - -// Wraps around #key-tools box - sticks to the bottom of the screen on desktop -.shadow-wrap { - position:fixed; - z-index:10; //this is just to ensure anythign inside .content that has position set goes sites it - bottom: 0; - width: 29em; - overflow: hidden; - padding-top: 3em; - ul#key-tools { - border-top: 0.25em solid $primary; - margin: 0; - @include box-shadow(-0em 0px 1em 1em #fff); - li { - border:none; - a { - font-size: 0.75em; - color:#888888; - padding: 0.5em 1.5em 0.5em 0; - text-transform:none; - &.abuse { - background-image:url(images/sprite.png); - background-position:right -2935px; - } - &.feed { - background-image:url(images/sprite.png); - background-position:right -3074px; - } - &.chevron { - background-image:url(images/sprite.png); - background-position:right -3225px; - } - &.hover { - background-image:url(images/sprite.png); - background-position:right -1876px; - } - } - } - &.singleton { - li { - text-align:right; - a { - padding-right:3em; - } - } - } - } - &.static { - padding:0 0 1em 0; - position: static; - } -} -// The padding is for the fading out when it's fixed positioned, which it isn't in IE6. -.ie6 .shadow-wrap { - padding-top: 0; -} - -// pokes over the RHS with a little triangle -.big-green-banner { - top:auto; - right:-1.25em; - margin-left:-2em; - font-size:1.375em; - padding:1em 3em 1em 1em; - background: $contrast1 url(images/sprite.png) right -2188px no-repeat; - &:before { - right:0; - left:auto; - top:-0.5em; - position: absolute; - border-top: 0.5em solid transparent; - border-left: 0.5em solid #4B8304; - border-bottom:none; - } -} -.ie6 .big-green-banner { - background: $contrast1 url(images/ie_green_chevron.gif) right center no-repeat; -} - -.banner { - // state banners - p { - top:-2.25em; - padding:1em; - &:before { - left:-0.75em; - border-left: 0.75em solid transparent; - border-bottom: 0.75em solid #888; - } - &#fixed { - padding-top:5em; - background-image:url(images/sprite.png); - background-position:-324px -326px; - background-repeat:no-repeat; - &:before { - border-bottom: 0.75em solid #4B8304; - } - } - } -} -.ie6 .banner p { - top:-1.5em; - &#fixed { - background-image:url(images/ie_fixed.gif); - background-position:center 0.75em; - } -} - - -// for pulling elements fullwidth regardless -// of .contents' padding -.full-width{ - margin: 0 0 0em -1em; - width: 29em; -} - -/*FORMS*/ -input[type=text], -input[type=password], -input[type=email], -textarea{ - width: 25em; -} -.form-box { - max-width:25em; -} - - -/* form errors */ -div.form-error, -p.form-error { - display:block; - width:24.7em; -} - -input.form-error, -textarea.form-error { - @include border-radius(0 0 0.25em 0.25em); -} - - -// Report a problem sidebar notes -#report-a-problem-sidebar { - position:absolute; - z-index:-1;//push behind .content, .container resets z-index for this - left:29.5em; - top:5em; - width:15em; - @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); - .sidebar-tips { - background:#eeeeee; - padding:1em; - font-size:0.75em; - } - .sidebar-notes { - background:#333333; - padding:1em; - color:#ffffff; - font-size:0.75em; - } -} -.ie6, .ie7 { - #report-a-problem-sidebar { - left: 29em; // 0.5em left margin gone on .content in IE6/7, so reduce this accordingly. - } -} - -.no-js .general-sidebar-notes, -.no-js #report-a-problem-sidebar { - position: static; - width: auto; - @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0); - .sidebar-tips, - .sidebar-notes { - font-size:1em; - } -} - -// More general sidebar notes -.general-sidebar-notes { - position: absolute; - left:29.5em; - width:15em; - z-index: -1; //push behind .content, .container resets z-index for this - @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); - p { - background:#eeeeee; - font-size:0.75em; - padding:0.75em; - margin:0; - &.dark { - background:#333333; - color:#ffffff; - } - } -} - -// Frontpage - -body.frontpage { - .table-cell { - // we do this so we can have full screen width elements - >.container { - width:100%; - } - .content { - margin:14em auto 0 auto; - } - } - .nav-wrapper-2{ - height:6em; - } - #site-header{ - height:9em; - } - #site-logo{ - top:3em; - width: 300px; - height: 60px; - background-position:-2px -108px; - } - #user-meta { - z-index:10; - p { - top:-4em; - right:0; - color:#FFD000; - background:none; - @include box-shadow(rgba(0, 0, 0, 0) 0 0 0); - a { - background:#fff; - color:#1a1a1a; - &:hover { - background:#ddd; - } - } - } - } -} -//logo fix -.ie6, .ie7, .ie8 { - body.frontpage { - #site-logo { - position:relative; - width:60em; - margin:0 auto; - } - } -} -.ie6, .ie7 { - body.frontpage { - #site-header { - height:3em; - } - #site-logo { - top:-1em; - } - #user-meta p { - top:-2em; - } - } -} -.ie6 body.frontpage #site-logo { - background:url(images/ie_front_logo.gif) 0 0 no-repeat; -} -//weird margining thing for ie8 -.ie8 body.frontpage { - #front-main { - top:-12em; - } - .table-cell .content { - margin-top:12em; - } -} - -// big yellow bit full screen width -#front-main { - background:$primary url(images/tile-y.jpg); - position:absolute; - width:100%; - left:0; - top:-15em; - #front-main-container { - max-width: 57em; - margin:0 auto; - } - h2 { - font-style:normal; - margin:0; - color:#222; - } - #postcodeForm { - background:none; - overflow:hidden; - margin-right:0.5em; - label { - 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; - height:1.5em; - width:16em; - } - input#submit { - display:block; - float:right; - width:3em; - height:2.3em; - padding-top:0.2em; - } - } - } - a#geolocate_link { - background:none; - color:#222; - margin:-1em 0 0.5em 0; - &:hover { - text-decoration:underline; - background:none; - } - } -} -.ie6, .ie7 { - #front-main { - top:2em; - } -} - - -#front-howto { - border-right:1em solid #fff; - #front_stats { - background:none; - border-top:0.25em solid $primary; - padding-top:1em; - div { - big { - color:$primary; - font-size:3.2308em; - } - } - } -} -.ie6, .ie7 { - #front_stats { - div { - width:8em; - float:left; - } - } -} - -#front-recently { - border-left:1em solid #fff; -} - -#front-howto h2, -#front-recently h2 { - margin-top:0; -} - - -.ie6, .ie7 { - .tablewrapper { - #front-howto { - margin-right:2%; - } - #front-recently { - margin-left:2%; - } - } -} - - - - -/* MEDIA QUERIES */ -@media only screen and (min-width: 48em) and (max-width: 61em) { - .container { - width: 100%; - } - /*FORMS*/ - input[type=text], - input[type=password], - input[type=email], - textarea{ - width: 95%; - } - - // Remove central positioning of mainmenu and float right. - // Left padding is to ensure no overlap of the site-logo - // Background styling replicates header styling - - #main-nav{ - width: auto; - float:right; - padding-left: 180px; - } - .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 - #site-header { - height:6em; - } - // Pull OpenLayers navigation down a bit more - #fms_pan_zoom { - top: 7em !important; - } - - //fix the left margin on login bit - #user-meta { - p { - left:1em; - } - } - body.frontpage { - #user-meta { - p { - left:auto; - } - } - } - - //Map becomes percentage width - #map_box{ - left: 32em; - width:auto; - } - - //put the RAP notes into the main copy area - // Note: Also used for the non-JS case. - #report-a-problem-sidebar, - .general-sidebar-notes { - 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 - .full-width{ - width: auto; - margin: 0em -1em 0 -1em; - } - - //make fullpage auto width - body.fullwidthpage .content { - width: auto; - } - - //make twothirdswidthpage nearly as small as main - //.content: just enough to still fit the sidebar in - body.twothirdswidthpage { - .content { - width:30em; - .sticky-sidebar { - left:32em; - top:30em; - aside { - top:9em; - } - } - } - } -} diff --git a/web/i/pin-green.png b/web/i/pin-green.png Binary files differindex 8b64d5160..47a0a6cc1 100644 --- a/web/i/pin-green.png +++ b/web/i/pin-green.png diff --git a/web/i/pin-red.png b/web/i/pin-red.png Binary files differindex 9b754e42e..298f4d3f6 100644 --- a/web/i/pin-red.png +++ b/web/i/pin-red.png diff --git a/web/i/pin-yellow-big.png b/web/i/pin-yellow-big.png Binary files differindex 59ed29dbd..d1642d644 100644 --- a/web/i/pin-yellow-big.png +++ b/web/i/pin-yellow-big.png diff --git a/web/i/pin-yellow.png b/web/i/pin-yellow.png Binary files differindex f9359b0b3..196cb0f5f 100644 --- a/web/i/pin-yellow.png +++ b/web/i/pin-yellow.png diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 3d2d3259a..d73e2bfc8 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -118,10 +118,10 @@ function fixmystreet_onload() { var markers = fms_markers_list( fixmystreet.pins, true ); fixmystreet.markers.addFeatures( markers ); if (fixmystreet.page == 'around' || fixmystreet.page == 'reports' || fixmystreet.page == 'my') { - var select = new OpenLayers.Control.SelectFeature( fixmystreet.markers ); + fixmystreet.select_feature = new OpenLayers.Control.SelectFeature( fixmystreet.markers ); var selectedFeature; function onPopupClose(evt) { - select.unselect(selectedFeature); + fixmystreet.select_feature.unselect(selectedFeature); OpenLayers.Event.stop(evt); } fixmystreet.markers.events.register( 'featureunselected', fixmystreet.markers, function(evt) { @@ -142,8 +142,8 @@ function fixmystreet_onload() { feature.popup = popup; fixmystreet.map.addPopup(popup); }); - fixmystreet.map.addControl( select ); - select.activate(); + fixmystreet.map.addControl( fixmystreet.select_feature ); + fixmystreet.select_feature.activate(); } else if (fixmystreet.page == 'new') { fixmystreet_activate_drag(); } @@ -164,9 +164,11 @@ function fixmystreet_onload() { for (var i=0; i<showhide.length; i+=2) { if (this.innerHTML == showhide[i]) { fixmystreet.markers.setVisibility(true); + fixmystreet.select_feature.activate(); this.innerHTML = showhide[i+1]; } else if (this.innerHTML == showhide[i+1]) { fixmystreet.markers.setVisibility(false); + fixmystreet.select_feature.deactivate(); this.innerHTML = showhide[i]; } } @@ -213,7 +215,7 @@ $(function(){ displayProjection: new OpenLayers.Projection("EPSG:4326") }); - if ($('html').hasClass('mobile')) { + if ($('html').hasClass('mobile') && fixmystreet.page == 'around') { $('#fms_pan_zoom').css({ top: '2.75em !important' }); } @@ -236,14 +238,15 @@ $(function(){ if (fixmystreet.state_map && fixmystreet.state_map == 'full') { // TODO Work better with window resizing, this is pretty 'set up' only at present - var q = $(window).width() / 4; + var $content = $('.content'), + q = ( $content.offset().left + $content.width() ) / 2; // Need to try and fake the 'centre' being 75% from the left fixmystreet.map.pan(-q, -25, { animate: false }); fixmystreet.map.events.register("movestart", null, function(e){ fixmystreet.map.moveStart = { zoom: this.getZoom(), center: this.getCenter() }; }); fixmystreet.map.events.register("zoomend", null, function(e){ - if ( fixmystreet.map.moveStart && !fixmystreet.map.moveStart.zoom ) { + if ( fixmystreet.map.moveStart && !fixmystreet.map.moveStart.zoom && fixmystreet.map.moveStart.zoom !== 0 ) { return true; // getZoom() on Firefox appears to return null at first? } if ( !fixmystreet.map.moveStart || !this.getCenter().equals(fixmystreet.map.moveStart.center) ) { @@ -433,6 +436,11 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { latitude: $('#fixmystreet\\.latitude').val(), longitude: $('#fixmystreet\\.longitude').val() }, function(data) { + if (data.error) { + // XXX If they then click back and click somewhere in the area, this error will still show. + $('#side-form').html('<h1>Reporting a problem</h1><p>' + data.error + '</p>'); + return; + } $('#councils_text').html(data.councils_text); $('#form_category_row').html(data.category); }); @@ -454,7 +462,12 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { // If we clicked the map somewhere inconvenient var sidebar = $('#report-a-problem-sidebar'); if (sidebar.css('position') == 'absolute') { - var w = sidebar.width(), h = sidebar.height(), o = sidebar.offset(); + var w = sidebar.width(), h = sidebar.height(), + o = sidebar.offset(), + $map_box = $('#map_box'), bo = $map_box.offset(); + // e.xy is relative to top left of map, which might not be top left of page + e.xy.x += bo.left; + e.xy.y += bo.top; if (e.xy.y <= o.top || (e.xy.x >= o.left && e.xy.x <= o.left + w + 24 && e.xy.y >= o.top && e.xy.y <= o.top + h + 64)) { // top of the page, pin hidden by header; // or underneath where the new sidebar will appear @@ -463,7 +476,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { fixmystreet.map.getProjectionObject() ); var p = fixmystreet.map.getViewPortPxFromLonLat(lonlat); - p.x -= $(window).width() / 3; + p.x -= ( o.left + w ) / 2; lonlat = fixmystreet.map.getLonLatFromViewPortPx(p); fixmystreet.map.panTo(lonlat); } diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 50f159635..54bf95964 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -79,14 +79,14 @@ OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, { }); /** - * Class: OpenLayers.Layer.OSM.Osmarender + * Class: OpenLayers.Layer.OSM.MapQuestOpen * * Inherits from: * - <OpenLayers.Layer.OSM> */ -OpenLayers.Layer.OSM.Osmarender = OpenLayers.Class(OpenLayers.Layer.OSM, { +OpenLayers.Layer.OSM.MapQuestOpen = OpenLayers.Class(OpenLayers.Layer.OSM, { /** - * Constructor: OpenLayers.Layer.OSM.Osmarender + * Constructor: OpenLayers.Layer.OSM.MapQuestOpen * * Parameters: * name - {String} @@ -94,16 +94,22 @@ OpenLayers.Layer.OSM.Osmarender = OpenLayers.Class(OpenLayers.Layer.OSM, { */ initialize: function(name, options) { var url = [ - "http://a.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png", - "http://b.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png", - "http://c.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png" + "http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", + "http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", + "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", + "http://otile4.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png" ]; - options = OpenLayers.Util.extend({ numZoomLevels: 18, buffer: 0 }, options); + options = OpenLayers.Util.extend({ + /* Below line added to OSM's file in order to allow minimum zoom level */ + maxResolution: 156543.0339/Math.pow(2, options.zoomOffset || 0), + numZoomLevels: 19, + buffer: 0 + }, options); var newArguments = [name, url, options]; OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments); }, - CLASS_NAME: "OpenLayers.Layer.OSM.Osmarender" + CLASS_NAME: "OpenLayers.Layer.OSM.MapQuestOpen" }); /** |
