Fix overlapping text in markdown help

[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 0d12b758f5c2e304d6c735e05e59c14b6d6eca69..0a23207d55ab0972abe09c6fa4c2e4a544cef1f4 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -75,7 +75,7 @@ h1, h2 {
 }
 
 #content h2 {
 }
 
 #content h2 {

-  font-size: 24px;
+  font-size: 21px;

 }
 
 h3 {
 }
 
 h3 {


@@ -169,7 +169,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,7 +187,7 @@ table {
 
 #logo h1 {
   font-size: 18px;
 
 #logo h1 {
   font-size: 18px;

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

   text-align: center;
   margin: 0px;
 }
   text-align: center;
   margin: 0px;
 }


@@ -262,8 +262,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,7 +335,7 @@ 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;


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

-  position: relative;

   width: 153px;
   padding: 5px;
   border: 1px solid #AED1A0;
   background: #cbeea7;
   width: 153px;
   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 */


@@ -511,6 +499,7 @@ table {
 #greeting {
   float: right;
   padding-top: 3px;
 #greeting {
   float: right;
   padding-top: 3px;

+  margin-right: 5px;

 }
 
 .greeting-bar-unread {
 }
 
 .greeting-bar-unread {


@@ -528,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,


@@ -562,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 {


@@ -684,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 {


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

+  .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;


@@ -946,7 +955,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;

   }
 }
 
   }
 }
 


@@ -1073,11 +1083,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   min-height: 62px;
 }
 
   min-height: 62px;
 }
 

-.content_map .leaflet-popup-content-wrapper {
--webkit-border-radius: 4px;
-  border-radius: 4px;
-}
-

 /* Rules for user popups on maps */
 
 .user_popup {
 /* Rules for user popups on maps */
 
 .user_popup {


@@ -1134,6 +1139,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 .diary_post {
 }
 
 .diary_post {

+  max-width: 740px;

   position: relative;
   margin-top: 20px;
   padding-top: 20px;
   position: relative;
   margin-top: 20px;
   padding-top: 20px;


@@ -1146,15 +1152,12 @@ 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 {
   }
   small.deemphasize {

+    float: left;

     display: block;
   }
     display: block;
   }

-  ul,
-  ol {
-    font-style: italic;
-  }

   ul.secondary-actions { display: inline-block;}
 }
 
   ul.secondary-actions { display: inline-block;}
 }
 


@@ -1162,14 +1165,12 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   display: inline;
 }
 
   display: inline;
 }
 

-.post_heading {
+#content  .post_heading {

   margin-bottom: 20px;
   h2 {
     margin-top: 0;
   margin-bottom: 20px;
   h2 {
     margin-top: 0;

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

     font-size: 24px;
     font-size: 24px;

-    float: left;
-    line-height: 32px;

   }
 }
 
   }
 }
 


@@ -1189,8 +1190,13 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     padding-top: 20px;
     margin-top: 10px;
   }
     padding-top: 20px;
     margin-top: 10px;
   }

+  .comments {
+    max-width: 740px;
+  }

   .diary-comment {
     margin-top: 10px;
   .diary-comment {
     margin-top: 10px;

+    border-top: 1px dashed #ccc;
+    padding-top: 10px;

     &:first-child {
       margin-top: 20px;
       padding-top: 20px;
     &:first-child {
       margin-top: 20px;
       padding-top: 20px;


@@ -1198,7 +1204,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     }
     p {
       margin-bottom: 10px;
     }
     p {
       margin-bottom: 10px;

-      margin-left: 70px;

     }
     .comment-heading {
       margin-bottom: 0;
     }
     .comment-heading {
       margin-bottom: 0;


@@ -1363,7 +1368,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;


@@ -1419,7 +1424,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;
 }
 


@@ -1504,6 +1509,9 @@ ul.secondary-actions {
       border-left: 0;
       padding-left: 0;
     }
       border-left: 0;
       padding-left: 0;
     }

+    &:last-child {
+      margin-right: 0px;
+    }

   }
 }
 
   }
 }
 


