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 93547a2078a69c34e03ea97c8ccdac115678b938..0a23207d55ab0972abe09c6fa4c2e4a544cef1f4 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -169,7 +169,7 @@ table {
   height: 100%;
   width: 185px;
   font-size: 11px;
-  line-height: 12px;
+  line-height: 1.1;
   z-index: 100;
   border-right: 1px solid #ccc;
 }
@@ -187,7 +187,7 @@ table {
 
 #logo h1 {
   font-size: 18px;
-  line-height: 20px;
+  line-height: 1.1;
   text-align: center;
   margin: 0px;
 }
@@ -262,8 +262,8 @@ table {
   left: 0px;
   margin: 0;
   padding: 5px 10px;
-  line-height: 15px;
   font-size: 12px;
+  line-height: 1.25;
   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;
-  line-height: 15px;
+  line-height: 1.1;
   height: 25px;
   padding: 2px 0px 2px 5px;
   box-shadow: inset #DDD 0px 1px 3px;
@@ -382,38 +382,26 @@ table {
 
 .donate {
   display: block;
-  position: relative;
   width: 153px;
   padding: 5px;
   border: 1px solid #AED1A0;
   background: #cbeea7;
-  line-height: 20px;
-  text-align: center;
   font-size: 14px;
+  line-height: 1.4;
+  text-align: center;
   border-radius: 2px;
-  -moz-border-radius: 2px;
   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 */
@@ -692,7 +680,12 @@ table {
 }
 
 .search_results_entry {
-  margin-bottom: 0 ;
+  margin-bottom: 0;
+
+  .search_details {
+    display: block;
+    text-align: right;
+  }
 }
 
 .search_results_entry .search_searching {
@@ -946,6 +939,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     background-color: #ffe0cc;
     margin: 0px;
     padding: 4px 6px;
+    max-width: 100%;
   }
   h4, p {
     margin-bottom: 5px;
@@ -1158,7 +1152,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
   h1, h2 {
     font-size: 21px;
-    line-height: 21px;
+    line-height: 1;
   }
   small.deemphasize {
     float: left;
@@ -1430,7 +1424,7 @@ p#contributorGuidance {
   vertical-align: top;
   font-weight: bold;
   font-size: 12px;
-  line-height: 20px;
+  line-height: 1.6666;
   text-align: right;
 }
 
@@ -1597,6 +1591,12 @@ a.button.submit {
     font-size: 14px;
   }
 
+  code {
+    font-size: 13px;
+    background: #e8e8e8;
+    padding: 2px 3px;
+  }
+
   img {
     padding: 20px;
     background-color: #f4f4ff;
@@ -1642,18 +1642,15 @@ a.button.submit {
 /* Rules for rich text editors */
 
 .richtext_container {
-  white-space: nowrap;
-
   .richtext_content {
     display: inline-block;
     vertical-align: top;
-    white-space: normal;
 
     .richtext_preview {
       display: inline-block;
       padding: 20px;
       background-color: #f4f4ff;
-      overflow-x: scroll;
+      overflow-x: auto;
 
       &.loading {
         background-image: image-url("loading.gif");
@@ -1673,7 +1670,7 @@ a.button.submit {
     margin-left: 15px;
     background-color: #f8f8ff;
     padding: 10px;
-    width: 200px;
+    max-width: 450px;
 
     ul {
       margin-bottom: 0;
@@ -1685,20 +1682,22 @@ a.button.submit {
       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 {
+      width: 35%;
       margin: 0;
-      float: left;
     }
 
-    li span {
-      float: right;
-      width: 50%;
+    li span, li p {
+      width: 60%;
       margin-left: 10px;
+      margin-bottom: 5px;
+      white-space: nowrap;
     }
 
     input.richtext_doedit,
@@ -1784,3 +1783,34 @@ a.button.submit {
     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;
+}