Frontpage redesign

[rails.git] / app / assets / stylesheets / common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index b2343795f0daa8a566ecffce2e183d524d34d39e..f9065266b89b84afe004841cb4b453303b62e03a 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -5,9 +5,14 @@ $typeheight: 14px;
 $offwhite: #f4f4ff;
 $blue: #7092FF;
 $lightblue: #B8C5F0;
 $offwhite: #f4f4ff;
 $blue: #7092FF;
 $lightblue: #B8C5F0;

-$grey: #AAA;
-$lightgrey: #CCC;
+$green: #7ebc6f;
+$grey: #CCC;
+$lightgrey: #EEE;
+$darkgrey: #AAA;

 $hovercolor: 20%;
 $hovercolor: 20%;

+$headerHeight: 75px;
+$sidebarWidth: 350px;
+$keyline: 1px solid $grey;

 
 /* Styles common to large and small screens */
 
 
 /* Styles common to large and small screens */
 


@@ -57,6 +62,38 @@ abbr, acronym {
     clear: both;
 }
 
     clear: both;
 }
 

+/* Basic grid */
+
+.col0    { float:left; width:04.1666%; }
+.col1    { float:left; width:08.3333%; }
+.col2    { float:left; width:16.6666%; }
+.col3    { float:left; width:25.0000%; }
+.col4    { float:left; width:33.3333%; }
+.col5    { float:left; width:41.6666%; }
+.col6    { float:left; width:50.0000%; }
+.col7    { float:left; width:58.3333%; }
+.col8    { float:left; width:66.6666%; }
+.col9    { float:left; width:75.0000%; }
+.col10   { float:left; width:83.3333%; }
+.col11   { float:left; width:91.6666%; }
+.col12   { width:100%; }
+
+.margin0  { margin-left:04.1666%; }
+.margin1  { margin-left:08.3333%; }
+.margin2  { margin-left:16.6666%; }
+.margin3  { margin-left:25.0000%; }
+.margin4  { margin-left:33.3333%; }
+.margin5  { margin-left:41.6666%; }
+.margin6  { margin-left:50.0000%; }
+.margin7  { margin-left:58.3333%; }
+.margin8  { margin-left:66.6666%; }
+.margin9  { margin-left:75.0000%; }
+.margin10 { margin-left:83.3333%; }
+.margin11 { margin-left:91.6666%; }
+.margin12 { margin-left:100.0000%; }
+
+.fillL { background-color: white; }
+

 /* Default rules for the body of every page */
 
 * {
 /* Default rules for the body of every page */
 
 * {


@@ -81,35 +118,19 @@ body.slim {
 }
 
 h1, h2, h3 {
 }
 
 h1, h2, h3 {

-  margin-top: $lineheight/2;
-  margin-bottom: $lineheight;

   font-weight: bold;
   line-height: 1.2;
 }
 
   font-weight: bold;
   line-height: 1.2;
 }
 

-h1, h2 {
-  font-size: 32px;
+h1 {
+  font-size: 18px;

 }
 
 }
 

-#content h2 {
-  font-size: 21px;
+h2, h3 {
+  font-size: 16px;

 }
 
 }
 

-h3 {
-  font-size: 21px;
-  margin-top: $lineheight/2;
-  margin-bottom: $lineheight;
-}
-
-h4,h5,h6 {
-  font-size: $typeheight;
-  margin-top: $lineheight/2;
-  margin-bottom: $lineheight/2;
-  font-weight: bold;
-  line-height: 1.5;
-}
-
-p, ul {
+p {

   margin-bottom: $lineheight;
 }
 
   margin-bottom: $lineheight;
 }
 


@@ -171,6 +192,7 @@ h6:first-child {
 .icon.close       { background-position: -200px 0; }
 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }
 .icon.close       { background-position: -200px 0; }
 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }

+.icon.gear        { background-position: -260px 0; }

 
 /* Rules for links */
 
 
 /* Rules for links */
 


@@ -210,192 +232,42 @@ table {
   }
 }
 
   }
 }
 

