Include the event type in the JSON output of a note

[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 04ee87d9f57b019d43132cbb099c6f59b464b50d..42b5f539737624b23c6f7acac32477f6901749ae 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -36,6 +36,8 @@ hr {
   height: 1px;
 }
 
   height: 1px;
 }
 

+/* Default rules for headings */
+

 h2 {
   margin: 5px 0;
   font-size: 25px;
 h2 {
   margin: 5px 0;
   font-size: 25px;


@@ -48,6 +50,8 @@ h2 {
   position: absolute;
   top: 0px;
   width: 185px;
   position: absolute;
   top: 0px;
   width: 185px;

+  font-size: 11px;
+  line-height: 12px;

 }
 
 /* Rules for the OpenStreetMap logo in the top left corner */
 }
 
 /* Rules for the OpenStreetMap logo in the top left corner */


@@ -82,8 +86,6 @@ h2 {
 /* Rules for the introductory text displayed in the left sidebar to new users */
 
 #intro {
 /* Rules for the introductory text displayed in the left sidebar to new users */
 
 #intro {

-  font-size: 11px;
-  line-height: 12px;

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


@@ -130,7 +132,7 @@ h2 {
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {

-  padding: 10px;
+  padding: 5px;

   margin: 4px 0;
   border-top: 1px solid #ccc;
   border-bottom: 1px solid #ccc;
   margin: 4px 0;
   border-top: 1px solid #ccc;
   border-bottom: 1px solid #ccc;


@@ -139,10 +141,6 @@ h2 {
   font-weight: bold;
 }
 
   font-weight: bold;
 }
 

-.left_menu td {
-  font-size: 12px;
-}
-

 .left_menu h1 {
   font-style: normal;
   font-size: 15px;
 .left_menu h1 {
   font-style: normal;
   font-size: 15px;


@@ -183,8 +181,6 @@ h2 {
   padding: 5px;
   margin: 4px 0;
   border-top: 1px solid #ccc;
   padding: 5px;
   margin: 4px 0;
   border-top: 1px solid #ccc;

-  line-height: 15px;
-  font-size: 12px;

 }
 
 .optionalbox h1 {
 }
 
 .optionalbox h1 {


@@ -224,8 +220,6 @@ h2 {
 }
 
 .search_help {
 }
 
 .search_help {

-  font-size: 10px;
-  line-height: 15px;

   margin-top: 2px;
   margin-bottom: 0px;
 }
   margin-top: 2px;
   margin-bottom: 0px;
 }


@@ -254,11 +248,15 @@ h2 {
 
 /* Rules for tabbed navigation bar */
 
 
 /* Rules for tabbed navigation bar */
 

+#top-bar {
+  border-bottom: 1px solid #ccc;
+  height: 29px;
+}
+

 #tabnav {
 #tabnav {

-  height: 20px;
-  margin: 0px;
-  padding-top: 5px;
-  background: image-url('tab_bottom.gif') repeat-x bottom;
+  padding: 0;
+  margin: 0;
+  overflow:hidden;

 }
 
 #tabnav li {
 }
 
 #tabnav li {


@@ -269,47 +267,39 @@ h2 {
 }
 
 #tabnav a, #tabnav a:link, #tabnav a:visited {
 }
 
 #tabnav a, #tabnav a:link, #tabnav a:visited {

-  background: #f3f3f3;
-  font-size: 13px;
-  line-height: 14px;
+  background: #fff;
+  font-size: 14px;
+  line-height: 19px;

   font-weight: bold;
   font-weight: bold;

-  padding: 2px 10px;
-  border: 1px solid #ccc;
+  padding: 5px 10px;

   text-decoration: none;
   color: #333;
   text-decoration: none;
   color: #333;

-  border-top-right-radius: 5px;
-  -moz-border-radius-topright: 5px;
-  border-top-left-radius: 5px;
-  -moz-border-radius-topleft: 5px;

 }
 
 #tabnav a:link.active, #tabnav a:visited.active {
 }
 
 #tabnav a:link.active, #tabnav a:visited.active {

-  border-bottom: 1px solid #fff;
-  background: #fff;
+  border-bottom: 1px solid #aaa;
+  background: #9ed485;

   color: #000;
 }
 
 #tabnav a:link:hover, #tabnav a:visited:hover {
   color: #000;
 }
 
 #tabnav a:link:hover, #tabnav a:visited:hover {

