Layout cleanup

[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 3e239f9d49629915223cb088cf434f806e714b1d..4bb1586371e86bda0f85c13911f710bea5a2100d 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -48,6 +48,12 @@ abbr, acronym {
 
 /* Default rules for the body of every page */
 
 
 /* Default rules for the body of every page */
 

+* {
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+

 body {
   font-family: 'Helvetica Neue',Arial,sans-serif;
   font-size: 14px;
 body {
   font-family: 'Helvetica Neue',Arial,sans-serif;
   font-size: 14px;


@@ -87,7 +93,7 @@ h3 {
 h4,h5,h6 {
   font-size: 14px;
   margin-top: 10px;
 h4,h5,h6 {
   font-size: 14px;
   margin-top: 10px;

-  margin-bottom: 20px;
+  margin-bottom: 10px;

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


@@ -116,7 +122,7 @@ h6:first-child {
 
 .column-1 {
   width: 50%;
 
 .column-1 {
   width: 50%;

-  margin-bottom: 20px;
+  margin-bottom: 10px;

 }
 
 .small_icon {
 }
 
 .small_icon {


@@ -169,7 +175,7 @@ table {
   height: 100%;
   width: 185px;
   font-size: 11px;
   height: 100%;
   width: 185px;
   font-size: 11px;

-  line-height: 12px;
+  line-height: 1.1;

   z-index: 100;
   border-right: 1px solid #ccc;
 }
   z-index: 100;
   border-right: 1px solid #ccc;
 }


@@ -187,15 +193,15 @@ table {
 
 #logo h1 {
   font-size: 18px;
 
 #logo h1 {
   font-size: 18px;

-  line-height: 20px;
+  line-height: 1;

   text-align: center;
   text-align: center;

-  margin: 0px;
+  margin: 0;

 }
 
 #logo h2 {
   font-size: 10px;
   line-height: 15px;
 }
 
 #logo h2 {
   font-size: 10px;
   line-height: 15px;

-  margin: 0px;
+  margin: 0;

 }
 
 /* Rules for the site name */
 }
 
 /* Rules for the site name */


@@ -215,7 +221,6 @@ table {
 }
 
 .sidebar-copy.intro {
 }
 
 .sidebar-copy.intro {

-  margin-top: -1px;

   border-top: 1px solid #ccc;
 }
 
   border-top: 1px solid #ccc;
 }
 


@@ -229,7 +234,7 @@ table {
   padding: 5px;
   border-top: 1px solid #ccc;
   margin-top: 4px;
   padding: 5px;
   border-top: 1px solid #ccc;
   margin-top: 4px;

-  margin-bottom: -4px;
+  margin-bottom: -5px;

   background: #e00;
   font-size: 12px;
   font-weight: bold;
   background: #e00;
   font-size: 12px;
   font-weight: bold;


@@ -248,7 +253,7 @@ table {
   padding: 5px;
   border-top: 1px solid #ccc;
   margin-top: 4px;
   padding: 5px;
   border-top: 1px solid #ccc;
   margin-top: 4px;

-  margin-bottom: -4px;
+  margin-bottom: -5px;

   background: #ea0;
   font-size: 12px;
   p {
   background: #ea0;
   font-size: 12px;
   p {


@@ -262,8 +267,8 @@ table {
   left: 0px;
   margin: 0;
   padding: 5px 10px;
   left: 0px;
   margin: 0;
   padding: 5px 10px;

-  line-height: 15px;

   font-size: 12px;
   font-size: 12px;

+  line-height: 1.25;

   list-style-type: none;
   border-bottom: 1px solid #ccc;
   border-top: 1px solid #ccc;
   list-style-type: none;
   border-bottom: 1px solid #ccc;
   border-top: 1px solid #ccc;


@@ -335,14 +340,10 @@ table {
   width: 165px;
   padding: 3px;
   font-size: 14px;
   width: 165px;
   padding: 3px;
   font-size: 14px;

-  line-height: 15px;
+  line-height: 1.1;

   height: 25px;
   padding: 2px 0px 2px 5px;
   box-shadow: inset #DDD 0px 1px 3px;
   height: 25px;
   padding: 2px 0px 2px 5px;
   box-shadow: inset #DDD 0px 1px 3px;

-  box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -ms-box-sizing: border-box;

 }
 
 #search_field input[type="text"]:focus {
 }
 
 #search_field input[type="text"]:focus {


@@ -382,38 +383,26 @@ table {
 
 .donate {
   display: block;
 
 .donate {
   display: block;

-  position: relative;
-  width: 153px;
+  width: 164px;

   padding: 5px;
   border: 1px solid #AED1A0;
   background: #cbeea7;
   padding: 5px;
   border: 1px solid #AED1A0;
   background: #cbeea7;

-  line-height: 20px;
-  text-align: center;

   font-size: 14px;
   font-size: 14px;

+  line-height: 1.4;
+  text-align: center;

   border-radius: 2px;
   border-radius: 2px;

-  -moz-border-radius: 2px;

   color: #222;
   margin: 10px 10px 0px 10px;
   color: #222;
   margin: 10px 10px 0px 10px;

-}
-
-.donate:hover {
-  background: #9ed485;
-  text-decoration: none;
-}

 
 

-.donate p {
-  text-indent: 20px;
-  margin: 0;
-}
-
-.donate .donate-icon {
-  width: 15px;
-  height: 15px;
-  border: 0px;
-  background: image-url("sprite.png") 0 -30px no-repeat;
-  position: absolute;
-  top: 8px;
-  left: 17px;
+  &:hover {
+    background: #9ed485;
+    text-decoration: none;
+  }
+  span {
+    margin: 0;
+    padding-left: 18px;
+    background: image-url("sprite.png") 0 -29px no-repeat;
+  }

 }
 
 /* Rules for Creative Commons logo button */
 }
 
 /* Rules for Creative Commons logo button */


@@ -428,7 +417,7 @@ table {
 #top-bar {
   position: relative;
   margin-left: 185px;
 #top-bar {
   position: relative;
   margin-left: 185px;

-  height: 29px;
+  height: 30px;

   border-bottom: 1px solid #ccc;
   background: white;
   z-index: 100;
   border-bottom: 1px solid #ccc;
   background: white;
   z-index: 100;


@@ -443,7 +432,7 @@ table {
 }
 
 #tabnav {
 }
 
 #tabnav {

-  height: 29px;
+  height: 30px;

   margin-bottom:0;
   overflow: hidden;
 }
   margin-bottom:0;
   overflow: hidden;
 }


@@ -454,7 +443,6 @@ table {
 
 #tabnav a, #tabnav a:link, #tabnav a:visited {
   float: left;
 
 #tabnav a, #tabnav a:link, #tabnav a:visited {
   float: left;

-  background: #fff;

   font-weight: bold;
   padding: 3px 10px;
   text-decoration: none;
   font-weight: bold;
   padding: 3px 10px;
   text-decoration: none;


@@ -529,19 +517,21 @@ table {
 
 /* Rules for Leaflet maps */
 
 
 /* Rules for Leaflet maps */
 

-#permalink {
-  z-index: 10000;
-  position: absolute;
-  bottom: 0px;
-  right: 0px;
-  padding: 5px;
-  background:#fff;
-}
+.leaflet-control-attribution {
+  a.disabled {
+    color: #99c9dc;
+    cursor: default;
+    text-decoration: none;
+  }

 
 

-.leaflet-control-attribution a.disabled {
-  color: #99c9dc;
-  cursor: default;
-  text-decoration: none;
+  ul.secondary-actions {
+    float: left;
+    margin-right: 5px;
+
+    &:only-child {
+      margin-right: 0px;
+    }
+  }

 }
 
 .site-index .leaflet-top,
 }
 
 .site-index .leaflet-top,


@@ -563,6 +553,11 @@ table {
   border-top: 0px !important;
 }
 
   border-top: 0px !important;
 }
 

+.leaflet-popup-content-wrapper {
+  border-radius: 4px !important;
+  -webkit-border-radius: 4px !important;
+}
+

 /* Rules for edit menu */
 
 .menuicon {
 /* Rules for edit menu */
 
 .menuicon {


@@ -685,7 +680,12 @@ table {
 }
 
 .search_results_entry {
 }
 
 .search_results_entry {

-  margin-bottom: 0 ;
+  margin-bottom: 0;
+
+  .search_details {
+    display: block;
+    text-align: right;
+  }

 }
 
 .search_results_entry .search_searching {
 }
 
 .search_results_entry .search_searching {


@@ -776,12 +776,12 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   position: fixed;
   padding: 0;
   top: 30px; bottom: 0;
   position: fixed;
   padding: 0;
   top: 30px; bottom: 0;

-  left: 185px; right: 0;
+  left: 184px; right: 0;

   border-left: 1px solid #ccc;
 }
 
 .wrapper {
   border-left: 1px solid #ccc;
 }
 
 .wrapper {

-  margin-left: 185px;
+  margin-left: 184px;

   border-left: 1px solid #ccc;
   text-align: left;
 }
   border-left: 1px solid #ccc;
   text-align: left;
 }


@@ -858,7 +858,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .content_map {
   position: relative;
   width: 45%;
 .content_map {
   position: relative;
   width: 45%;

-  height: 398px;
+  height: 400px;

   border: 1px solid #ccc;
   margin-bottom: 20px;
   float: right;
   border: 1px solid #ccc;
   margin-bottom: 20px;
   float: right;


@@ -915,17 +915,31 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
 }
 
   }
 }
 

+#changeset_list_map_wrapper {
+  position: absolute;
+  width: 50%;
+  height: 490px;
+  top: 0;
+  right: 0;
+}
+
+#changeset_list_map_wrapper.scrolled {
+  position: fixed;
+}
+

 #changeset_list_map {
   position: absolute;
   bottom: 20px;
   top: 20px;
   right: 20px;
 #changeset_list_map {
   position: absolute;
   bottom: 20px;
   top: 20px;
   right: 20px;

-  width: 45%;
-  min-height: 398px;
-  max-height: 598px;
+  left: 20px;

   border: 1px solid #ccc;
 }
 
   border: 1px solid #ccc;
 }
 

+#changeset_list_map_wrapper.scrolled #changeset_list_map {
+  margin-left: 93px;
+}
+

 /* Rules for the data browser */
 
 .browse-section {
 /* Rules for the data browser */
 
 .browse-section {


@@ -935,18 +949,19 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   &:first-child {
     margin-top: 0;
   }
   &:first-child {
     margin-top: 0;
   }

-  &.warning {
-    color: #ff7070;
-    font-weight: bold;
-  }
-  div {
-    clear: left;
+  .warning {
+    background-color: #ffe0cc;
+    margin: 0px;
+    padding: 4px 6px;
+    max-width: 100%;

   }
   h4, p {
     margin-bottom: 5px;
   }
   }
   h4, p {
     margin-bottom: 5px;
   }

-  p, ul, .bbox {
-    margin-left: 33.3333%;
+  p, ul, .bbox, .geo {
+    display: inline-block;
+    vertical-align: top;
+    max-width: 65%;

   }
   ul p {
     margin-left: 0;
   }
   ul p {
     margin-left: 0;


@@ -954,7 +969,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
   h4 {
     width: 33.3333%;
   }
   h4 {
     width: 33.3333%;

-    float: left;
+    display: inline-block;
+    vertical-align: top;

   }
 }
 
   }
 }
 


@@ -1077,13 +1093,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 /* Rules for the user map */
 
 .content_map .leaflet-popup-content {
 /* Rules for the user map */
 
 .content_map .leaflet-popup-content {

-  margin: 10px 15px;
-  min-height: 62px;
-}
-
-.content_map .leaflet-popup-content-wrapper {
--webkit-border-radius: 4px;
-  border-radius: 4px;
+  margin: 10px;
+  min-height: 50px;

 }
 
 /* Rules for user popups on maps */
 }
 
 /* Rules for user popups on maps */


@@ -1093,17 +1104,14 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 .user_popup p {
 }
 
 .user_popup p {

-  padding-top: 3px;
-  padding-bottom: 3px;
-  margin-top: 0px;
-  margin-bottom: 0px;
-  margin-left: 55px;
-  margin-right: 2px;
+  padding-top:0;
+  padding-bottom: 5px;
+  margin-top: 0;

 }
 
 .user_popup img.user_thumbnail {
   float: left;
 }
 
 .user_popup img.user_thumbnail {
   float: left;

-  margin-right: 10px;
+  margin: 0 10px 0 0;

 }
 
 /* Rules for user popups on maps */
 }
 
 /* Rules for user popups on maps */


@@ -1144,7 +1152,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .diary_post {
   max-width: 740px;
   position: relative;
 .diary_post {
   max-width: 740px;
   position: relative;

-  margin-top: 20px;
+  margin-top: 10px;

   padding-top: 20px;
   border-top: 1px solid #ccc;
 
   padding-top: 20px;
   border-top: 1px solid #ccc;
 


@@ -1155,7 +1163,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
   h1, h2 {
     font-size: 21px;
   }
   h1, h2 {
     font-size: 21px;

-    line-height: 21px;
+    line-height: 1;

   }
   small.deemphasize {
     float: left;
   }
   small.deemphasize {
     float: left;


@@ -1183,7 +1191,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   #map {
     position: relative;
     width: 90%;
   #map {
     position: relative;
     width: 90%;

-    height: 398px;
+    height: 400px;

     border: 1px solid #ccc;
     display: none;
     margin-bottom: 20px;
     border: 1px solid #ccc;
     display: none;
     margin-bottom: 20px;


@@ -1263,8 +1271,8 @@ div#slim_content form#termsForm {
 
 p#contributorGuidance {
   background-color: #f4f4ff;
 
 p#contributorGuidance {
   background-color: #f4f4ff;

-  border-radius: 3px;
-  -moz-border-radius: 3px;
+  border-radius: 4px;
+  -moz-border-radius: 4px;

   margin-top: 20px;
   padding: 10px;
 }
   margin-top: 20px;
   padding: 10px;
 }


@@ -1281,8 +1289,8 @@ p#contributorGuidance {
 
 #accountForm .user_map {
   position: relative;
 
 #accountForm .user_map {
   position: relative;

-  width: 498px;
-  height: 398px;
+  width: 500px;
+  height: 400px;

   border: 1px solid #ccc;
 }
 
   border: 1px solid #ccc;
 }
 


@@ -1371,7 +1379,7 @@ p#contributorGuidance {
     background-color: #ff7070;
   }
   &#warning {
     background-color: #ff7070;
   }
   &#warning {

-    background-color: #fff6f0;
+    background-color: #ffe0cc;

   }
   &#notice {
     background-color: #CBEEA7;
   }
   &#notice {
     background-color: #CBEEA7;