-/* Rules for the whole left sidebar, including the logo */
-
-#left {
-  position: absolute;
-  height: 100%;
-  width: 185px;
-  font-size: 11px;
-  line-height: 1.1;
-  z-index: 100;
-  border-right: 1px solid #ccc;
-}
-
-/* Rules for the OpenStreetMap logo in the top left corner */
-
-#logo {
-  display: block;
-  width: 170px;
-  min-width: 170px;
-  padding: $lineheight $lineheight/4;
-  text-align: center;
-  margin: auto;
-}
-
-#logo h1 {
-  font-size: 18px;
-  line-height: 1;
-  text-align: center;
-  margin: 0;
-}
-
-#logo h2 {
-  font-size: $lineheight/2;
-  line-height: 15px;
-  margin: 0;
-}
-
-/* Rules for the site name */
-
-#small-title {
-  display: none;
-}
-
-/* Rules for the introductory text displayed in the left sidebar to new users */
-
-.sidebar-copy {
-  padding: $lineheight/4 $lineheight/2;
-  p {
-    margin: $lineheight/4 0;
-  }
-}
-.sidebar-copy.intro {
-  border-top: 1px solid #ccc;
-}
-
-/*
- * Rules for alert boxes shown in the left sidebar when important
- * information needs to be conveyed such as when the site is
- * undergoing maintenance.
- */
-
-.sidebar-alert {
-  padding: $lineheight/4;
-  border-top: 1px solid #ccc;
-  margin-top: 4px;
-  margin-bottom: -5px;
-  background: #e00;
-  font-size: 12px;
-  font-weight: bold;
-  p {
-    margin: $lineheight/4;
-  }
-}
-
-/*
- * Rules for notice boxes shown in the left sidebar when important, but
- * non-critical information needs to be conveyed such as notices about
- * donation drives.
- */
-
-.sidebar-notice {
-  padding: $lineheight/4;
-  border-top: 1px solid #ccc;
-  margin-top: 4px;
-  margin-bottom: -5px;
-  background: #ea0;
-  font-size: 12px;
-  p {
-    margin: $lineheight/4;
-  }
-}
-
-/* Rules for the menu displayed in the left sidebar */
-
-.left_menu {
-  left: 0px;
-  margin: 0;
-  padding: $lineheight/4 $lineheight/2;
-  font-size: 12px;
-  line-height: 1.25;
-  list-style-type: none;
-  border-bottom: 1px solid #ccc;
-  border-top: 1px solid #ccc;
-  img {
-    margin: $lineheight/2 0px;
-  }
-
-  ul {
-    padding: 0;
-    margin: 0;
-  }
-
-  li {
-    list-style-type: none;
-    padding: 0;
-    margin: 0;
-  }
-
-  h4 {
-    padding: $lineheight/4 0 $lineheight/4 0;
-    font-size: 12px;
-    margin: 0;
-  }
-
-  li:last-child h4 {
-    padding-top: 0;
-  }
-}
-
-/*
- * Rules for "optional boxes" which appear in the left sidebar on
- * certain pages. Current users are the seach box on the main page
- * and the tag cloud on the traces pages.
- */
-
-.optionalbox {
-  left: 0px;
-  padding: $lineheight/4 $lineheight/2;
-  margin: $lineheight/4 0;
-  text-align: left;
-}
-

 /* Rules for the search box */
 
 /* Rules for the search box */
 

-#search_field {
+#search_form {

   position: relative;
   position: relative;

+  padding: $lineheight;
+  background-color: $lightgrey;
+  border-bottom: $keyline;

 
 

-  form {
-    width: 165px;
+  #query_wrapper {
+    overflow: hidden;

   }
 
   }
 

-  input[type="text"] {
-    width: 165px;
-    padding: 3px;
-    font-size: $typeheight;
-    line-height: 1.1;
-    height: 25px;
-    padding: 2px 0px 2px $lineheight/4;
-    box-shadow: inset #DDD 0px 1px 3px;
+  input {
+    width: 100%;
+    height: 30px;
+    border-right: none;
+    border-radius: 2px 0 0 2px;
+
+    transition: 300ms linear;
+    -webkit-transition: 300ms linear;
+    -moz-transition: 300ms linear;

   }
 
   }
 

-  input[type="text"]:focus {
+  input:focus {

     outline: none;
     outline: none;

-    border: 1px solid #000;
+    box-shadow: 0px 0px 7px #9ED485;

   }
 
   }
 

-  input[type="submit"] {
-    border: 0;
-    margin: 0;
-    padding: 0;
-    width: 15px;
-    height: 15px;
+  input[type=submit] {
+    float: right;
+    width: auto;

     min-width: 0;
     min-width: 0;

-    text-indent: -1000px;
-    overflow: hidden;
-    background: image-url("sprite.png") 0 0 no-repeat;
-    position: absolute;
-    top: $lineheight/4;
-    right: $lineheight/4;
-    cursor: pointer;
+    border-radius: 0 2px 2px 0;

   }
 }
 
   }
 }
 

