Merge branch 'master' into migrate_to_catalyst

Conflicts:
	.gitignore
	commonlib
	conf/packages
	perllib/FixMyStreet/Map.pm
	templates/website/cobrands/barnet/footer
	web/confirm.cgi
	web/css/core.css
	web/import.cgi
	web/index.cgi

1 files changed, 139 insertions, 0 deletions

diff --git a/web/css/_main.scss b/web/css/_main.scss
new file mode 100644
index 000000000..44fd82b3b
--- /dev/null
+++ b/web/css/_main.scss
@@ -0,0 +1,139 @@
+// Generics
+
+body {
+    font-family: "Gill Sans", "Gill Sans MT", Helvetica, Arial, sans-serif;
+    margin: 0;
+    padding: 0;
+    // color: #a9aeb0;
+}
+
+h1 {
+    margin: 0;
+    font-size: 175%;
+}
+h2 {
+    font-size: 140%;
+}
+
+select, input, textarea {
+    font-size: 99%;
+}
+
+#mysociety {
+
+    a.unsuitable-report {
+        font-size: small;
+    }
+
+    blockquote {
+        border-left: solid 4px $header_colour;
+    }
+
+    .a {
+        color: #000000;
+        background-color: $header_back_lighter;
+    }
+
+    #postcodeForm {
+        background-color: $header_back;
+    }
+
+    #front_stats div {
+        background-color: $header_back;
+    }
+
+}
+
+// Site layout
+
+#header {
+    font-size: 200%;
+    font-weight: bold;
+    border-bottom: solid 2px $header_colour;
+    margin: 0;
+    padding: 0.15em 0.5em;
+    background-color: $header_back;
+    color: $header_colour;
+
+    a:link, a:visited {
+        color: $header_colour;
+        background-color: $header_back;
+        text-decoration: none;
+    }
+    a:active, a:hover {
+        text-decoration: underline;
+    }
+}
+
+#my {
+    color: $header_darker;
+    background-color: $header_back;
+}
+
+#mysociety {
+    width: 100%; /* Must specify a width or IE goes crazy wrong! */
+    position: relative;
+    margin: 0 auto;
+    max-width: 60em;
+}
+
+/* Can't put the margin in #mysociety because of above IE craziness */
+#wrapper {
+    margin: 2em;
+}
+
+.v {
+    display: none;
+}
+
+#navigation {
+    position: absolute;
+    top: 1em;
+    right: 1em;
+    padding: 0;
+    margin: 0;
+    list-style-type: none;
+
+    li {
+        display: inline;
+        padding: 0;
+        margin: 0;
+    }
+
+    a {
+        display: -moz-inline-box;
+        display: inline-block;
+        padding: 0.4em 1em;
+    }
+    a:link, a:visited {
+        color: $header_colour;
+    }
+    a:hover, a:active {
+        background-color: $header_colour;
+        color: $header_back;
+    }
+}
+
+#nav_new a {
+    background-image: url("/i/new.png");
+    background-repeat: no-repeat;
+    background-position: 100% 0;
+}
+
+#logo {
+    border: none;
+    position: absolute;
+    top: 3.3em;
+    right: 10px;
+}
+
+#footer {
+    clear: both;
+    text-align: right;
+    font-size: 83%;
+    border-top: solid 1px $header_colour;
+    display: table;
+    margin: 2em 0 1em auto;
+    padding: 2px 4px;
+}
+