@@ -1565,11 +1573,54 @@ a.button.submit {
 /* Rules for rich text */
 
 .richtext {
 /* Rules for rich text */
 
 .richtext {

-  ul,
-  ol {
+  h1, h2 {
+    padding-bottom: 10px;
+    border-bottom: 1px dashed #cccccc;
+    margin-bottom: 10px;
+  }
+
+  h1 {
+    font-size: 24px;
+  }
+
+  h2 {
+    font-size: 18px;
+  }
+
+  h3 {
+    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;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+  }
+
+  blockquote {
+    border-left: 20px solid #f4f4ff;
+    padding-left: 20px;
+    margin: 0;
+    color: #7E7E7E;
+  }
+
+  ul, ol {
+    font-style: italic;
+    padding-left: 20px;

     margin-bottom: 20px;
     margin-left: 20px;
   }
     margin-bottom: 20px;
     margin-left: 20px;
   }

+

   ul li {
     list-style: disc;
   }
   ul li {
     list-style: disc;
   }


@@ -1579,11 +1630,18 @@ a.button.submit {
   }
 }
 
   }
 }
 

+.diary_post .richtext {
+    margin-top: 20px;
+  }
+
+.comments .richtext {
+  margin-left: 70px;
+  margin-top: 0;
+}
+

 /* 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;


@@ -1592,7 +1650,7 @@ a.button.submit {
       display: inline-block;
       padding: 20px;
       background-color: #f4f4ff;
       display: inline-block;
       padding: 20px;
       background-color: #f4f4ff;

-      white-space: normal;
+      overflow-x: auto;

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


@@ -1611,33 +1669,40 @@ a.button.submit {
     vertical-align: top;
     margin-left: 15px;
     background-color: #f8f8ff;
     vertical-align: top;
     margin-left: 15px;
     background-color: #f8f8ff;

-    padding: 20px;
+    padding: 10px;
+    max-width: 450px;

 
 

-    p {
-      margin: 0px;
+    ul {
+      margin-bottom: 0;

     }
 
     }
 

-    th {
+    h4.heading, li {
+      border-bottom: 1px solid #ccc;
+      margin-bottom: 5px;
+      padding-bottom: 5px;
+    }
+
+    li h4, li span, li p {
+      display: inline-block;

       vertical-align: top;
       vertical-align: top;

-      text-align: left;
-      padding: 0px 15px 0px 0px !important;
+      font-size: 11px;

     }
 
     }
 

-    td {
-      font-family: fixed;
-      line-height: 16px;
-      text-align: left;
-      padding: 0px !important;
+    li h4 {
+      width: 35%;
+      margin: 0;

     }
 
     }
 

-    input.richtext_doedit {
-      margin-top: 5px !important;
-      margin-right: 10px !important;
+    li span, li p {
+      width: 60%;
+      margin-left: 10px;
+      margin-bottom: 5px;
+      white-space: nowrap;

     }
 
     }
 

+    input.richtext_doedit,

     input.richtext_dopreview {
     input.richtext_dopreview {

-      margin-top: 5px !important;
-      margin-left: 10px !important;
+      margin-right: 10px;

     }
   }
 }
     }
   }
 }


@@ -1661,9 +1726,46 @@ a.button.submit {
 /* Rules for the notes interface */
 
 .note {
 /* Rules for the notes interface */
 
 .note {

+  padding-top: 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;
+    background-color: #ffe0cc;
+    padding: 4px 6px;
+    margin-bottom: 10px;
+  }
+

   .comment_body {
   .comment_body {

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

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


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

+    height: 100px;

   }
 
   .buttons {
   }
 
   .buttons {


@@ -1680,3 +1783,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 #cccccc;
+}
+
+.ads {
+  width: 370px;
+  position: absolute;
+  left: 0%;
+}
+
+.ad {
+  float: left;
+  height: 100px;
+  padding: 10px;
+  border: 0px;
+  background: #fff;
+}