-.search_help {
-  margin: $lineheight/4 0 0 0;
-}
-

 /* Utility for de-emphasizing content */
 
 .deemphasize {
 /* Utility for de-emphasizing content */
 
 .deemphasize {


@@ -418,7 +290,7 @@ a.donate {
   text-align: center;
   border-radius: 2px;
   color: #222;
   text-align: center;
   border-radius: 2px;
   color: #222;

-  margin: $lineheight/2 $lineheight/2 0px $lineheight/2;
+  margin: $lineheight/2 auto;

 
   &:hover {
     background: #9ed485;
 
   &:hover {
     background: #9ed485;


@@ -426,76 +298,144 @@ a.donate {
   }
 }
 
   }
 }
 

-/* Rules for Creative Commons logo button */
+/* Rules for the header */

 
 

-#cclogo {
-  margin: $lineheight/2 0;
-  float: right;
-}
+header {
+  height: $headerHeight;
+  position: relative;
+  border-bottom: $keyline;

 
 

-/* Rules for tabbed navigation bar */
+  h1, nav, nav > ul, nav > ul > li, .dropdown {
+    display: inline-block;
+  }

 
 

-#top-bar {
-  position: relative;
-  margin-left: 185px;
-  height: 30px;
-  border-bottom: 1px solid #ccc;
-  background: white;
-  z-index: 100;
-}
+  > * {
+    height: 100%;
+    padding: $lineheight;
+  }

 
 

-.site-edit #top-bar,
-.site-index #top-bar,
-.site-export #top-bar {
-  position: fixed;
-  left: 0;
-  right: 0;
+  h1, nav.primary {
+    float: left;
+  }
+
+  img.logo {
+    width: 30px;
+    height: 30px;
+    vertical-align: middle;
+  }
+
+  h1 {
+    margin: 0;
+    border-right: $keyline;
+  }

 }
 
 }
 

-#tabnav {
-  height: 29px;
-  margin-bottom:0;
-  overflow: hidden;
-  li {
-    display: inline;
+nav.primary {
+  > ul {
+    border: 1px solid darken($green, 20%);
+    border-radius: 4px;

   }
   }

-  a, a:link, a:visited {
-    float: left;
+
+  a.tab {
+    display: inline-block;

     font-weight: bold;
     font-weight: bold;

-    padding: 3px $lineheight/2;

     text-decoration: none;
     text-decoration: none;

-    color: #333;
-    float: left;
-    margin-right: 1px;
-    -webkit-transition: color 200ms ease-in;
-       -moz-transition: color 200ms ease-in;
-         -o-transition: color 200ms ease-in;
-            transition: color 200ms ease-in;
+    color: $green;
+    padding: 5px 15px;
+    border-right: 1px solid darken($green, 20%);

   }
   }

-}

 
 

-.site-index #tabnav a#viewanchor,
-.site-edit #tabnav a#editanchor,
-.changeset-list #tabnav a#historyanchor,
-.site-export #tabnav a#exportanchor {
-  border-bottom: 1px solid #aaa;
-  background: #9ed485;
-  color: #000;
+  #edit_tab a.tab {
+    border-right: 1px solid lighten($green, 20%);
+  }
+
+  .dropdown-toggle {
+    padding: 5px 10px 5px 5px;
+  }
+
+  .caret {
+    margin-top: 15px;
+    border-top-color: $green;
+  }
+
+  .disabled a {
+    color: #ccc;
+    cursor: default;
+
+    &:hover {
+      text-decoration: none;
+    }
+
+    .caret {
+      border-top-color: #ccc;
+    }
+  }

 }
 
 }
 

-#tabnav a:link:hover, #tabnav a:visited:hover {
-  text-decoration: underline;
+.site-index #view_tab,
+.changeset-list #history_tab,
+.site-export #export_tab,
+.site-edit #edit_tab {
+  background-color: $green;
+
+  .tab {
+    color: #fff;
+  }
+
+  .caret {
+    border-top-color: #fff;
+  }

 }
 
 }
 

