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 a0846e96edfe412551d376e588909aa706c54c85..42b5f539737624b23c6f7acac32477f6901749ae 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -3,8 +3,10 @@
 /* Default rules for the body of every page */
 
 body {
 /* Default rules for the body of every page */
 
 body {

-  font-family: Arial,sans-serif;
-  color: #000;
+  font-family: 'Helvetica Neue',Arial,sans-serif;
+  font-size: 14px;
+  line-height: 20px;
+  color: #222;

   background-color: #fff;
   margin: 0px;
   padding: 0px;
   background-color: #fff;
   margin: 0px;
   padding: 0px;


@@ -34,12 +36,22 @@ hr {
   height: 1px;
 }
 
   height: 1px;
 }
 

+/* Default rules for headings */
+
+h2 {
+  margin: 5px 0;
+  font-size: 25px;
+  line-height: 30px;
+}
+

 /* Rules for the whole left sidebar, including the logo */
 
 #left {
   position: absolute;
   top: 0px;
 /* Rules for the whole left sidebar, including the logo */
 
 #left {
   position: absolute;
   top: 0px;

-  min-width: 170px;
+  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 */


@@ -48,22 +60,20 @@ hr {
   width: 170px;
   min-width: 170px;
   padding: 5px;
   width: 170px;
   min-width: 170px;
   padding: 5px;

-  margin: 5px;
-  height: 150px;
-  background: #fff;
-  border: 1px solid #ccd;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+  text-align: center;
+  margin: 25px 0 5px 0;

 }
 
 #logo h1 {
 }
 
 #logo h1 {

-  font-size: 14px;
+  font-size: 18px;
+  line-height: 20px;

   text-align: center;
   margin: 0px;
 }
 
 #logo h2 {
   font-size: 10px;
   text-align: center;
   margin: 0px;
 }
 
 #logo h2 {
   font-size: 10px;

+  line-height: 15px;

   margin: 0px;
 }
 
   margin: 0px;
 }
 


@@ -76,13 +86,7 @@ hr {
 /* 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 {

-  width: 170px;
-  padding: 5px;
-  margin: 5px;
-  border: 1px solid #ccc;
-  font-size: 11px;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+  border-top: 1px solid #ccc;

 }
 
 #intro p {
 }
 
 #intro p {


@@ -119,7 +123,7 @@ hr {
   padding: 5px;
   border: 1px solid #ccc;
   background: #ea0;
   padding: 5px;
   border: 1px solid #ccc;
   background: #ea0;

-  line-height: 1.2em;
+  line-height: 20px;

   font-size: 14px;
   border-radius: 5px;
   -moz-border-radius: 5px;
   font-size: 14px;
   border-radius: 5px;
   -moz-border-radius: 5px;


@@ -128,21 +132,13 @@ hr {
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {

-  width: 170px;
-  min-width: 170px;
-  margin: 5px;

   padding: 5px;
   padding: 5px;

-  border: 1px solid #ccc;
-  background: #ddd;
-  line-height: 1.2em;
+  margin: 4px 0;
+  border-top: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
+  line-height: 20px;

   font-size: 14px;
   font-weight: bold;
   font-size: 14px;
   font-weight: bold;

-  border-radius: 5px;
-  -moz-border-radius: 5px;
-}
-
-.left_menu td {
-  font-size: 12px;

 }
 
 .left_menu h1 {
 }
 
 .left_menu h1 {


@@ -182,22 +178,15 @@ hr {
  */
 
 .optionalbox {
  */
 
 .optionalbox {

-  width: 170px;
-  min-width: 170px;
-  margin: 5px;

   padding: 5px;
   padding: 5px;

-  border: 1px solid #ccc;
-  line-height: 1.2em;
-  font-size: 12px;
-  background: #eee;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+  margin: 4px 0;
+  border-top: 1px solid #ccc;

 }
 
 .optionalbox h1 {
   font-size: 14px;
   font-weight: bold;
 }
 
 .optionalbox h1 {
   font-size: 14px;
   font-weight: bold;

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

   margin: 0px;
   vertical-align: bottom;
 }
   margin: 0px;
   vertical-align: bottom;
 }


@@ -205,13 +194,13 @@ hr {
 /* Rules for the search box */
 
 .whereami {
 /* Rules for the search box */
 
 .whereami {

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

   vertical-align: bottom;
 }
 
 .search_container {
   vertical-align: bottom;
 }
 
 .search_container {

-  height: 16px;
-  padding-bottom: 6px;
+  height: 15px;
+  padding-bottom: 5px;

 }
 
 #search_field form {
 }
 
 #search_field form {


@@ -231,21 +220,19 @@ hr {
 }
 
 .search_help {
 }
 
 .search_help {

-  font-size: 10px;
-  line-height: 1em;
-  margin-top: 3px;
+  margin-top: 2px;

   margin-bottom: 0px;
 }
 
 /* Rules for donation request box */
 
 .donate {
   margin-bottom: 0px;
 }
 
 /* Rules for donation request box */
 
 .donate {

-  width: 170px;
-  margin: 5px;
+  width: 155px;
+  margin: 10px 5px;

   padding: 5px;
   border: 1px solid #ccc;
   background: #cbeea7;
   padding: 5px;
   border: 1px solid #ccc;
   background: #cbeea7;

-  line-height: 1.2em;
+  line-height: 20px;

   text-align: center;
   font-size: 14px;
   border-radius: 5px;
   text-align: center;
   font-size: 14px;
   border-radius: 5px;


@@ -261,66 +248,58 @@ hr {
 
 /* Rules for tabbed navigation bar */
 
 
 /* Rules for tabbed navigation bar */
 

-#tabnav
-{
-  height: 20px;
-  margin: 0px;
-  padding-top: 5px;
-  background: image-url('tab_bottom.gif') repeat-x bottom;
+#top-bar {
+  border-bottom: 1px solid #ccc;
+  height: 29px;

 }
 
 }
 

-#tabnav li
-{
-  margin: 0px; 
+#tabnav {
+  padding: 0;
+  margin: 0;
+  overflow:hidden;
+}
+
+#tabnav li {
+  margin: 0px;

   padding: 0px;
   display: inline;
   list-style-type: none;
 }
 
   padding: 0px;
   display: inline;
   list-style-type: none;
 }
 

-#tabnav a, #tabnav a:link, #tabnav a:visited 
-{
-  background: #f3f3f3;
-  font-size: 13px;
-  line-height: 14px;
+#tabnav a, #tabnav a:link, #tabnav a:visited {
+  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
-{
-  border-bottom: 1px solid #fff;
-  background: #fff;
+#tabnav a:link.active, #tabnav a:visited.active {
+  border-bottom: 1px solid #aaa;
+  background: #9ed485;

   color: #000;
 }
 
   color: #000;
 }
 

-#tabnav a:link:hover, #tabnav a:visited:hover
-{
-  background: #fff;
+#tabnav a:link:hover, #tabnav a:visited:hover {
+  text-decoration:underline;

 }
 
 }
 

