From: Nick Doiron <ndoiron@mapmeld.com>
Date: Mon, 17 Jul 2017 23:51:54 +0000 (-1000)
Subject: use no-r2 comment to block RTL gem from changing sprites
X-Git-Tag: live~3352^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/de3e02d41a9cb69352dc83ac8e478612777ebb24

use no-r2 comment to block RTL gem from changing sprites
---

diff --git a/Gemfile b/Gemfile
index baa1dcc04..f9b692353 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ gem "jquery-rails"
 gem "jsonify-rails"
 
 # Use R2 for RTL conversion
-gem "r2"
+gem "r2", "~> 0.2.7"
 
 # Use autoprefixer to generate CSS prefixes
 gem "autoprefixer-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index 9b79e9ca1..4c398ccef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -223,7 +223,7 @@ GEM
     progress (3.3.1)
     psych (2.2.4)
     public_suffix (2.0.5)
-    r2 (0.2.6)
+    r2 (0.2.7)
     rack (2.0.3)
     rack-cors (0.4.1)
     rack-openid (1.3.1)
@@ -382,7 +382,7 @@ DEPENDENCIES
   pg
   poltergeist
   psych
-  r2
+  r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
   rails (= 5.0.4)
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 121e0c6d6..578506621 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -2776,12 +2776,30 @@ input.richtext_title[type="text"] {
     vertical-align: middle;
     background: 40px 40px image-url('about/sprite.png') no-repeat;
 
-    &.local        { background-position: 0px    0px; }
-    &.community    { background-position: 0px  -40px; }
-    &.open         { background-position: 0px  -80px; }
-    &.partners     { background-position: 0px -120px; }
-    &.infringement { background-position: 0px -160px; }
-    &.legal        { background-position: -45px -160px; }
+    &.local {
+      /* no-r2 */
+      background-position: 0px 0px;
+    }
+    &.community {
+      /* no-r2 */
+      background-position: 0px -40px;
+    }
+    &.open {
+      /* no-r2 */
+      background-position: 0px -80px;
+    }
+    &.partners {
+      /* no-r2 */
+      background-position: 0px -120px;
+    }
+    &.infringement {
+      /* no-r2 */
+      background-position: 0px -160px;
+    }
+    &.legal {
+      /* no-r2 */
+      background-position: -45px -160px;
+    }
   }
 }