-#tabnav a:link.disabled,
-#tabnav a:visited.disabled,
-#tabnav a:link:hover.disabled,
-#tabnav a:visited:hover.disabled {
-  color: #ccc;
-  cursor: default;
-  &:hover {
+nav.secondary {
+  position: absolute;
+  right: 0;
+
+  > ul a {
+    font-weight: bold;
+    text-decoration: none;
+    color: $darkgrey;
+    padding-right: 10px;
+  }
+
+  .dropdown {
+    border: 1px solid $grey;
+    border-radius: 4px;
+  }
+
+  img {
+    vertical-align: top;
+    border-radius: 2px 0 0 2px;
+    margin-right: 5px;
+  }
+
+  #inboxanchor {
+    display: inline-block;
+    position: relative;
+    height: 20px;
+    top: -2px;
+    margin: 0 2px 0 0;
+    padding: 0 5px 0 0;
+    border-radius: 2px;
+  }
+
+  .dropdown-toggle {
+    display: block;
+    padding: 3px 7px;
+    color: #000;

     text-decoration: none;
   }
     text-decoration: none;
   }

+
+  .dropdown-menu {
+    left: auto;
+    right: 0;
+
+    .count-number {
+      float: right;
+      padding: 0 5px;
+      margin: 0;
+    }
+  }

 }
 
 /* Utility for styling notification numbers */
 }
 
 /* Utility for styling notification numbers */


@@ -509,18 +449,6 @@ a.donate {
   color: #333;
 }
 
   color: #333;
 }
 

-/* Rules for greeting bar in the top right corner */
-
-#greeting {
-  float: right;
-  padding-top: 3px;
-  margin-right: $lineheight/4;
-}
-
-.greeting-bar-unread {
-  font-weight: bold;
-}
-

 /* Rules for the message shown in place of the map when javascript is disabled */
 
 #noscript {
 /* Rules for the message shown in place of the map when javascript is disabled */
 
 #noscript {


@@ -530,43 +458,138 @@ a.donate {
   left: 15px;
 }
 
   left: 15px;
 }
 

+/* Rules for bootstrap tooltips */
+
+.tooltip {
+  position: absolute;
+  display: none;
+  color: #333;
+  text-align: left;
+  font-size: 12px;
+  max-width: 250px;
+}
+
+.tooltip.in {
+  opacity: 0.8;
+  z-index: 1030;
+  height: auto;
+  display: block;
+}
+
+.tooltip.top {
+  margin-top: -10px;
+  text-align: center;
+}
+
+.tooltip.right {
+  margin-left: 10px;
+}
+
+.tooltip.bottom {
+  margin-top: 10px;
+  text-align: center;
+}
+
+.tooltip.left {
+  margin-left: -10px;
+  text-align: right;
+}
+
+.tooltip-inner {
+  display: inline-block;
+  padding: 10px;
+  font-weight: normal;
+  background-color: white;
+}
+
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+
+.tooltip.top .tooltip-arrow {
+  bottom: -5px;
+  left: 50%;
+  margin-left: -5px;
+  border-top-color: white;
+  border-width: 5px 5px 0;
+}
+
+.tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: -5px;
+  margin-top: -5px;
+  border-right-color: white;
+  border-width: 5px 5px 5px 0;
+}
+
+.tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: -5px;
+  margin-top: -5px;
+  border-left-color: white;
+  border-width: 5px 0 5px 5px;
+}
+
+.tooltip.bottom .tooltip-arrow {
+  top: -5px;
+  left: 50%;
+  margin-left: -5px;
+  border-bottom-color: white;
+  border-width: 0 5px 5px;
+}
+

 /* Rules for Leaflet maps */
 
 .leaflet-control .control-button {
   display: block;
   height: 40px;
   width: 40px;
 /* Rules for Leaflet maps */
 
 .leaflet-control .control-button {
   display: block;
   height: 40px;
   width: 40px;

-  background-color: white;
-  background-color: rgba(255,255,255,.8);
-  border-radius: 4px;
+  background-color: #333;
+  background-color: rgba(0,0,0,.6);
+  -bottom: 1px solid #333; 
+  border-radius: 4px 0 0 4px;

   margin-bottom: 10px;
   outline: none;
   margin-bottom: 10px;
   outline: none;

+
+  &:hover {
+    background-color: black;
+  }
+
+  &.active {
+    background-color: #9ed485;
+  }
+
+  &.disabled {
+    background-color: #333;
+    background-color: rgba(0,0,0,.5);
+    cursor: default;
+  }
+
+  .icon {
+    margin: 10px;
+  }

 }
 
 .leaflet-control .zoomin,
 .control-layers .control-button {
   margin-bottom: 0px;
 }
 
 .leaflet-control .zoomin,
 .control-layers .control-button {
   margin-bottom: 0px;

-  border-radius: 4px 4px 0px 0px;
+  border-radius: 4px 0 0 0;

 }
 
 .site .leaflet-control .zoomout,
 .control-key .control-button {
 }
 
 .site .leaflet-control .zoomout,
 .control-key .control-button {

-  margin-bottom: 0px;
-  border-radius: 0px;
+  margin-bottom: 0;
+  border-radius: 0;

 }
 
 }
 

