Merge remote branch 'origin/sweden-rebase'

Conflicts:
	bin/update-schema
	locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
	perllib/FixMyStreet/DB/Result/Body.pm

11 files changed, 201 insertions, 0 deletions

diff --git a/web/cobrands/fixamingata/_colours.scss b/web/cobrands/fixamingata/_colours.scss
new file mode 100644
index 000000000..31615c012
--- /dev/null
+++ b/web/cobrands/fixamingata/_colours.scss
@@ -0,0 +1,10 @@
+/* COLOURS */
+
+$primary: #00b1da;
+$primary_b: #0087a6;
+$primary_text: #222;
+
+$col_click_map: #00BD08;
+$col_click_map_dark: #4B8304;
+$col_fixed_label: #00BD08;
+$col_fixed_label_dark: #4B8304;
diff --git a/web/cobrands/fixamingata/base.scss b/web/cobrands/fixamingata/base.scss
new file mode 100644
index 000000000..73ef7ea13
--- /dev/null
+++ b/web/cobrands/fixamingata/base.scss
@@ -0,0 +1,31 @@
+/* Base stylesheet for FixMyStreet look
+ *
+ * In a mobile first way, this contains the look of the site, and a basic
+ * layout for browsers that can't handle media queries. Baseline grid of 1.5em.
+ */
+
+$image-sprite: '/cobrands/fixamingata/images/sprite.png';
+
+@import "../sass/h5bp";
+@import "./_colours";
+@import "../sass/mixins";
+@import "compass";
+
+@import "../sass/base";
+
+#site-header {
+    @include background(linear-gradient(#000, #ccc 10%, #ccc 90%, #000));
+}
+
+#site-logo {
+    width: 185px;
+    margin-top: 8px;
+    margin-left: 10px;
+    background: url('/cobrands/fixamingata/images/fms-logo.png') no-repeat;
+}
+
+#front-main {
+    a#geolocate_link {
+        font-size: 0.9em;
+    }
+}
diff --git a/web/cobrands/fixamingata/config.rb b/web/cobrands/fixamingata/config.rb
new file mode 100644
index 000000000..471b4b008
--- /dev/null
+++ b/web/cobrands/fixamingata/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 
\ No newline at end of file
diff --git a/web/cobrands/fixamingata/favicon.ico b/web/cobrands/fixamingata/favicon.ico
new file mode 100644
index 000000000..f7dfd0697
--- /dev/null
+++ b/web/cobrands/fixamingata/favicon.ico
diff --git a/web/cobrands/fixamingata/favicon.png b/web/cobrands/fixamingata/favicon.png
new file mode 100644
index 000000000..2c9ad9f68
--- /dev/null
+++ b/web/cobrands/fixamingata/favicon.png
diff --git a/web/cobrands/fixamingata/images/fms-logo.png b/web/cobrands/fixamingata/images/fms-logo.png
new file mode 100644
index 000000000..92634c173
--- /dev/null
+++ b/web/cobrands/fixamingata/images/fms-logo.png
diff --git a/web/cobrands/fixamingata/images/sprite.png b/web/cobrands/fixamingata/images/sprite.png
new file mode 100644
index 000000000..ebfd420b5
--- /dev/null
+++ b/web/cobrands/fixamingata/images/sprite.png
diff --git a/web/cobrands/fixamingata/images/tile-y-border.jpg b/web/cobrands/fixamingata/images/tile-y-border.jpg
new file mode 100644
index 000000000..cc679f5e1
--- /dev/null
+++ b/web/cobrands/fixamingata/images/tile-y-border.jpg
diff --git a/web/cobrands/fixamingata/images/tile-y.jpg b/web/cobrands/fixamingata/images/tile-y.jpg
new file mode 100644
index 000000000..1dfb6f017
--- /dev/null
+++ b/web/cobrands/fixamingata/images/tile-y.jpg
diff --git a/web/cobrands/fixamingata/images/tile.jpg b/web/cobrands/fixamingata/images/tile.jpg
new file mode 100644
index 000000000..3e6deaf2f
--- /dev/null
+++ b/web/cobrands/fixamingata/images/tile.jpg
diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss
new file mode 100644
index 000000000..8ff3cb443
--- /dev/null
+++ b/web/cobrands/fixamingata/layout.scss
@@ -0,0 +1,135 @@
+$image-sprite: '/cobrands/fixamingata/images/sprite.png';
+
+@font-face {
+  font-family: 'MuseoSans';
+  src: url('../fixmystreet/fonts/MuseoSans_300-webfont.eot');
+  src: url('../fixmystreet/fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fixmystreet/fonts/MuseoSans_300-webfont.woff') format('woff'),
+       url('../fixmystreet/fonts/MuseoSans_300-webfont.ttf') format('truetype'),
+       url('../fixmystreet/fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'MuseoSans';
+  src: url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.eot');
+  src: url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.woff') format('woff'),
+       url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'),
+       url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg');
+  font-weight: normal;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: 'MuseoSans';
+  src: url('../fixmystreet/fonts/MuseoSans_500-webfont.eot');
+  src: url('../fixmystreet/fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fixmystreet/fonts/MuseoSans_500-webfont.woff') format('woff'),
+       url('../fixmystreet/fonts/MuseoSans_500-webfont.ttf') format('truetype'),
+       url('../fixmystreet/fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg');
+  font-weight: bold;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'MuseoSans';
+  src: url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.eot');
+  src: url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.woff') format('woff'),
+       url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'),
+       url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg');
+  font-weight: bold;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: 'Museo300-display';
+  src: url('../fixmystreet/fonts/Museo300-Regular-webfont.eot');
+  src: url('../fixmystreet/fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fixmystreet/fonts/Museo300-Regular-webfont.woff') format('woff'),
+       url('../fixmystreet/fonts/Museo300-Regular-webfont.ttf') format('truetype'),
+       url('../fixmystreet/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 "../sass/layout";
+
+body {
+    background: #eee url(/cobrands/fixamingata/images/tile.jpg) 0 0 repeat;
+}
+
+.nav-wrapper {
+    .nav-wrapper-2 {
+        border-top: 0;
+    }
+}
+
+body.mappage {
+    .nav-wrapper {
+        .nav-wrapper-2 {
+            background: #eee;
+        }
+    }
+}
+
+#main-nav {
+    ul {
+        li {
+            a, span {
+                color: $primary_text;
+            }
+        }
+    }
+}
+
+#front-main {
+    background: $primary url(/cobrands/fixamingata/images/tile-y.jpg);
+}
+
+.tablewrapper {
+    >div {
+        width: auto;
+    }
+}
+.ie6, .ie7 {
+    .tablewrapper {
+        div {
+            width: auto;
+        }
+    }
+}
+
+#footer-help {
+    ul {
+        li {
+            width: 30%;
+            border-right: 1.25em solid transparent;
+            &:last-child {
+                border-left: none;
+            }
+        }
+    }
+}
+.ie6, .ie7 {
+    #footer-help {
+        ul {
+            li {
+                width: 33%;
+            }
+        }
+    }
+}