Merge branch 'master' into openstreetbugs

[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 17f512e98d8f68917e0c0a1c1fe2e9337932f27e..f2f16ec85ec93e70a05bbada359a9f38229fcee0 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -179,14 +179,17 @@ h2 {
 /* Rules for SOTM advert */
 
 #sotm {
 /* Rules for SOTM advert */
 
 #sotm {

-  width: 180px;
-  min-width: 180px;
-  margin: 5px;
+  width: 165px;
+  margin: 10px;

   padding: 0px;
   border: 0px;
   background: #fff;
 }
 
   padding: 0px;
   border: 0px;
   background: #fff;
 }
 

+#sotm img {
+  width: 165px;
+}
+

 /*
  * Rules for "optional boxes" which appear in the left sidebar on
  * certain pages. Current users are the seach box on the main page
 /*
  * Rules for "optional boxes" which appear in the left sidebar on
  * certain pages. Current users are the seach box on the main page


@@ -715,6 +718,23 @@ table.browse_details th {
   white-space: nowrap;
 }
 
   white-space: nowrap;
 }
 

+td.browse_comments {
+  padding: 0px;
+}
+
+td.browse_comments table {
+  border-collapse: collapse;
+}
+
+td.browse_comments table td {
+  padding-bottom: 10px;
+}
+
+td.browse_comments table td span.by {
+  font-size: small;
+  color: #999999;
+}
+

 #browse_map {
   width: 250px;
 }
 #browse_map {
   width: 250px;
 }


@@ -884,6 +904,10 @@ p#contributorGuidance {
 
 /* Rules for the account settings page */
 
 
 /* Rules for the account settings page */
 

+#accountForm {
+  margin-top: 20px;
+}
+

 #accountForm td {
   padding-bottom: 10px;
 }
 #accountForm td {
   padding-bottom: 10px;
 }


@@ -968,6 +992,14 @@ p#contributorGuidance {
   font-weight: bold;
 }
 
   font-weight: bold;
 }
 

+.inbox-row .inbox-mark-read {
+  display: none;
+}
+
+.inbox-row-unread .inbox-mark-unread {
+  display: none;
+}
+

 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 #error {
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 #error {