-.leaflet-control .zoomout,
+.leaflet-control .zoomout, // For non-main page maps

 .control-locate .control-button,
 .control-share .control-button {
 .control-locate .control-button,
 .control-share .control-button {

-  border-radius: 0px 0px 4px 4px;
-}
-
-.leaflet-control .control-button:hover {
-  background-color: white;
-}
-
-.leaflet-control .control-button .icon {
-  margin: 10px;
+  border-radius: 0 0 0 4px;

 }
 
 /* Rules for the home page */
 }
 
 /* Rules for the home page */


@@ -585,7 +608,6 @@ a.donate {
   width: 250px;
   height: 100%;
   background: white;
   width: 250px;
   height: 100%;
   background: white;

-  border-left: 1px solid #CCC;

   overflow: auto;
 
   .section {
   overflow: auto;
 
   .section {


@@ -603,11 +625,14 @@ a.donate {
   }
 }
 
   }
 }
 

-.layers-ui {
-  ul, li:last-child {
+.layers-ui,
+.share-ui {
+  ul, li:last-child, p:last-child {

     margin-bottom: 0;
   }
     margin-bottom: 0;
   }

+}

 
 

+.layers-ui {

   li {
     border-radius: 4px;
     overflow: hidden;
   li {
     border-radius: 4px;
     overflow: hidden;


@@ -632,21 +657,67 @@ a.donate {
       cursor: pointer;
     }
   }
       cursor: pointer;
     }
   }

-}
+}
+
+.share-ui {
+  .share-tabs {
+    margin-bottom: 10px;
+
+    a {
+      color: #fff;
+      text-decoration: none;
+      background-color: $lightblue;
+      padding: 5px 10px;
+    }
+
+    a:first-child {
+      border-right: 1px solid #fff;
+      border-radius: 4px 0 0 4px;
+    }
+
+    a:last-child {
+      border-left: 1px solid #fff;
+      border-radius: 0 4px 4px 0;
+    }
+
+    a.active {
+      background-color: $blue;
+    }
+  }
+
+  .share-tab {
+    display: none;
+  }
+
+  .share-link {
+    input[type=text],
+    textarea {
+      width: 100%;
+      font-family: monospace;
+      font-size: small;
+      line-height: 1.3;
+    }
+  }
+
+  .share-image {
+    label {
+      margin-right: 10px;
+    }
+  }

 
 

-.share-ui {
-  .share-link {
-    li {
-      display: inline-block;
-      width: 50%;
-    }
+  #embed_html {
+    resize: vertical;
+  }
+
+  #mapnik_scale {
+    width: 100px;

   }
 }
 
   }
 }
 

-.site-index .leaflet-top,
-.site-export .leaflet-top {
-  top: $lineheight/2 !important;
+.leaflet-top.leaflet-right {
+  top: 10px !important;

   .leaflet-control {
   .leaflet-control {

+    margin-right: 0px !important;

     margin-top: 0px !important;
   }
 }
     margin-top: 0px !important;
   }
 }


@@ -664,15 +735,6 @@ a.donate {
 
 /* Rules for edit menu */
 
 
 /* Rules for edit menu */
 

-.menuicon {
-  padding: 0 $lineheight/4;
-  font-weight: normal;
-  display: inline-block;
-  &:hover {
-    text-decoration: none !important;
-  }
-}
-

 .menu {
   display: none;
   z-index: 10000;
 .menu {
   display: none;
   z-index: 10000;


@@ -705,25 +767,39 @@ a.donate {
   text-align: center;
 }
 
   text-align: center;
 }
 

-/* Rules for the popout map sidebar */
+/* Rules for the sidebar */

 
 #sidebar {
 
 #sidebar {

-  display: none;
-  position: relative;
-  float: left;
-  border-right: 1px solid $lightgrey;
-  width: 33.3333%;
-  height: 100%;
-  ul {
-    margin-bottom: 0;
-    &:last-child {
-        border-bottom: 1px solid #ccc;
-    }
-    li {
-      margin-bottom: $lineheight/4;
-      &:last-child {
-        margin-bottom: 0;
-      }
+  .alert {
+    background: #e00;
+  }
+
+  h2, h3, h4 {
+    padding: $lineheight;
+    border-bottom: $keyline;
+  }
+
+  .icon.close {
+    position: absolute;
+    right: $lineheight;
+  }
+
+  p {
+    padding: $lineheight;
+    margin: 0;
+  }
+
+  .footer {
+    position: absolute;
+    bottom: 0;
+  }
+
+  p.credits {
+    font-size: 11px;
+    color: #999;
+
+    a {
+      color: #666;

     }
   }
 }
     }
   }
 }


