Merge branch 'master' into notes

[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 654bbab970d4f9eb427f92598eb0197d13ca1ecf..413133e456d533a1c5ee3d0437795f01a9990bf0 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -454,6 +454,12 @@ body.site-export #tabnav a#exportanchor {
   padding: 5px;
 }
 
+#permalink a.disabled {
+  color: #ccc;
+  cursor: default;
+  text-decoration: none;
+}
+
 .site-index .leaflet-top,
 .site-export .leaflet-top {
   top: 40px !important;
@@ -821,6 +827,23 @@ table.browse_details th {
   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 {
   float: right;
   width: 250px;
@@ -1391,3 +1414,14 @@ abbr.geo {
     }
   }
 }
+
+/* Rules for the notes interface */
+
+.note {
+  width: 300px;
+
+  .buttons {
+    margin-top: 5px;
+    text-align: right;
+  }
+}