Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into js-validation

Conflicts:
	templates/web/default/common_header_tags.html

1 files changed, 0 insertions, 175 deletions

diff --git a/web/css/main.css b/web/css/main.css
deleted file mode 100644
index a3fe3b400..000000000
--- a/web/css/main.css
+++ /dev/null
@@ -1,175 +0,0 @@
-a:link {
-  color: #0000ff;
-}
-a:visited {
-  color: #000099;
-}
-a:hover, a:active {
-  color: #ff0000;
-}
-
-body {
-  font-family: "Gill Sans", "Gill Sans MT", Helvetica, Arial, sans-serif;
-  margin: 0;
-  padding: 0;
-}
-
-h1 {
-  margin: 0;
-  font-size: 175%;
-}
-
-h2 {
-  font-size: 140%;
-}
-
-select, input, textarea {
-  font-size: 99%;
-}
-
-#mysociety a.unsuitable-report {
-  font-size: small;
-}
-#mysociety blockquote {
-  border-left: solid 4px #5e552b;
-}
-#mysociety .a {
-  color: #000000;
-  background-color: #f3e5a5;
-}
-#mysociety #postcodeForm {
-  background-color: #e3d595;
-}
-#mysociety #front_stats div {
-  background-color: #e3d595;
-}
-#mysociety p.promo {
-  border-top: 1px solid #bbb;
-  border-bottom: 1px solid #bbb;
-  background-color: #eee;
-  text-align: center;
-  padding: 0 0.5em;
-}
-
-#header {
-  font-size: 200%;
-  font-weight: bold;
-  border-bottom: solid 2px #5e552b;
-  margin: 0;
-  padding: 0.15em 0.5em;
-  background-color: #e3d595;
-  color: #5e552b;
-}
-#header a:link, #header a:visited {
-  color: #5e552b;
-  background-color: #e3d595;
-  text-decoration: none;
-}
-#header a:active, #header a:hover {
-  text-decoration: underline;
-}
-
-#my {
-  color: #4e451b;
-  background-color: #e3d595;
-}
-
-#mysociety {
-  width: 100%;
-  /* Must specify a width or IE goes crazy wrong! */
-  position: relative;
-  margin: 0 auto;
-  max-width: 60em;
-  overflow: auto;
-}
-
-/* Can't put the margin in #mysociety because of above IE craziness */
-#wrapper {
-  margin: 1em 2em;
-}
-
-#meta {
-  list-style-type: none;
-  margin: 0.25em 0 0 1em;
-  padding: 0;
-  font-size: 0.875em;
-}
-#meta li {
-  display: inline;
-  margin: 0;
-  padding: 0 0 0 0.25em;
-  border-left: solid 1px #5e552b;
-}
-#meta li:first-child {
-  border-left: none;
-}
-
-.v {
-  display: none;
-}
-
-#navigation {
-  position: absolute;
-  top: 1em;
-  right: 1em;
-  padding: 0;
-  margin: 0;
-  list-style-type: none;
-}
-#navigation li {
-  display: inline;
-  padding: 0;
-  margin: 0;
-}
-#navigation a {
-  display: -moz-inline-box;
-  display: inline-block;
-  padding: 0.4em 1em;
-}
-#navigation a:link, #navigation a:visited {
-  color: #5e552b;
-}
-#navigation a:hover, #navigation a:active {
-  background-color: #5e552b;
-  color: #e3d595;
-  -moz-border-radius-topleft: 0.5em;
-  -webkit-border-top-left-radius: 0.5em;
-  border-radius-top-left: 0.5em;
-  -moz-border-radius-topright: 0.5em;
-  -webkit-border-top-right-radius: 0.5em;
-  border-radius-top-right: 0.5em;
-}
-
-#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: center;
-  border-top: solid 2px #ccc;
-  width: 50%;
-  margin: 1em auto 0;
-  padding: 0;
-  color: #333333;
-}
-#footer .l, #footer .r {
-  margin-top: 0;
-  text-align: left;
-  width: 45%;
-}
-#footer .l {
-  float: left;
-}
-#footer .r {
-  float: right;
-}