@@ -731,7 +807,6 @@ a.donate {
 .sidebar_heading {
   position: relative;
   padding: $lineheight/2 $lineheight;
 .sidebar_heading {
   position: relative;
   padding: $lineheight/2 $lineheight;

-  z-index: 9999;

   background: $offwhite;
   border-bottom: 1px solid #ccc;
   h4 {
   background: $offwhite;
   border-bottom: 1px solid #ccc;
   h4 {


@@ -749,17 +824,11 @@ a.donate {
 }
 
 #sidebar_content {
 }
 
 #sidebar_content {

-  position: relative;
-  margin-bottom: 20px;
-  overflow: auto;
-  height: 100%;
+  position: absolute;
+  top: 72px;
+  bottom: 0;

   width: 100%;
   width: 100%;

-  h4 {
-    padding: 0 $lineheight $lineheight/2 $lineheight;
-    margin-top: $lineheight/2;
-    margin-bottom: 0;
-    border-bottom: 1px solid #ddd;
-  }
+  overflow-y: auto;

 }
 
 /* Rules for the map key which appears in the popout sidebar */
 }
 
 /* Rules for the map key which appears in the popout sidebar */


@@ -787,7 +856,10 @@ a.donate {
 
   .search_details {
     display: block;
 
   .search_details {
     display: block;

+    float: right;

     text-align: right;
     text-align: right;

+    margin-top: 0.2em;
+    margin-left: 0.5em;

   }
 }
 
   }
 }
 


@@ -851,45 +923,98 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   margin: $lineheight/4;
 }
 
   margin: $lineheight/4;
 }
 

-.export_details input[type="text"]#export_html_text {
-  width: 100%;
+/* Rules for the sidebar and main content area */
+
+.site-index,
+.site-export,
+.site-edit {
+  #content {
+    position: absolute;
+    top: $headerHeight;
+    bottom: 0;
+    width: 100%;
+  }
+
+  #sidebar, #map {
+    position: relative;
+    height: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+  }
+
+  #sidebar {
+    float: left;
+    width: $sidebarWidth;
+  }

 }
 
 }
 

-#sidebar #marker_inputs li:last-child {
-  margin-bottom: $lineheight/2;
+.content-heading {
+  position: relative;
+  padding: $lineheight;
+  background: $lightgrey;
+  border-bottom: $keyline;

 }
 
 }
 

-#export_osm,
-#export_mapnik,
-#export_osmarender {
-  display: none;
+.content-body {
+  padding: $lineheight;

 }
 
 }
 

-/* Rules for the main content area */
+/* Overrides for pages that use new layout conventions */

 
 

-#content {
-  padding: $lineheight;
-  position: relative;
+.user-new,
+.user-create,
+.user-terms,
+.user-confirm {
+  .content-heading {
+    height: 200px;
+  }

 }
 
 }
 

-.site-edit #content,
-.site-index #content,
-.site-export #content {
-  position: fixed;
-  padding: 0;
-  top: 30px; bottom: 0;
-  left: 184px; right: 0;
-  border-left: 1px solid #ccc;
+.user-new,
+.user-create,
+.user-terms {
+  .content-body {
+    padding: 0;
+  }
+}
+
+.header-illustration {
+  background-position: 0 0;
+  background-repeat: no-repeat;
+  position: absolute;
+  height: 200px;
+  width: 100%;
+  left: 0;
+  bottom: 0;
+
+  &.new-user-main {
+    background-image: image-url("sign-up-illustration.png");
+  }
+
+  &.confirm-main {
+    background-image: image-url("confirm-illustration.png");
+  }
+
+  &.new-user-terms {
+    background-image: image-url("terms-illustration.png");
+  }
+
+  &.new-user-arm {
+    height: 110px;
+    width: 130px;
+    left: 260px;
+    top: 160px;
+    background-image: image-url("sign-up-illustration-arm.png");
+  }

 }
 
 }
 

