Merge branch 'notes'

Conflicts:
	Vendorfile

diff --combined Vendorfile
index 43dd73fadaa995a4d90b59175fda04a18b9b2d7d,197bf575b869af53b3d4219bb3ee965f57003270..a56751196a8228cfc0c52a56dee1b2f2ddf7edf4
--- 1/Vendorfile
--- 2/Vendorfile
+++ b/Vendorfile
@@@ -26,9 -26,10 +26,16 @@@ folder 'vendor/assets' d
      end
    end
  
 +  folder 'jquery' do
 +    from 'git://github.com/jevin/Autogrow-Textarea.git' do
 +      file 'jquery.autogrowtextarea.js', 'jquery.autogrowtextarea.js'
++    end  
++  end
++
+   folder 'ohauth' do
+     from 'git://github.com/tmcw/ohauth.git' do
+       file 'ohauth.js'
+       file 'sha.js'
      end
    end
  end

diff --combined app/assets/stylesheets/common.css.scss
index 62e333db36d8828c6dd56a897410792f6ecf85b4,30905b96ca029a8fa1b8d6d1ae5d0a43dc46e662..d20e4b4c4067431727da123c8a10cc6ab4168d49
--- 1/app/assets/stylesheets/common.css.scss
--- 2/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@@ -511,6 -511,7 +511,7 @@@ table 
  #greeting {
    float: right;
    padding-top: 3px;
+   margin-right: 5px;
  }
  
  .greeting-bar-unread {
@@@ -537,6 -538,12 +538,12 @@@
    background:#fff;
  }
  
+ .leaflet-control-attribution a.disabled {
+   color: #99c9dc;
+   cursor: default;
+   text-decoration: none;
+ }
+ 
  .site-index .leaflet-top,
  .site-export .leaflet-top {
    top: 10px !important;
@@@ -550,6 -557,12 +557,12 @@@
    left: 10px !important;
  }
  
+ .leaflet-popup-scrolled {
+   padding-right: 20px;
+   border-bottom: 0px !important;
+   border-top: 0px !important;
+ }
+ 
  /* Rules for edit menu */
  
  .menuicon {
@@@ -922,12 -935,20 +935,20 @@@ ul.results-list li { border-bottom: 1p
    &:first-child {
      margin-top: 0;
    }
+   &.warning {
+     color: #ff7070;
+     font-weight: bold;
+   }
    h4, p {
      margin-bottom: 5px;
    }
    p, ul, .bbox {
      margin-left: 33.3333%;
    }
+   ul p {
+     margin-left: 0;
+     margin-bottom: 0;
+   }
    h4 {
      width: 33.3333%;
      float: left;
@@@ -1488,6 -1509,9 +1509,9 @@@ ul.secondary-actions 
        border-left: 0;
        padding-left: 0;
      }
+     &:last-child {
+       margin-right: 0px;
+     }
    }
  }
  
@@@ -1617,13 -1641,12 +1641,13 @@@ a.button.submit 
    .richtext_content {
      display: inline-block;
      vertical-align: top;
 +    white-space: normal;
  
      .richtext_preview {
        display: inline-block;
        padding: 20px;
        background-color: #f4f4ff;
 -      white-space: normal;
 +      overflow-x: scroll;
  
        &.loading {
          background-image: image-url("loading.gif");
@@@ -1677,3 -1700,53 +1701,53 @@@
      }
    }
  }
+ 
+ /* Rules for the user notes list */
+ 
+ .note_list {
+   tr.creator {
+     background-color: #eeeeee;
+   }
+ 
+   td {
+     padding: 3px;
+   }
+ 
+   p {
+     margin-bottom: 0px;
+   }
+ }
+ 
+ /* Rules for the notes interface */
+ 
+ .note {
+   h2 {
+     margin-bottom: 10px;
+   }
+ 
+   .warning {
+     display: block;
+     background-color: #ff7070;
+     padding: 4px 6px;
+     margin-bottom: 10px;
+   }
+ 
+   .comment_body {
+     margin-top: 4px;
+     margin-bottom: 4px;
+ 
+     p {
+       margin-top: 0px;
+       margin-bottom: 0px;
+     }
+   }
+ 
+   .comment {
+     width: 100%;
+   }
+ 
+   .buttons {
+     margin-top: 5px;
+     text-align: right;
+   }
+ }