Merge pull request #1588 from Georeactor/master

Update gem, fix icons on RTL/Arabic pages

diff --git a/Gemfile b/Gemfile
index 48658f65d371f1097f440d0dee50e35baa8dc6d3..fecc797d092129458c7c0fc0c481ea5d9f678637 100644 (file)
--- 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 f73d4a5d8b578ba4ce393d4ff5e8a8a05c3433e5..3cb46643ad21eaabdd80d41647795743f5051e23 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -386,7 +386,7 @@ DEPENDENCIES
   pg
   poltergeist
   psych
-  r2
+  r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
   rails (= 5.0.5)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 121e0c6d63cb6eb50b4898d282b4b3249309403f..57850662141e22290c972848567c9503e09db77c 100644 (file)
--- 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;
+    }
   }
 }