+@media only screen and (max-width:900px) {
+  .header-illustration.new-user-arm { display: none;}

 .wrapper {
 .wrapper {

-  margin-left: 184px;
-  border-left: 1px solid #ccc;
+  margin-left: $sidebarWidth;

   text-align: left;
 }
 
   text-align: left;
 }
 

-.site-edit #content {
-  top: 30px;

 }
 
 #content.maximised {
 }
 
 #content.maximised {


@@ -937,23 +1062,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
 }
 
   }
 }
 

-.content-heading {
-  position: relative;
-  padding: $lineheight;
-  background: $offwhite;
-  h1, h2 {
-    margin-bottom: $lineheight/2;
-    line-height: 100%;
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-  p {
-    margin-top: $lineheight/2;
-    margin-bottom: 0px;
-  }
-}
-

 /* Rules for small maps in content areas */
 
 .content_map {
 /* Rules for small maps in content areas */
 
 .content_map {


@@ -1071,11 +1179,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
 }
 
   }
 }
 

-#browse_map .geolink {
-  display: none;
-}
-

 #browse_map .secondary-actions {
 #browse_map .secondary-actions {

+  display: none;

   margin-bottom: $lineheight/2;
 }
 
   margin-bottom: $lineheight/2;
 }
 


@@ -1299,7 +1404,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   float: left;
 }
 
   float: left;
 }
 

-/* Rules for the login page */
+/* Rules for the log in page */

 
 #login_openid_buttons {
   margin-bottom: 0;
 
 #login_openid_buttons {
   margin-bottom: 0;


@@ -1312,7 +1417,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 /* Rules for the account confirmation page */
 
 
 /* Rules for the account confirmation page */
 

-#terms {
+.user-terms {

   .legale {
     border: 1px solid #ccc;
     padding: $lineheight;
   .legale {
     border: 1px solid #ccc;
     padding: $lineheight;


@@ -1334,27 +1439,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     }
   }
 
     }
   }
 

-  form.sign {
-    input[type=submit] {
-      float: left;
-    }
-    #decline {
-      background: $grey;
-      &:hover {
-        background: darken($grey, $hovercolor);
-      }
+  #decline {
+    background: $lightblue;
+    &:hover {
+      background: darken($lightblue, $hovercolor);

     }
   }
     }
   }

-  fieldset {
-    margin-bottom: $lineheight;
-  }
-  #contributorGuidance {
-    background-color: $offwhite;
-    border-radius: 4px;
-    -moz-border-radius: 4px;
-  }
-  .signing-buttons {
-    height: 50px;
+
+  .form-row {
+    margin: auto;
+    max-width: 370px;

   }
 }
 
   }
 }
 


@@ -1506,7 +1600,17 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .field_with_errors {
   padding: 2px;
   background-color: #ff7070;
 .field_with_errors {
   padding: 2px;
   background-color: #ff7070;

-  display: table;
+  display: inline-block;
+}
+
+.formError {
+  display: inline-block;
+  padding: 5px 10px;
+  margin-top: 5px;
+  border-radius: 4px;
+  font-size: 12px;
+  color: #fff;
+  background-color: #ff7070;

 }
 
 /* Rules for rails validation error boxes */
 }
 
 /* Rules for rails validation error boxes */


@@ -1573,6 +1677,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     padding-top: $lineheight;
     border-top: 1px solid $lightgrey;
   }
     padding-top: $lineheight;
     border-top: 1px solid $lightgrey;
   }

+  .horizontal-list .form-row { 
+    float: left;
+    padding-right: 10px;
+  }

   .form-row {
     margin-bottom: $lineheight/2;
   }
   .form-row {
     margin-bottom: $lineheight/2;
   }


@@ -1612,7 +1720,6 @@ textarea {
 textarea {
   padding: 5px;
   width: 100%;
 textarea {
   padding: 5px;
   width: 100%;

-  height: 100% !important;

 }
 
 /* Rules for user images */
 }
 
 /* Rules for user images */


@@ -1668,7 +1775,7 @@ ul.secondary-actions {
     display: inline-block;
     margin-right: 60px;
   }
     display: inline-block;
     margin-right: 60px;
   }

-  li {
+  > li {

     display: block;
     float: left;
     list-style: none;
     display: block;
     float: left;
     list-style: none;


@@ -1683,6 +1790,10 @@ ul.secondary-actions {
       margin-right: 0px;
     }
   }
       margin-right: 0px;
     }
   }

+  .dropdown-menu {
+    left: auto;
+    right: 0;
+  }

 }
 
 /* Utility for managing inner content areas */
 }
 
 /* Utility for managing inner content areas */