-  background: #fff;
+  text-decoration:underline;

 }
 
 #tabnav a:link.disabled,
 #tabnav a:visited.disabled,
 #tabnav a:link:hover.disabled,
 #tabnav a:visited:hover.disabled {
 }
 
 #tabnav a:link.disabled,
 #tabnav a:visited.disabled,
 #tabnav a:link:hover.disabled,
 #tabnav a:visited:hover.disabled {

-  background: #bbbbbb;
-  color: white
+  color: #888;

 }
 
 /* Rules for greeting bar in the top right corner */
 
 #greeting {
 }
 
 /* Rules for greeting bar in the top right corner */
 
 #greeting {

-  height: 20px;
+  height: 28px;

   margin: 0px;
   margin: 0px;

-  padding-top: 5px;

   font-size: 13px;
   font-size: 13px;

-  line-height: 15px;
-  background: image-url('tab_bottom.gif') repeat-x bottom;
+  line-height: 28px;

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


@@ -325,6 +315,7 @@ h2 {
 }
 
 /* Rules for OpenLayers maps */
 }
 
 /* Rules for OpenLayers maps */

+

 #map {
   margin: 0px;
   padding: 0px;
 #map {
   margin: 0px;
   padding: 0px;


@@ -349,7 +340,7 @@ h2 {
 }
 
 #permalink a {
 }
 
 #permalink a {

-    padding: 5px;
+  padding: 5px;

 }
 
 /* Rules for edit menu */
 }
 
 /* Rules for edit menu */


@@ -389,7 +380,6 @@ h2 {
 #sidebar {
   display: none;
   position: absolute;
 #sidebar {
   display: none;
   position: absolute;

-  border: 1px solid #888;

   margin: 0px;
   padding: 0px;
   width: 30%;
   margin: 0px;
   padding: 0px;
   width: 30%;


@@ -410,11 +400,10 @@ h2 {
 
 #sidebar .sidebar_title {
   margin: 0px;
 
 #sidebar .sidebar_title {
   margin: 0px;

-  padding: 3px 6px;
+  padding: 3px 6px 4px 6px;

   height: 29px;
   font-size: 14px;
   line-height: 15px;
   height: 29px;
   font-size: 14px;
   line-height: 15px;

-  border-bottom: 1px solid #888;

   background: #bbb;
 }
 
   background: #bbb;
 }
 


@@ -447,14 +436,14 @@ h2 {
 
 .search_results_heading {
   margin: 0px;
 
 .search_results_heading {
   margin: 0px;

-  padding: 3px 6px;
-  border: 1px solid #ccc;
-  background: #ddd;
+  padding: 2px 5px;
+  border-bottom: 1px solid #ccc;
+  font-weight: bold;

 }
 
 .search_results_entry {
   margin: 0px;
 }
 
 .search_results_entry {
   margin: 0px;

-  padding: 2px 6px;
+  padding: 2px 5px;

 }
 
 .search_results_error {
 }
 
 .search_results_error {


@@ -523,13 +512,6 @@ h2 {
 
 /* Rules for the main content area */
 
 
 /* Rules for the main content area */
 

-body.site #content {
-  padding: 0px;
-  margin: 0px;
-  position: absolute;
-  bottom: 0px;
-}
-

 #content {
   padding: 10px;
   margin: 0px;
 #content {
   padding: 10px;
   margin: 0px;


@@ -537,6 +519,13 @@ body.site #content {
   bottom: 0px;
 }
 
   bottom: 0px;
 }
 

+#content.site_index,
+#content.site_edit,
+#content.site_export {
+  border: 0px;
+  padding: 0px;
+}
+

 #slim_container {
   width: 100%;
 }
 #slim_container {
   width: 100%;
 }


@@ -653,6 +642,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;
 }


@@ -726,6 +732,7 @@ table.browse_details th {
   position: relative;
   width: 90%;
   height: 400px;
   position: relative;
   width: 90%;
   height: 400px;

+  border: 1px solid #ccc;

   display: none;
 }
 
   display: none;
 }
 


@@ -829,6 +836,7 @@ p#contributorGuidance {
   position: relative;
   width: 500px;
   height: 400px; 
   position: relative;
   width: 500px;
   height: 400px; 

+  border: 1px solid #ccc;

 }
 
 #accountImage td {
 }
 
 #accountImage td {


@@ -857,6 +865,7 @@ p#contributorGuidance {
   position: relative;
   width: 400px;
   height: 400px; 
   position: relative;
   width: 400px;
   height: 400px; 

+  border: 1px solid #ccc;

 }
 
 .user_view .user_map p#no_home_location {
 }
 
 .user_view .user_map p#no_home_location {