@@ -1427,7 +1435,7 @@ p#contributorGuidance {
   vertical-align: top;
   font-weight: bold;
   font-size: 12px;
   vertical-align: top;
   font-weight: bold;
   font-size: 12px;

-  line-height: 20px;
+  line-height: 1.6666;

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


@@ -1466,8 +1474,8 @@ img.user_thumbnail {
 }
 
 img.user_thumbnail_tiny {
 }
 
 img.user_thumbnail_tiny {

-  max-width: 24px;
-  max-height: 24px;
+  max-width: 25px;
+  max-height: 25px;

   border: 1px solid #ccc;
 }
 
   border: 1px solid #ccc;
 }
 


@@ -1487,7 +1495,7 @@ abbr.geo {
 
 .rsssmall {
   position: relative;
 
 .rsssmall {
   position: relative;

-  top: 4px;
+  top: 5px;

 }
 
 /* General styles for action lists / subnavs / pager navs */
 }
 
 /* General styles for action lists / subnavs / pager navs */


@@ -1498,7 +1506,6 @@ ul.secondary-actions {
   margin-left: 0;
   &.pager {
     display: inline-block;
   margin-left: 0;
   &.pager {
     display: inline-block;

-    margin-bottom: 20px;

     margin-right: 60px;
   }
   li {
     margin-right: 60px;
   }
   li {


@@ -1594,14 +1601,18 @@ a.button.submit {
     font-size: 14px;
   }
 
     font-size: 14px;
   }
 

+  code {
+    font-size: 13px;
+    background: #e8e8e8;
+    padding: 2px 3px;
+  }
+

   img {
     padding: 20px;
     background-color: #f4f4ff;
     display: block;
     max-width: 100%;
     margin: auto;
   img {
     padding: 20px;
     background-color: #f4f4ff;
     display: block;
     max-width: 100%;
     margin: auto;

-    box-sizing: border-box;
-    -moz-box-sizing: border-box;

   }
 
   blockquote {
   }
 
   blockquote {


@@ -1639,18 +1650,15 @@ a.button.submit {
 /* Rules for rich text editors */
 
 .richtext_container {
 /* Rules for rich text editors */
 
 .richtext_container {

-  white-space: nowrap;
-

   .richtext_content {
     display: inline-block;
     vertical-align: top;
   .richtext_content {
     display: inline-block;
     vertical-align: top;

-    white-space: normal;

 
     .richtext_preview {
       display: inline-block;
       padding: 20px;
       background-color: #f4f4ff;
 
     .richtext_preview {
       display: inline-block;
       padding: 20px;
       background-color: #f4f4ff;

-      overflow-x: scroll;
+      overflow-x: auto;

 
       &.loading {
         background-image: image-url("loading.gif");
 
       &.loading {
         background-image: image-url("loading.gif");


@@ -1670,7 +1678,7 @@ a.button.submit {
     margin-left: 15px;
     background-color: #f8f8ff;
     padding: 10px;
     margin-left: 15px;
     background-color: #f8f8ff;
     padding: 10px;

-    width: 200px;
+    max-width: 450px;

 
     ul {
       margin-bottom: 0;
 
     ul {
       margin-bottom: 0;


@@ -1682,20 +1690,22 @@ a.button.submit {
       padding-bottom: 5px;
     }
 
       padding-bottom: 5px;
     }
 

-    li h4, li span {
-      display: block;
+    li h4, li span, li p {
+      display: inline-block;
+      vertical-align: top;

       font-size: 11px;
     }
 
     li h4 {
       font-size: 11px;
     }
 
     li h4 {

+      width: 35%;

       margin: 0;
       margin: 0;

-      float: left;

     }
 
     }
 

-    li span {
-      float: right;
-      width: 50%;
+    li span, li p {
+      width: 60%;

       margin-left: 10px;
       margin-left: 10px;

+      margin-bottom: 5px;
+      white-space: nowrap;

     }
 
     input.richtext_doedit,
     }
 
     input.richtext_doedit,


@@ -1723,21 +1733,47 @@ a.button.submit {
 
 /* Rules for the notes interface */
 
 
 /* Rules for the notes interface */
 

+.note {
+  padding-top: 10px;
+}
+

 .note {
   h2 {
     margin-bottom: 10px;
   }
 
 .note {
   h2 {
     margin-bottom: 10px;
   }
 

+  div {
+    margin-top: 10px;
+  }
+
+  .permalink {
+    position: absolute;
+    top: 5px;
+    left: 5px;
+    min-width: 15px;
+    min-height: 15px;
+    background: image-url("sprite.png") 0 -45px no-repeat;
+  }
+
+  .permalink span {
+    display: none;
+    padding-left: 20px;
+  }
+
+  .permalink:hover span {
+    display: block;
+  }
+

   .warning {
     display: block;
   .warning {
     display: block;

-    background-color: #ff7070;
+    background-color: #ffe0cc;

     padding: 4px 6px;
     margin-bottom: 10px;
   }
 
   .comment_body {
     padding: 4px 6px;
     margin-bottom: 10px;
   }
 
   .comment_body {

-    margin-top: 4px;
-    margin-bottom: 4px;
+    margin-top: 2px;
+    margin-bottom: 2px;

 
     p {
       margin-top: 0px;
 
     p {
       margin-top: 0px;


@@ -1747,6 +1783,7 @@ a.button.submit {
 
   .comment {
     width: 100%;
 
   .comment {
     width: 100%;

+    height: 100px;

   }
 
   .buttons {
   }
 
   .buttons {


@@ -1754,3 +1791,34 @@ a.button.submit {
     text-align: right;
   }
 }
     text-align: right;
   }
 }

+
+/*
+ * Rules for the iD editor
+ */
+.id-embed {
+  width: 100%;
+  height: 100%;
+}
+
+/* Rules for rotating sidebar ads */
+.ad-container {
+  display: block;
+  height: 120px;
+  overflow: hidden;
+  position: relative;
+  border-bottom: 1px solid #ccc;
+}
+
+.ads {
+  width: 370px;
+  position: absolute;
+  left: 0%;
+}
+
+.ad {
+  float: left;
+  height: 120px;
+  padding: 10px;
+  border: 0px;
+  background: #fff;
+}