Merge pull request #361 from twbs/device-sprite

Use a sprite for device images
twbs · Mar 1, 2014 · 317e70b · 317e70b
2 parents f17a5a1 + 91a7c77
commit 317e70b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
@@ -924,9 +924,10 @@ code {
     height: 813px;
     margin-left: -20px;
     font-family: "Helvetica Neue", sans-serif;
-    background-image: url("../img/iphone5c.png");
-    background-size: 100%;
+    background-image: url("../img/device-sprite.png");
+    background-size: 300%;
     background-repeat: no-repeat;
+    background-position-x: 0;
     -webkit-transition: background-image 0.1s linear;
     -moz-transition: background-image 0.1s linear;
     transition: background-image 0.1s linear;
@@ -1587,7 +1588,7 @@ hr {
   transform: translate3d(-20%, 0, 0);
 }
 .platform-ios .device {
-  background-image: url("../img/iphone5s.png");
+  background-position-x: -395px;
 }
 .platform-ios .device .device-content {
   background-color: #efeff4;
@@ -2108,7 +2109,7 @@ hr {
 }
 .platform-android .device {
   font-family: 'Roboto', sans-serif;
-  background-image: url("../img/android.png");
+  background-position-x: -790px;
 }
 .platform-android .device .device-content {
   font-size: 18px;

diff --git a/docs/assets/img/android.png b/docs/assets/img/android.png
diff --git a/docs/assets/img/device-sprite.png b/docs/assets/img/device-sprite.png
diff --git a/docs/assets/img/iphone5c.png b/docs/assets/img/iphone5c.png
diff --git a/docs/assets/img/iphone5s.png b/docs/assets/img/iphone5s.png
diff --git a/sass/docs.scss b/sass/docs.scss
@@ -962,9 +962,10 @@ code {
     height: 813px;
     margin-left: -20px;
     font-family: "Helvetica Neue", sans-serif;
-    background-image: url("../img/iphone5c.png");
-    background-size: 100%;
+    background-image: url("../img/device-sprite.png");
+    background-size: 300%;
     background-repeat: no-repeat;
+    background-position-x: 0;
     @include transition(background-image .1s linear);
 
     &.device-fixed {
@@ -1138,8 +1139,8 @@ hr {
   @import "theme-ios.scss";
 
   .device {
-    background-image: url("../img/iphone5s.png");
-
+    background-position-x: -395px;
+    
     .device-content {
       background-color: #efeff4;
     }
@@ -1150,7 +1151,7 @@ hr {
 
   .device {
     font-family: 'Roboto', sans-serif;
-    background-image: url("../img/android.png");
+    background-position-x: -790px;
 
     .device-content {
       font-size: 18px;