aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/fixmystreet/fixmystreet.js15
-rw-r--r--web/cobrands/fixmystreet/layout.scss9
-rwxr-xr-xweb/cobrands/harrogate/HBCLogo-cropped.pngbin0 -> 10091 bytes
-rwxr-xr-xweb/cobrands/harrogate/HBCLogo-mobile.pngbin0 -> 2632 bytes
-rw-r--r--web/cobrands/harrogate/HBCLogo.pngbin0 -> 7102 bytes
-rwxr-xr-xweb/cobrands/harrogate/HBLogo.pngbin0 -> 33025 bytes
-rw-r--r--web/cobrands/harrogate/_colours.scss22
-rw-r--r--web/cobrands/harrogate/base.scss65
-rw-r--r--web/cobrands/harrogate/config.rb25
-rw-r--r--web/cobrands/harrogate/layout.scss185
-rw-r--r--web/cobrands/sass/_layout.scss3
-rw-r--r--web/js/map-OpenLayers.js4
-rw-r--r--web/js/map-OpenStreetMap.js8
13 files changed, 305 insertions, 31 deletions
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 4e7315017..fdecee9db 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -46,17 +46,6 @@ function tabs(elem, indirect) {
//hide / show the right tab
$('.tab.open').hide().removeClass('open');
$(target).show().addClass('open');
-
- // Clicking on tabs to show/hide pins, content experiment
- if (typeof(variation) !== 'undefined' && variation == 1) {
- if (target == '#current_near_tab' && !fixmystreet.markers.getVisibility()) {
- $('#hide_pins_link').click();
- }
- if (target == '#reporting' && fixmystreet.markers.getVisibility()) {
- $('#hide_pins_link').click();
- }
- }
-
}
}
@@ -187,8 +176,8 @@ $(function(){
* Tabs
*/
//make initial tab active
- $('.tab-nav a:visible').first().addClass('active');
- $('.tab:visible').first().addClass('open');
+ $('.tab-nav a').first().addClass('active');
+ $('.tab').first().addClass('open');
//hide other tabs
$('.tab').not('.open').hide();
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss
index 21de4f271..ded1ed911 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet/layout.scss
@@ -92,15 +92,6 @@ body.mappage {
@include background(linear-gradient(#000, #222 10%, #222 90%, #000));
}
}
-
- #reporting {
- padding: 1em;
- text-align: center;
-
- h1 {
- line-height: 1.2em;
- }
- }
}
#main-nav {
diff --git a/web/cobrands/harrogate/HBCLogo-cropped.png b/web/cobrands/harrogate/HBCLogo-cropped.png
new file mode 100755
index 000000000..4421820d2
--- /dev/null
+++ b/web/cobrands/harrogate/HBCLogo-cropped.png
Binary files differ
diff --git a/web/cobrands/harrogate/HBCLogo-mobile.png b/web/cobrands/harrogate/HBCLogo-mobile.png
new file mode 100755
index 000000000..7b4cd6063
--- /dev/null
+++ b/web/cobrands/harrogate/HBCLogo-mobile.png
Binary files differ
diff --git a/web/cobrands/harrogate/HBCLogo.png b/web/cobrands/harrogate/HBCLogo.png
new file mode 100644
index 000000000..11ee7c79c
--- /dev/null
+++ b/web/cobrands/harrogate/HBCLogo.png
Binary files differ
diff --git a/web/cobrands/harrogate/HBLogo.png b/web/cobrands/harrogate/HBLogo.png
new file mode 100755
index 000000000..03cf2b4f5
--- /dev/null
+++ b/web/cobrands/harrogate/HBLogo.png
Binary files differ
diff --git a/web/cobrands/harrogate/_colours.scss b/web/cobrands/harrogate/_colours.scss
new file mode 100644
index 000000000..a79b7acfb
--- /dev/null
+++ b/web/cobrands/harrogate/_colours.scss
@@ -0,0 +1,22 @@
+/* COLOURS */
+
+$harrogate_primary: #7EB7D8;
+
+$primary: $harrogate_primary;
+$primary_dark: darken($harrogate_primary, 20%);
+
+$col_click_map: $harrogate_primary;
+$col_click_map_dark: $harrogate_primary;
+$col_fixed_label_dark: $harrogate_primary;
+$col_fixed_label: $harrogate_primary;
+
+$primary_b: #000000;
+$primary_text: #ffffff;
+
+$base_bg: #fff;
+$base_fg: #1a1a1a;
+
+/* Following seem to be required in layout.scss */
+$map_nav_bg: #222;
+$nav_fg: #000;
+$nav_fg_hover: #444;
diff --git a/web/cobrands/harrogate/base.scss b/web/cobrands/harrogate/base.scss
new file mode 100644
index 000000000..eccb1a84f
--- /dev/null
+++ b/web/cobrands/harrogate/base.scss
@@ -0,0 +1,65 @@
+@import "../sass/h5bp";
+@import "./_colours";
+@import "../sass/mixins";
+@import "compass";
+
+@import "../sass/base";
+
+
+body.frontpage #site-logo,
+.ie6 body.frontpage #site-logo,
+#site-logo
+{
+ display: block;
+ margin: 2px;
+ padding-left: 10px;
+ position: static;
+
+ background: url("/cobrands/harrogate/HBCLogo-mobile.png") 0 0 no-repeat;
+ width: 106px;
+ height: 37px;
+}
+
+#main-nav ul#main-menu li {
+
+ // blue button background, darker if selected
+ background: #ededed;
+ &.menu-item-selected {
+ background: $primary;
+ span {
+ color: #fff;
+ }
+ }
+
+ span {
+ color: $nav_fg;
+ }
+}
+
+#main-nav ul#main-menu li,
+body.mappage #main-nav ul#main-menu li,
+{
+ padding-left: 0.25em;
+ padding-right: 0.25em;
+ padding-top: 0;
+ padding-bottom: 0;
+
+ a { padding: 0 }
+}
+
+label[for=form_INFO_TEXT] {
+ background: yellow;
+ border: solid 1px black;
+ padding: 1em;
+}
+
+#site-header {
+ background: none;
+}
+
+
+#council_responsibilities_note {
+ background-color: lighten($primary, 30%);
+ padding: 0.5em;
+ font-size: 0.8em;
+}
diff --git a/web/cobrands/harrogate/config.rb b/web/cobrands/harrogate/config.rb
new file mode 100644
index 000000000..cab97b18f
--- /dev/null
+++ b/web/cobrands/harrogate/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/harrogate/layout.scss b/web/cobrands/harrogate/layout.scss
new file mode 100644
index 000000000..480a07f5d
--- /dev/null
+++ b/web/cobrands/harrogate/layout.scss
@@ -0,0 +1,185 @@
+@import "_colours";
+@import "../sass/layout";
+
+@media only screen and (min-width: 48em) {
+ #site-logo,
+ .ie6 #site-logo,
+
+ body.frontpage #site-logo,
+ .ie6 body.frontpage #site-logo,
+
+ body.authpage #site-logo,
+ .ie6 body.authpage #site-logo,
+
+ body.twothirdswidthpage #site-logo,
+ .ie6 body.twothirdswidthpage #site-logo
+ {
+ position: relative;
+ top: 1.2em;
+ margin: 0;
+ padding: 0;
+ background: url("/cobrands/harrogate/HBCLogo.png") 0 0 no-repeat;
+ width: 227px;
+ height: 122px;
+ }
+
+ body.frontpage #site-header,
+ .ie6 body.frontpage #site-header,
+
+ body.twothirdswidthpage #site-header,
+ .ie6 body.twothirdswidthpage #site-header,
+
+ body.authpage #site-header,
+ .ie6 body.authpage #site-header,
+
+ body.mappage #site-header,
+ .ie6 body.mappage #site-header,
+ body.mappage .nav-wrapper-2,
+ .ie6 body.mappage .nav-wrapper-2
+ {
+ height: 10em;
+ }
+
+ #fms_pan_zoom {
+ top: 10.75em!important;
+ }
+}
+
+@media only screen and (min-width: 48em) {
+ body.twothirdswidthpage .container .content footer .tablewrapper a:link,
+ body.twothirdswidthpage .container .content footer .tablewrapper a:visited,
+ body.fullwidthpage .container .content footer .tablewrapper a:link,
+ body.fullwidthpage .container .content footer .tablewrapper a:visited {
+ color: white;
+ }
+
+ body.mappage #user-meta+.container .content {
+ padding-top: 1.5em;
+ }
+}
+
+body.fullwidthpage #main-nav,
+body.frontpage #main-nav,
+body.twothirdswidthpage #main-nav,
+body.authpage #main-nav
+{
+ margin-top: 3.2em;
+}
+
+body.mappage #main-nav,
+{
+ // TODO would be better to edit containers to figure out where missing em is defined
+ margin-top: 2.2em;
+}
+
+body.fullwidthpage .container .content,
+body.twothirdswidthpage .container .content {
+ margin: 0;
+ padding-left: 0;
+ padding-right: 0;
+}
+
+@media only screen and (min-width: 48em) {
+ body.fullwidthpage .container .content {
+ margin-top: 3em; // push far enough for the sign-out link to also be visible
+ }
+}
+
+body.twothirdswidthpage .content aside {
+ margin-top: 2em;
+ @include box-shadow(none);
+}
+
+
+body.twothirdswidthpage form.full-width {
+ margin: 0;
+}
+
+body.mappage #main-nav {
+ ul#main-menu {
+ padding: 1em 0;
+ }
+}
+
+body.mappage #main-nav ul#main-menu li a, body.mappage #main-nav ul#main-menu li span {
+ padding: 0.75em;
+}
+
+body.mappage #main-nav ul#main-menu li a.report-a-problem-btn,
+#main-nav ul#main-menu li a.report-a-problem-btn {
+ margin: 0;
+ padding: 0.75em;
+}
+#main-nav ul#main-menu li a.report-a-problem-btn {
+ &:hover {
+ background: #444;
+ color: #fff;
+ @include border-radius(0em);
+ }
+}
+
+#main-nav {
+ ul#main-menu {
+ li {
+ a.report-a-problem-btn {
+ color: #000;
+ background: #ededed;
+ }
+ }
+ }
+}
+
+body.mappage .nav-wrapper .nav-wrapper-2 {
+ background: #fff;
+ border-bottom: solid 4px $primary;
+}
+
+.nav-wrapper .nav-wrapper-2 {
+ border-top: 0px;
+}
+
+#front-main {
+ background: none;
+ padding: 0;
+
+ #front-main-container {
+ background: $primary;
+ padding: 2em 0;
+ margin-bottom: 1.2em;
+ @include border-radius(12px);
+
+ #postcode-intro {
+ margin: 0 2em;
+ }
+ }
+
+}
+
+body.frontpage #user-meta p {
+ top: -2.4em;
+}
+
+body.mappage #user-meta {
+ top: 2em;
+ p {
+ background: $primary;
+ border-color: $primary_dark;
+ }
+}
+
+body.mappage .content {
+ margin-top: 4em;
+}
+
+
+body.twothirdswidthpage .container .content footer,
+body.fullwidthpage .container .content footer
+{
+ .tablewrapper {
+ width: 100%;
+ background: $primary;
+ @include border-radius(12px);
+ margin-bottom: 2em;
+
+ }
+}
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index 632385cac..607734c41 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -388,10 +388,11 @@ body.fullwidthpage {
.container {
.content {
box-shadow: none;
- padding: 1em 1em 0em;
+ padding: 1em;
margin-bottom: 0em;
footer {
margin-top: 0em;
+ margin-bottom: -1em;
.tablewrapper {
padding-top: 2em;
padding-bottom: 3em;
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index facb9d3f2..baa8d7810 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -227,10 +227,6 @@ function fixmystreet_onload() {
}
});
- if (fixmystreet.initial_hide_pins) {
- $('#hide_pins_link').click();
- }
-
$('#all_pins_link').click(function(e) {
e.preventDefault();
fixmystreet.markers.setVisibility(true);
diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js
index fc0afedc3..7ef222da7 100644
--- a/web/js/map-OpenStreetMap.js
+++ b/web/js/map-OpenStreetMap.js
@@ -8,7 +8,7 @@ function set_map_config(perm) {
//new OpenLayers.Control.LayerSwitcher(),
new OpenLayers.Control.Navigation(),
new OpenLayers.Control.PermalinkFMS(permalink_id),
- new OpenLayers.Control.PermalinkFMSz('osm_link', 'http://www.openstreetmap.org/'),
+ new OpenLayers.Control.PermalinkFMSz('osm_link', 'https://www.openstreetmap.org/'),
new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' })
];
}
@@ -31,9 +31,9 @@ OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, {
*/
initialize: function(name, options) {
var url = [
- "http://a.tile.openstreetmap.org/${z}/${x}/${y}.png",
- "http://b.tile.openstreetmap.org/${z}/${x}/${y}.png",
- "http://c.tile.openstreetmap.org/${z}/${x}/${y}.png"
+ "https://a.tile.openstreetmap.org/${z}/${x}/${y}.png",
+ "https://b.tile.openstreetmap.org/${z}/${x}/${y}.png",
+ "https://c.tile.openstreetmap.org/${z}/${x}/${y}.png"
];
options = OpenLayers.Util.extend({
/* Below line added to OSM's file in order to allow minimum zoom level */
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 14:57:29 +0000