-#tabnav a:link.disabled, #tabnav a:visited.disabled,
-#tabnav a:link:hover.disabled, #tabnav a:visited:hover.disabled
-{
-  background: #bbbbbb;
-  color: white
+#tabnav a:link.disabled,
+#tabnav a:visited.disabled,
+#tabnav a:link:hover.disabled,
+#tabnav a:visited:hover.disabled {
+  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: 14px;
-  background: image-url('tab_bottom.gif') repeat-x bottom;
+  line-height: 28px;

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


@@ -338,8 +317,7 @@ hr {
 /* Rules for OpenLayers maps */
 
 #map {
 /* Rules for OpenLayers maps */
 
 #map {

-  border: 1px solid black;
-  margin: 0px; 
+  margin: 0px;

   padding: 0px;
 }
 
   padding: 0px;
 }
 


@@ -353,10 +331,16 @@ hr {
 #permalink {
   z-index: 10000;
   position: absolute;
 #permalink {
   z-index: 10000;
   position: absolute;

-  bottom: 15px;
-  right: 15px;
+  bottom: 0px;
+  right: 0px;
+  padding: 5px;
+  background:#fff;

   text-align: right;
   text-align: right;

-  font-size: smaller;
+  font-size: 12px;
+}
+
+#permalink a {
+  padding: 5px;

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


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

-  border: 1px solid black;

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


@@ -408,7 +391,7 @@ hr {
   overflow: auto;
   position: absolute;
   font-size: 13px;
   overflow: auto;
   position: absolute;
   font-size: 13px;

-  line-height: 14px;
+  line-height: 15px;

   top: 29px;
   bottom: 0px;
   left: 0px;
   top: 29px;
   bottom: 0px;
   left: 0px;


@@ -417,11 +400,10 @@ hr {
 
 #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 black;

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


@@ -454,14 +436,14 @@ hr {
 
 .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 {


@@ -488,9 +470,9 @@ hr {
 
 .export_heading {
   margin: 0px;
 
 .export_heading {
   margin: 0px;

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

 }
 
 .export_bounds {
 }
 
 .export_bounds {


@@ -531,11 +513,17 @@ hr {
 /* Rules for the main content area */
 
 #content {
 /* Rules for the main content area */
 
 #content {

-  padding: 0px;
+  padding: 10px;

   margin: 0px;
   margin: 0px;

-  position: absolute; 
-  bottom: 10px;
-  line-height: 1.2em;
+  position: absolute;
+  bottom: 0px;
+}
+
+#content.site_index,
+#content.site_edit,
+#content.site_export {
+  border: 0px;
+  padding: 0px;

 }
 
 #slim_container {
 }
 
 #slim_container {


@@ -744,6 +732,7 @@ td.browse_comments table td span.by {
   position: relative;
   width: 90%;
   height: 400px;
   position: relative;
   width: 90%;
   height: 400px;

+  border: 1px solid #ccc;

   display: none;
 }
 
   display: none;
 }
 


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


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


@@ -993,18 +984,20 @@ p#contributorGuidance {
 .fieldName {
   vertical-align: top;
   font-weight: bold;
 .fieldName {
   vertical-align: top;
   font-weight: bold;

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

 }
 
 .minorNote {
   font-size: 0.8em;
 }
 
 }
 
 .minorNote {
   font-size: 0.8em;
 }
 

-input[type="text"], input[type="email"], input[type="url"], input[type="password"], textarea {
-  border: 1px solid black;
-}
-
-input[type="submit"] {
-  border: 1px solid black;
+input[type="text"],
+input[type="email"],
+input[type="url"],
+input[type="password"],
+textarea {
+  border: 1px solid #888;

 }
 
 /* Rules for user images */
 }
 
 /* Rules for user images */


@@ -1042,11 +1035,11 @@ abbr.geo {
 
 /* Rules for doing distinct colour of alternate table rows */
 
 
 /* Rules for doing distinct colour of alternate table rows */
 

-.table0 { 
+.table0 {

   background: #f6f6f6;
 }
 
   background: #f6f6f6;
 }
 

-.table1 { 
+.table1 {

   background: #fff;
 }
 
   background: #fff;
 }