Merge pull request #19736 from pivanov/bug-1017027

Bug 1017027 - [Flame][Settings] - Fuzzy images, r=evelyn
mozilla-b2g · May 29, 2014 · eced604 · eced604
2 parents 93402e8 + f54ba67
commit eced604
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 4 deletions.
diff --git a/apps/settings/manifest.webapp b/apps/settings/manifest.webapp
@@ -71,10 +71,10 @@
   },
   "default_locale": "en-US",
   "icons": {
-    "60": "/style/icons/Settings_60.png",
-    "90": "/style/icons/Settings_90.png",
-    "120": "/style/icons/Settings_120.png",
-    "135": "/style/icons/Settings_135.png"
+    "60": "/style/icons/Settings.png",
+    "90": "/style/icons/Settings@1.5x.png",
+    "120": "/style/icons/Settings@2x.png",
+    "135": "/style/icons/Settings@2.25x.png"
   },
   "orientation": "default"
 }
diff --git a/apps/settings/style/icons/Settings_60.png → apps/settings/style/icons/Settings.png b/apps/settings/style/icons/Settings_60.png → apps/settings/style/icons/Settings.png
diff --git a/apps/settings/style/icons/Settings_90.png → apps/settings/style/icons/Settings@1.5x.png b/apps/settings/style/icons/Settings_90.png → apps/settings/style/icons/Settings@1.5x.png
diff --git a/apps/settings/style/icons/Settings_135.png → apps/settings/style/icons/Settings@2.25x.png b/apps/settings/style/icons/Settings_135.png → apps/settings/style/icons/Settings@2.25x.png
diff --git a/apps/settings/style/icons/Settings_120.png → apps/settings/style/icons/Settings@2x.png b/apps/settings/style/icons/Settings_120.png → apps/settings/style/icons/Settings@2x.png
diff --git a/apps/settings/style/images/document_bg@2.25.png b/apps/settings/style/images/document_bg@2.25.png
diff --git a/apps/settings/style/images/feedback_faces@1.5x.png b/apps/settings/style/images/feedback_faces@1.5x.png
diff --git a/apps/settings/style/images/feedback_faces@2x.png b/apps/settings/style/images/feedback_faces@2x.png
diff --git a/apps/settings/style/images/simcards@2x.png b/apps/settings/style/images/simcards@2x.png