Merge remote-tracking branch 'upstream/pull/2499'

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 229db3ba3d0bbb067a1c75deb56eb2318d83bd27..d7984436a82eda19a4c58d4ee8be9c08d64833f8 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -2577,53 +2577,12 @@ input.richtext_title[type="text"] {
   background-size: cover;
   background-attachment: fixed;
 
-  .caption {
-    max-width: 200px;
-    font: 13px/20px Helvetica, Arial, sans-serif;
-    position: fixed;
-    text-align: right;
-    right: 20px;
-    bottom: 60px;
-    text-shadow: #000 0px 1px 5px;
-    color: $lightgrey;
-    opacity: 0.8;
-    display: none;
-  }
-
-  .caption a {
-    color: white;
-    white-space: nowrap;
-    text-decoration: none;
-  }
-
-  a.next {
-    display: block;
-    position: fixed;
-    right: 10px;
-    bottom: 10px;
-    width: 40px;
-    height: 40px;
-    border-radius: 5px;
-    text-indent: -9999px;
-    overflow: hidden;
-    background: image-url('about/sprite.png') -120px 0px no-repeat;
-    background-color: #000;
-    background-color: rgba(0, 0, 0, 0.5);
-  }
 
   .content-inner {
     position: relative;
     color: #333;
     min-width: 320px;
     max-width: 640px;
-
-    .section {
-      margin-bottom: 30px;
-    }
-
-    .section:last-child {
-      margin-bottom: 0;
-    }
   }
 
   .text {
@@ -2683,10 +2642,6 @@ input.richtext_title[type="text"] {
     }
   }
 
-  h2 {
-    margin-bottom: 10px;
-  }
-
   .icon {
     width: 30px;
     height: 30px;

diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index e62af1659cbaa8fce56c2e8aeb5c296bda9f3b72..717059fa24d9255a75b1da63e1790aac225475d4 100644 (file)
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -28,7 +28,8 @@
 
     <div class='section' id='legal'>
       <h2><div class='icon legal'></div><%= t ".legal_title", :locale => @locale %></h2>
-      <p><%= t ".legal_html", :locale => @locale %></p>
+      <p><%= t ".legal_1_html", :locale => @locale %></p>
+      <p><%= t ".legal_2_html", :locale => @locale %></p>
     </div>
 
     <div class='section' id='partners'>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0a8d068fe7096dbe14cad542a48c902ee6af2674..7c3ae073e882ab6b055d6221154793fc6799f2cf 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1358,13 +1358,13 @@ en:
         under the same licence. See the <a href='%{copyright_path}'>Copyright and
         License page</a> for details.
       legal_title: Legal
-      legal_html: |
+      legal_1_html: |
         This site and many other related services are formally operated by the
         <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
         on behalf of the community. Use of all OSMF operated services is subject
         to our <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">Terms of Use</a>, <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
-        Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
-        <br>
+        Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>.
+      legal_2_html: |
         Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
         if you have licensing, copyright or other legal questions.
         <br>