@@ -1693,6 +1804,8 @@ ul.secondary-actions {
 
 .inner11 { padding: $lineheight/2;}
 
 
 .inner11 { padding: $lineheight/2;}
 

+.inner20 { padding: $lineheight 0;}
+

 .inner02 { padding: 0 $lineheight;}
 
 /* Utility for general button styles */
 .inner02 { padding: 0 $lineheight;}
 
 /* Utility for general button styles */


@@ -1746,8 +1859,11 @@ a.button {
     border-radius: 0;
     margin:0;
     min-width: 100px;
     border-radius: 0;
     margin:0;
     min-width: 100px;

-    max-width: 150px;
+    max-width: 180px;

     border-right:1px solid white;
     border-right:1px solid white;

+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;

   }
   input:first-child,
   .button:first-child {
   }
   input:first-child,
   .button:first-child {


@@ -1852,7 +1968,6 @@ a.button {
   }
 
   ul, ol {
   }
 
   ul, ol {

-    font-style: italic;

     padding-left: $lineheight;
     margin-bottom: $lineheight;
     margin-left: $lineheight;
     padding-left: $lineheight;
     margin-bottom: $lineheight;
     margin-left: $lineheight;


@@ -2021,6 +2136,7 @@ a.button {
 /*
  * Rules for the iD editor
  */
 /*
  * Rules for the iD editor
  */

+

 .id-embed {
   width: 100%;
   height: 100%;
 .id-embed {
   width: 100%;
   height: 100%;


@@ -2030,13 +2146,228 @@ a.button {
 .ad-container {
   display: block;
   height: 120px;
 .ad-container {
   display: block;
   height: 120px;

+  margin: auto;

   overflow: hidden;
   position: relative;
   border-bottom: 1px solid #ccc;
   overflow: hidden;
   position: relative;
   border-bottom: 1px solid #ccc;

+
+  a {
+    display: block;
+    width: 165px;
+    margin: auto;
+  }
+
+  .ad {
+    height: 100px;
+    border: 0;
+    background: #fff;
+  }

 }
 
 }
 

-.ad {
-  height: 100px;
-  border: 0;
-  background: #fff;
+/* Rules for dropdown menus */
+
+.dropdown {
+  position: relative;
+}
+
+.dropdown-toggle {
+  *margin-bottom: -3px;
+}
+
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}
+
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  vertical-align: top;
+  border-top: 4px solid #000000;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+  content: "";
+}
+
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 0;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.dropdown-menu .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.dropdown-menu > li > a {
+  display: block;
+  padding: 3px 10px;
+  clear: both;
+  font-weight: normal;
+  line-height: 20px;
+  color: #333333;
+  white-space: nowrap;
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+}
+
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+  outline: 0;
+}
+
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: #999999;
+}
+
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+  background-image: none;
+}
+
+.open {
+  *z-index: 1000;
+}
+
+.open > .dropdown-menu {
+  display: block;
+}
+
+.dropdown-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 990;
+}
+
+/* Rules for the "Welcome" page */
+.site-welcome {
+  .center {
+    text-align: center;
+    .sprite { 
+      float: none;
+      margin: auto;
+    }
+  }
+
+  .sprite {
+    background-image: image-url("welcome-sprite.png");
+    background-size: 500px 250px;
+    display: block;
+    float: left;
+  }
+
+  .icon-list { 
+    padding-bottom: 20px;
+    div {
+      margin-bottom: 10px;
+      p {
+        padding-top: 10px;
+      }
+    }
+  }
+  .sprite.small {
+    width: 50px;
+    height: 50px;
+  }
+
+  .sprite.x {
+    background-position: -50px 0;
+  }
+
+  .sprite.term {
+    margin-right: 10px;
+    vertical-align: middle;
+  }
+
+  .sprite.node {
+    background-position: -100px 0;
+  }
+
+  .sprite.way {
+    background-position: -150px 0;
+  }
+
+  .sprite.tag {
+    background-position: -200px 0;
+  }
+
+  .sprite.editor {
+    background-position: -250px 0;
+  }
+
+  .sprite.question {
+    background-position: -300px 0;
+  }
+
+  .start-mapping {
+    margin: auto;
+    cursor: pointer;
+    border: none;
+    padding: 20px 40px;
+    font-size: 30px;
+    text-decoration: none;
+  }
+
+  .note-box {
+    margin-top: 20px;
+    background-color: $offwhite;
+  }
+
+  .icon.note {
+    background-color: #333;
+    border-radius: 4px;
+  }

 }
 }