aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--templates/web/zurich/footer.html2
-rw-r--r--templates/web/zurich/header.html2
-rw-r--r--web/cobrands/zurich/_zurich.scss98
-rw-r--r--web/cobrands/zurich/layout.scss137
4 files changed, 135 insertions, 104 deletions
diff --git a/templates/web/zurich/footer.html b/templates/web/zurich/footer.html
index 499923b1c..f01e6671d 100644
--- a/templates/web/zurich/footer.html
+++ b/templates/web/zurich/footer.html
@@ -4,6 +4,7 @@
<div class="nav-wrapper">
<div class="nav-wrapper-2">
+ <div class="nav-wrapper-3">
<div id="main-nav" role="navigation">
[% IF c.user_exists %]
<p>
@@ -21,6 +22,7 @@
</ul>
[% END %]
</div>
+ </div>
</div>
</div>
diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html
index d47a05a0d..cdff06df8 100644
--- a/templates/web/zurich/header.html
+++ b/templates/web/zurich/header.html
@@ -38,7 +38,7 @@
<div class="table-cell">
<header id="site-header" role="banner">
<div class="container">
- <a href="/" id="site-logo">FixMyStreet</a>
+ <a href="/" id="site-logo">FixMyZurich</a>
<a href="#main-nav" id="nav-link">Main Navigation</a>
</div>
</header>
diff --git a/web/cobrands/zurich/_zurich.scss b/web/cobrands/zurich/_zurich.scss
index 042dd4959..b71670a92 100644
--- a/web/cobrands/zurich/_zurich.scss
+++ b/web/cobrands/zurich/_zurich.scss
@@ -30,101 +30,3 @@ a:hover {
#zurich-footer a:hover {
color: #3c3c3c;
}
-
-body.fullwidthpage.admin .content {
- width: 100%;
-}
-.admin {
- .content {
- margin: 0.5em 0 1em 0;
- padding: 0 0 0 0;
- }
- #zurich-footer {
- margin: 2em auto 3em auto;
- }
- .admin-nav {
- background: #f4f4f4;
- @include background(linear-gradient(#fbfbfb, #efefef));
- border-bottom: 2px solid $table_border_color;
- margin: 0 0 1em 0;
- ul {
- overflow:auto;
- margin:0 0 -2px 0;
- list-style: none;
- padding: 0;
- border-top: 1px solid $table_border_color;
- border-left: 1px solid $table_border_color;
- border-right: 1px solid $table_border_color;
- li {
- border-right: 1px solid $table_border_color;
- float:left;
- list-style: none;
- margin:0;
- padding: 0.5em 1em;
- font-weight: bold;
- color: #000;
- a {
- color: #000;
- }
- }
- li.search-box {
- float: right;
- }
- li.current {
- background-color: #fff;
- border-bottom: 2px solid #fff;
- }
- li.search-box {
- border:none;
- padding: 0.2em 0.5em 0.2em 30px;
- background-image: url('search-icon.png');
- background-position: 2px center;
- background-repeat: no-repeat;
- input {
- height: 100%;
- width: 12em;
- border: none;
- padding: 6px 0.5em;
- }
- }
- }
- }
- table {
- width: 100%;
- font-size: 0.9em;
- border: 1px solid $table_border_color;
- border-collapse:collapse;
- th, td {
- padding: 0.666em 0.5em;
- border: 1px solid $table_border_color;
- }
- th {
- color: white;
- background-color: $table_heading_bg_col;
- border-bottom: 2px solid $table_heading_underline_col;
- border-left: 1px solid $table_heading_border_col;
- border-right: 1px solid $table_heading_border_col;
-
- }
- td.record-id {
- text-align: center;
- font-weight: bold;
- }
- tr.filter-row td {
- display: none; /* TODO: reveal when filtering is implemented */
- padding: 4px 4px 4px 40px;
- background-color: $button_bg_col;
- background-image: url('search-icon-white.png');
- background-position: 14px center;
- background-repeat: no-repeat;
- border-bottom: 2px solid $table_border_color;
- }
- tr.filter-row td input[type=text] {
- background-color: #e1e1e1;
- width: 16em;
- @include border-radius(4px);
- border: none;
- padding: 3px 0.5em;
- }
- }
-} \ No newline at end of file
diff --git a/web/cobrands/zurich/layout.scss b/web/cobrands/zurich/layout.scss
index cfd945034..6a23f4e22 100644
--- a/web/cobrands/zurich/layout.scss
+++ b/web/cobrands/zurich/layout.scss
@@ -2,6 +2,8 @@
@import "../fixmystreet/layout";
@import "zurich";
+// Things to override from parent stylesheet
+
body {
color: #3c3c3c;
background-color: #fff;
@@ -18,16 +20,22 @@ body {
}
}
+// Different header and logo
#site-header .container {
- height: 83px;
+ height: 99px;
background: url(logo_portal.x.jpg) top left repeat-x;
}
body.frontpage #site-logo, #site-logo {
width: 415px;
- height: 83px;
+ height: 16px;
background: url(logo_portal.jpg) top left no-repeat;
top: 0;
+ text-indent: 0;
+ padding-left: 10px;
+ padding-top: 83px;
+ color: #585858;
+ font-size: 85%;
}
.nav-wrapper {
@@ -40,13 +48,25 @@ body.mappage {
.nav-wrapper {
.nav-wrapper-2 {
border-top: none;
- padding-top: 18px;
- background: url(logo_portal.x.jpg) top left repeat-x;
- height: 83px;
+ background: #fff;
+ height: 117px; // 99px+18px for padding
+ padding: 0 10px;
+ box-sizing: border-box;
}
}
+ /* Ugh :( But first wrapper is the caption, second is the fixed (so first we
+ can do padding on) so a third seems necessary for the background then. */
+ .nav-wrapper-3 {
+ height: 99px;
+ padding-top: 18px;
+ background: #fff url(logo_portal.x.jpg) top left repeat-x;
+ }
+ #site-logo {
+ margin-left: 10px;
+ }
}
+// Logged in notice in footer (appearing in header)
.nav-wrapper-2 p:first-child {
font-weight: bold;
margin-top: 0.75em;
@@ -117,3 +137,110 @@ body.twothirdswidthpage {
}
}
+#fms_pan_zoom {
+ top: 7.75em !important;
+}
+
+// Admin specific changes
+
+body.fullwidthpage.admin .content {
+ width: 100%;
+}
+
+.admin {
+ .content {
+ margin: 2em 0 1em;
+ padding: 0 0 0 0;
+ }
+
+ #zurich-footer {
+ margin: 2em auto 3em auto;
+ }
+
+ table {
+ width: 100%;
+ font-size: 0.9em;
+ border: 1px solid $table_border_color;
+ border-collapse:collapse;
+ th, td {
+ padding: 0.666em 0.5em;
+ border: 1px solid $table_border_color;
+ }
+ th {
+ color: white;
+ background-color: $table_heading_bg_col;
+ border-bottom: 2px solid $table_heading_underline_col;
+ border-left: 1px solid $table_heading_border_col;
+ border-right: 1px solid $table_heading_border_col;
+ }
+ td.record-id {
+ text-align: center;
+ font-weight: bold;
+ }
+ tr.filter-row td {
+ display: none; /* TODO: reveal when filtering is implemented */
+ padding: 4px 4px 4px 40px;
+ background-color: $button_bg_col;
+ background-image: url('search-icon-white.png');
+ background-position: 14px center;
+ background-repeat: no-repeat;
+ border-bottom: 2px solid $table_border_color;
+ }
+ tr.filter-row td input[type=text] {
+ background-color: #e1e1e1;
+ width: 16em;
+ @include border-radius(4px);
+ border: none;
+ padding: 3px 0.5em;
+ }
+ }
+}
+
+.admin-nav {
+ background: #f4f4f4;
+ @include background(linear-gradient(#fbfbfb, #efefef));
+ border-bottom: 2px solid $table_border_color;
+ margin: 0 0 1em 0;
+ ul {
+ overflow:auto;
+ margin:0 0 -2px 0;
+ list-style: none;
+ padding: 0;
+ border-top: 1px solid $table_border_color;
+ border-left: 1px solid $table_border_color;
+ border-right: 1px solid $table_border_color;
+ li {
+ border-right: 1px solid $table_border_color;
+ float:left;
+ list-style: none;
+ margin:0;
+ padding: 0.5em 1em;
+ font-weight: bold;
+ color: #000;
+ a {
+ color: #000;
+ }
+ }
+ li.search-box {
+ float: right;
+ }
+ li.current {
+ background-color: #fff;
+ border-bottom: 2px solid #fff;
+ }
+ li.search-box {
+ border:none;
+ padding: 0.2em 0.5em 0.2em 30px;
+ background-image: url('search-icon.png');
+ background-position: 2px center;
+ background-repeat: no-repeat;
+ input {
+ height: 100%;
+ width: 12em;
+ border: none;
+ padding: 6px 0.5em;
+ }
+ }
+ }
+}
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-19 22:19:36 +0000