Permalink
Browse files

Created retina versions of all graphical assets.

This commit includes @2x versions of all graphical assets on the site except for the images in the Pro Git book. This includes the favicon, all icons, the branching illustration on the front page, the OS monitors, screenshots of the GUI apps, book covers, etc. I also recreated the images used in the About section.

I created a new Sass mixin for showing @2x background images in the CSS. This will render the regular image unless it meets the media query criteria for Retina display.

I also ran all of the PNGs through a compressor (tinypng.org) and reduced their sizes quite a bit.
  • Loading branch information...
jasonlong committed Nov 8, 2012
1 parent 4e36626 commit e640167a2687eae2d1ed30c5b0d003bfb09e88c3
Showing with 136 additions and 128 deletions.
  1. +1 −1 README.md
  2. +6 −5 app/assets/stylesheets/book.css.scss
  3. +2 −1 app/assets/stylesheets/forms.css.scss
  4. +28 −38 app/assets/stylesheets/front-page.css.scss
  5. +1 −0 app/assets/stylesheets/git-scm.css.scss
  6. +2 −2 app/assets/stylesheets/layout.css.scss
  7. +3 −3 app/assets/stylesheets/lists.css.scss
  8. +10 −0 app/assets/stylesheets/mixins.css.scss
  9. +17 −16 app/assets/stylesheets/reference.css.scss
  10. +1 −1 app/assets/stylesheets/sidebar.css.scss
  11. +6 −2 app/helpers/application_helper.rb
  12. +6 −6 app/views/about/index.html.haml
  13. +2 −2 app/views/books/show.html.erb
  14. +2 −2 app/views/doc/book.html.erb
  15. +8 −8 app/views/doc/ext.html.erb
  16. +6 −6 app/views/doc/index.html.haml
  17. +2 −2 app/views/doc/videos.html.erb
  18. +12 −12 app/views/downloads/guis/index.html.haml
  19. +2 −2 app/views/downloads/index.html.haml
  20. +7 −7 app/views/downloads/logos/index.html.haml
  21. +2 −2 app/views/layouts/layout.html.haml
  22. +1 −1 app/views/shared/_header.html.haml
  23. +9 −9 app/views/site/index.html.haml
  24. BIN public/favicon.png
  25. BIN public/images/about/branches.png
  26. BIN public/images/about/branches@2x.png
  27. BIN public/images/about/index1.png
  28. BIN public/images/about/index1@2x.png
  29. BIN public/images/about/index2.png
  30. BIN public/images/about/index2@2x.png
  31. BIN public/images/about/local-remote.png
  32. BIN public/images/about/workflow-a.png
  33. BIN public/images/about/workflow-a@2x.png
  34. BIN public/images/about/workflow-b.png
  35. BIN public/images/about/workflow-b@2x.png
  36. BIN public/images/about/workflow-c.png
  37. BIN public/images/about/workflow-c@2x.png
  38. BIN public/images/bg/flippy-book-inside-cover.png
  39. BIN public/images/bg/flippy-book.png
  40. BIN public/images/bg/isometric-grid.png
  41. BIN public/images/bg/isometric-grid@2x.png
  42. BIN public/images/books/git-internals@2x.jpg
  43. BIN public/images/books/pragmatic-guide-to-git@2x.jpg
  44. BIN public/images/books/pragmatic-version-control@2x.jpg
  45. BIN public/images/books/pro-git@2x.jpg
  46. BIN public/images/books/version-control-with-git@2x.jpg
  47. BIN public/images/branching-illustration@2x.png
  48. BIN public/images/company-project-logos/android.png
  49. BIN public/images/company-project-logos/android@2x.png
  50. BIN public/images/company-project-logos/blizzard.png
  51. BIN public/images/company-project-logos/debian.png
  52. BIN public/images/company-project-logos/eclipse.png
  53. BIN public/images/company-project-logos/eclipse@2x.png
  54. BIN public/images/company-project-logos/facebook.png
  55. BIN public/images/company-project-logos/facebook@2x.png
  56. BIN public/images/company-project-logos/gnome.png
  57. BIN public/images/company-project-logos/gnome@2x.png
  58. BIN public/images/company-project-logos/google.png
  59. BIN public/images/company-project-logos/google@2x.png
  60. BIN public/images/company-project-logos/kde.png
  61. BIN public/images/company-project-logos/kde@2x.png
  62. BIN public/images/company-project-logos/linked-in.png
  63. BIN public/images/company-project-logos/linked-in@2x.png
  64. BIN public/images/company-project-logos/linux.png
  65. BIN public/images/company-project-logos/linux@2x.png
  66. BIN public/images/company-project-logos/microsoft.png
  67. BIN public/images/company-project-logos/microsoft@2x.png
  68. BIN public/images/company-project-logos/netflix.png
  69. BIN public/images/company-project-logos/netflix@2x.png
  70. BIN public/images/company-project-logos/perl.png
  71. BIN public/images/company-project-logos/perl@2x.png
  72. BIN public/images/company-project-logos/postgresql.png
  73. BIN public/images/company-project-logos/postgresql@2x.png
  74. BIN public/images/company-project-logos/qt.png
  75. BIN public/images/company-project-logos/qt@2x.png
  76. BIN public/images/company-project-logos/rails.png
  77. BIN public/images/company-project-logos/rails@2x.png
  78. BIN public/images/company-project-logos/twitter.png
  79. BIN public/images/company-project-logos/twitter@2x.png
  80. BIN public/images/company-project-logos/x.png
  81. BIN public/images/company-project-logos/x@2x.png
  82. BIN public/images/creative-commons@2x.png
  83. BIN public/images/guis/git-cola.png
  84. BIN public/images/guis/git-cola@2x.png
  85. BIN public/images/guis/git-extensions.png
  86. BIN public/images/guis/git-extensions@2x.png
  87. BIN public/images/guis/gitbox.png
  88. BIN public/images/guis/gitbox@2x.png
  89. BIN public/images/guis/github-for-mac.png
  90. BIN public/images/guis/github-for-mac@2x.png
  91. BIN public/images/guis/github-for-win.png
  92. BIN public/images/guis/github-for-windows.png
  93. BIN public/images/guis/github-for-windows@2x.png
  94. BIN public/images/guis/gitx.png
  95. BIN public/images/guis/gitx@2x.png
  96. BIN public/images/guis/smartgit.png
  97. BIN public/images/guis/smartgit@2x.png
  98. BIN public/images/guis/sourcetree.png
  99. BIN public/images/guis/sourcetree@2x.png
  100. BIN public/images/guis/tower.png
  101. BIN public/images/guis/tower@2x.png
  102. BIN public/images/icons/admin-sm.png
  103. BIN public/images/icons/admin-sm@2x.png
  104. BIN public/images/icons/apple.png
  105. BIN public/images/icons/apple@2x.png
  106. BIN public/images/icons/book-sm.png
  107. BIN public/images/icons/book.png
  108. BIN public/images/icons/book@2x.png
  109. BIN public/images/icons/box.png
  110. BIN public/images/icons/box@2x.png
  111. BIN public/images/icons/branch-sm.png
  112. BIN public/images/icons/branch-sm@2x.png
  113. BIN public/images/icons/camera-sm.png
  114. BIN public/images/icons/camera-sm@2x.png
  115. BIN public/images/icons/change-no.png
  116. BIN public/images/icons/change-yes.png
  117. BIN public/images/icons/code.png
  118. BIN public/images/icons/code@2x.png
  119. BIN public/images/icons/debian.png
  120. BIN public/images/icons/debugging-sm.png
  121. BIN public/images/icons/debugging-sm@2x.png
  122. BIN public/images/icons/document-sm.png
  123. BIN public/images/icons/document.png
  124. BIN public/images/icons/document@2x.png
  125. BIN public/images/icons/download.png
  126. BIN public/images/icons/email-sm.png
  127. BIN public/images/icons/email-sm@2x.png
  128. BIN public/images/icons/external-sm.png
  129. BIN public/images/icons/external-sm@2x.png
  130. BIN public/images/icons/film-sm.png
  131. BIN public/images/icons/green-dot.png
  132. BIN public/images/icons/grey-dot.png
  133. BIN public/images/icons/gui.png
  134. BIN public/images/icons/gui@2x.png
  135. BIN public/images/icons/info.png
  136. BIN public/images/icons/info@2x.png
  137. BIN public/images/icons/inspection-sm.png
  138. BIN public/images/icons/inspection-sm@2x.png
  139. BIN public/images/icons/linux.png
  140. BIN public/images/icons/linux@2x.png
  141. BIN public/images/icons/nav-about.png
  142. BIN public/images/icons/nav-about@2x.png
  143. BIN public/images/icons/nav-circles.png
  144. BIN public/images/icons/nav-circles@2x.png
  145. BIN public/images/icons/nav-community.png
  146. BIN public/images/icons/nav-community@2x.png
  147. BIN public/images/icons/nav-documentation.png
  148. BIN public/images/icons/nav-documentation@2x.png
  149. BIN public/images/icons/nav-download-gui.png
  150. BIN public/images/icons/nav-downloads.png
  151. BIN public/images/icons/nav-downloads@2x.png
  152. BIN public/images/icons/nav-get-involved.png
  153. BIN public/images/icons/nav-read-book.png
  154. BIN public/images/icons/patching-sm.png
  155. BIN public/images/icons/patching-sm@2x.png
  156. BIN public/images/icons/plumbing-sm.png
  157. BIN public/images/icons/plumbing-sm@2x.png
  158. BIN public/images/icons/projects-sm.png
  159. BIN public/images/icons/projects-sm@2x.png
  160. BIN public/images/icons/red-dot.png
  161. BIN public/images/icons/search.png
  162. BIN public/images/icons/search@2x.png
  163. BIN public/images/icons/server-admin-sm.png
  164. BIN public/images/icons/server-admin-sm@2x.png
  165. BIN public/images/icons/setup-sm.png
  166. BIN public/images/icons/setup-sm@2x.png
  167. BIN public/images/icons/sharing-sm.png
  168. BIN public/images/icons/sharing-sm@2x.png
  169. BIN public/images/icons/solaris.png
  170. BIN public/images/icons/solaris@2x.png
  171. BIN public/images/icons/source-code.png
  172. BIN public/images/icons/source-code@2x.png
  173. BIN public/images/icons/windows.png
  174. BIN public/images/icons/windows@2x.png
  175. BIN public/images/logo.png
  176. BIN public/images/logo@2x.png
  177. BIN public/images/logos/1color-darkbg.png
  178. BIN public/images/logos/1color-darkbg@2x.png
  179. BIN public/images/logos/1color-lightbg.png
  180. BIN public/images/logos/1color-lightbg@2x.png
  181. BIN public/images/logos/1color-orange-lightbg.png
  182. BIN public/images/logos/1color-orange-lightbg@2x.png
  183. BIN public/images/logos/2color-lightbg.png
  184. BIN public/images/logos/2color-lightbg@2x.png
  185. BIN public/images/logos/logomark-black.png
  186. BIN public/images/logos/logomark-black@2x.png
  187. BIN public/images/logos/logomark-orange.png
  188. BIN public/images/logos/logomark-orange@2x.png
  189. BIN public/images/logos/logomark-white.png
  190. BIN public/images/logos/logomark-white@2x.png
  191. BIN public/images/mocks/awesome-branch-mock.jpg
  192. BIN public/images/mocks/download-mock.jpg
  193. BIN public/images/mocks/menu-mock.jpg
  194. BIN public/images/mocks/projects-mock.jpg
  195. BIN public/images/monitor-default.png
  196. BIN public/images/monitor-default@2x.png
  197. BIN public/images/monitor-linux.png
  198. BIN public/images/monitor-linux@2x.png
  199. BIN public/images/monitor-mac.png
  200. BIN public/images/monitor-mac@2x.png
  201. BIN public/images/monitor-windows.png
  202. BIN public/images/monitor-windows@2x.png
  203. BIN public/images/pro-git-298x398@2x.jpg
  204. BIN public/images/pro-git-56x74@2x.jpg
  205. BIN public/images/rails.png
  206. BIN public/images/replace1.png
  207. BIN public/images/replace2.png
  208. BIN public/images/replace3.png
  209. BIN public/images/replace4.png
  210. BIN public/images/replace5.png
  211. BIN public/images/rerere1.png
  212. BIN public/images/rerere2.png
  213. BIN public/images/rerere3.png
  214. BIN public/images/reset/ex1.png
  215. BIN public/images/reset/ex2.png
  216. BIN public/images/reset/ex3.png
  217. BIN public/images/reset/ex4.png
  218. BIN public/images/reset/ex5.png
  219. BIN public/images/reset/ex6.png
  220. BIN public/images/reset/ex7.png
  221. BIN public/images/reset/reset-checkout.png
  222. BIN public/images/reset/reset-hard.png
  223. BIN public/images/reset/reset-mixed.png
  224. BIN public/images/reset/reset-path1.png
  225. BIN public/images/reset/reset-path2.png
  226. BIN public/images/reset/reset-path3.png
  227. BIN public/images/reset/reset-soft.png
  228. BIN public/images/reset/reset1.png
  229. BIN public/images/reset/squash-r1.png
  230. BIN public/images/reset/squash-r2.png
  231. BIN public/images/reset/squash-r3.png
  232. BIN public/images/reset/trees.png
  233. BIN public/images/reset/workflow.png
  234. BIN public/images/sidebar-divider.png
  235. BIN public/images/sidebar-divider@2x.png
  236. BIN public/images/smarthttp1.png
  237. BIN public/images/smarthttp2.png
  238. BIN public/images/subscribe.png
  239. BIN public/images/tmp/external-video.jpg
  240. BIN public/images/tmp/screencast-thumbnail.png
  241. BIN public/images/try-git-74x71.png
  242. BIN public/images/twitterbird.png
  243. BIN public/images/unmerge1.png
  244. BIN public/images/unmerge2.png
  245. BIN public/images/unmerge3.png
  246. BIN public/images/unmerge4.png
  247. BIN public/images/unmerge5.png
  248. BIN public/images/unmerge6.png
  249. BIN public/images/unmerge7.png
  250. BIN public/images/video/ep1.png
  251. BIN public/images/video/ep1@2x.png
  252. BIN public/images/video/ep2.png
  253. BIN public/images/video/ep2@2x.png
  254. BIN public/images/video/ep3.png
  255. BIN public/images/video/ep3@2x.png
  256. BIN public/images/video/ep4.png
  257. BIN public/images/video/ep4@2x.png
  258. BIN public/images/videos/introgit.png
  259. BIN public/images/videos/introgit@2x.jpg
  260. BIN public/images/videos/linus@2x.jpg
View
@@ -72,5 +72,5 @@ accept. If it involves code, please also write tests for it.
This source code for the site is licensed under the MIT, which you can find in
the MIT-LICENSE.txt file.
-All graphical assets are licensed under the
+All graphical assets are licensed under the
[Creative Commons Attribution 3.0 Unported License](http://creativecommons.org/licenses/by/3.0/).
@@ -49,7 +49,7 @@
}
.webkit #flippy-book #book-cover {
left: auto;
- right: 6px;
+ right: 6px;
@include transform-style(preserve-3d);
@include transition-duration(1.2s);
}
@@ -65,7 +65,8 @@
width: 298px;
height: 398px;
color: black;
- background: #000102 url(/images/pro-git-298x398.jpg) 0 0 no-repeat;
+ @include background-image-2x(/images/pro-git-298x398, 298px, 398px, 0 0, no-repeat, jpg);
+ background-color: #000102;
text-indent: -9999px;
cursor: pointer;
}
@@ -82,7 +83,7 @@
}
#flippy-book #book-cover-inside {
width: 298px;
- height: 398px;
+ height: 398px;
right: 4px;
background: #fff url(/images/bg/flippy-book-inside-cover.png) 0 0 no-repeat;
}
@@ -119,7 +120,7 @@
font-size: 12px;
color: $light-font-color;
padding-left: 22px;
- background: transparent url(/images/icons/info.png) 40px 0 no-repeat;
+ @include background-image-2x(/images/icons/info, 18px, 17px, 40px 1px);
&.visible {
@include inline-block;
}
@@ -132,7 +133,7 @@ ol.book-toc {
margin-bottom: 0.6em;
}
ol {
- list-style: none;
+ list-style: none;
}
h2 {
color: $font-color;
@@ -31,7 +31,8 @@ form#search {
top: 10px;
width: 262px;
padding-left: 32px;
- background: #fcfcfa url(/images/icons/search.png) 10px 50% no-repeat;
+ @include background-image-2x(/images/icons/search, 17px, 17px, 10px 50%);
+ background-color: #fcfcfa ! important;
border: solid 1px #ceccc5;
@include border-radius(20px);
@include box-shadow(inset 0 1px 4px #ddd);
@@ -1,7 +1,6 @@
#front-content {
@include clearfix;
overflow: visible;
-// height: 400px;
#front-navigation {
width: 618px;
@@ -108,7 +107,7 @@ $monitor-height: 271px;
}
.monitor {
- background: transparent url(/images/monitor-default.png) top right no-repeat;
+ @include background-image-2x(/images/monitor-default, $monitor-width, $monitor-height);
padding-top: 45px;
padding-left: 40px;
height: $monitor-height - 45;
@@ -142,7 +141,7 @@ $monitor-height: 271px;
border-bottom: solid 1px #134143;
text-align: center;
color: #fff;
- font-size: 16px;
+ font-size: 16px;
width: 224px;
padding: 5px 0;
@include border-radius(2px);
@@ -155,17 +154,17 @@ $monitor-height: 271px;
}
}
&.mac {
- background: transparent url(/images/monitor-mac.png) top right no-repeat;
+ @include background-image-2x(/images/monitor-mac, $monitor-width, $monitor-height);
padding-top: 36px;
padding-left: 40px;
height: $monitor-height - 36;
width: $monitor-width - 40;
}
&.windows {
- background: transparent url(/images/monitor-windows.png) top right no-repeat;
+ @include background-image-2x(/images/monitor-windows, $monitor-width, $monitor-height);
}
&.linux {
- background: transparent url(/images/monitor-linux.png) top right no-repeat;
+ @include background-image-2x(/images/monitor-linux, $monitor-width, $monitor-height);
}
}
@@ -199,58 +198,52 @@ $monitor-height: 271px;
background-image: url(/images/company-project-logos/facebook.png);
}
&.google {
- background-image: url(/images/company-project-logos/google.png);
+ @include background-image-2x(/images/company-project-logos/google, 108px, 65px);
}
&.twitter {
- background-image: url(/images/company-project-logos/twitter.png);
+ @include background-image-2x(/images/company-project-logos/twitter, 108px, 65px);
}
&.microsoft {
- background-image: url(/images/company-project-logos/microsoft.png);
- }
- &.blizzard {
- background-image: url(/images/company-project-logos/blizzard.png);
+ @include background-image-2x(/images/company-project-logos/microsoft, 108px, 65px);
}
&.netflix {
- background-image: url(/images/company-project-logos/netflix.png);
+ @include background-image-2x(/images/company-project-logos/netflix, 108px, 65px);
}
&.linked-in {
- background-image: url(/images/company-project-logos/linked-in.png);
+ @include background-image-2x(/images/company-project-logos/linked-in, 108px, 65px);
}
&.linux {
- background-image: url(/images/company-project-logos/linux.png);
+ @include background-image-2x(/images/company-project-logos/linux, 108px, 65px);
}
&.perl {
- background-image: url(/images/company-project-logos/perl.png);
+ @include background-image-2x(/images/company-project-logos/perl, 108px, 65px);
}
&.postgresql {
- background-image: url(/images/company-project-logos/postgresql.png);
+ @include background-image-2x(/images/company-project-logos/postgresql, 108px, 65px);
}
&.facebook {
- background-image: url(/images/company-project-logos/facebook.png);
+ @include background-image-2x(/images/company-project-logos/facebook, 108px, 65px);
}
&.android {
- background-image: url(/images/company-project-logos/android.png);
- }
- &.debian {
- background-image: url(/images/company-project-logos/debian.png);
+ @include background-image-2x(/images/company-project-logos/android, 108px, 65px);
}
&.rails {
- background-image: url(/images/company-project-logos/rails.png);
+ @include background-image-2x(/images/company-project-logos/rails, 108px, 65px);
}
&.qt {
- background-image: url(/images/company-project-logos/qt.png);
+ @include background-image-2x(/images/company-project-logos/qt, 108px, 65px);
}
&.gnome {
- background-image: url(/images/company-project-logos/gnome.png);
+ @include background-image-2x(/images/company-project-logos/gnome, 108px, 65px);
}
&.eclipse {
- background-image: url(/images/company-project-logos/eclipse.png);
+ @include background-image-2x(/images/company-project-logos/eclipse, 108px, 65px);
}
&.kde {
- background-image: url(/images/company-project-logos/kde.png);
+ @include background-image-2x(/images/company-project-logos/kde, 108px, 65px);
}
&.x {
- background-image: url(/images/company-project-logos/x.png);
+ @include background-image-2x(/images/company-project-logos/x, 108px, 65px);
}
}
}
@@ -262,27 +255,24 @@ a.icon {
line-height: 36px;
@include inline-block;
&.gui {
- background: transparent url(/images/icons/gui.png) 6px 0 no-repeat;
+ @include background-image-2x(/images/icons/gui, 18px, 24px, 6px 3px);
}
&.older-releases {
- background: transparent url(/images/icons/box.png) 0 4px no-repeat;
+ @include background-image-2x(/images/icons/box, 22px, 20px, 0 6px);
}
&.windows {
- background: transparent url(/images/icons/windows.png) 0 3px no-repeat;
+ @include background-image-2x(/images/icons/windows, 24px, 21px, 0 6px);
}
&.mac {
- background: transparent url(/images/icons/apple.png) 5px 3px no-repeat;
- }
- &.debian {
- background: transparent url(/images/icons/debian.png) 6px 4px no-repeat;
+ @include background-image-2x(/images/icons/apple, 17px, 21px, 5px 4px);
}
&.linux {
- background: transparent url(/images/icons/linux.png) 6px 4px no-repeat;
+ @include background-image-2x(/images/icons/linux, 17px, 21px, 6px 6px);
}
&.solaris {
- background: transparent url(/images/icons/solaris.png) 0 7px no-repeat;
+ @include background-image-2x(/images/icons/solaris, 25px, 12px, 0 10px);
}
&.source {
- background: transparent url(/images/icons/source-code.png) 0 4px no-repeat;
+ @include background-image-2x(/images/icons/source-code, 25px, 20px, 0 6px);
}
}
@@ -1,6 +1,7 @@
@import "compass";
@include global-reset;
+@import "mixins.css.scss";
@import "variables.css.scss";
@import "layout.css.scss";
@import "typography.css.scss";
@@ -70,7 +70,7 @@ aside {
height: 295px;
margin-top: -20px;
margin-bottom: 2em;
- background: #f4f4f1 url(/images/bg/isometric-grid.png) 0 0 repeat-x;
+ @include background-image-2x(/images/bg/isometric-grid, 35px, 21px, top right, repeat);
.inner {
padding-top: 20px;
p {
@@ -262,7 +262,7 @@ footer {
}
.site-source {
float: left;
- background: transparent url(/images/icons/code.png) 0 2px no-repeat;
+ @include background-image-2x(/images/icons/code, 38px, 23px, 0 2px);
padding-left: 46px;
}
.sfc-member {
@@ -6,7 +6,7 @@
}
.description {
font-size: 12px;
- line-height: $base-line-height * 0.7;
+ line-height: $base-line-height * 0.7;
}
}
@@ -75,9 +75,9 @@ ol#about-nav {
font-size: 14px;
line-height: 17px;
color: $font-color;
- background: transparent url(/images/icons/nav-circles.png) 0 0 no-repeat;
+ @include background-image-2x(/images/icons/nav-circles, 100px, 200px);
&.current {
- background: transparent url(/images/icons/nav-circles.png) 0 -100px no-repeat;
+ @include background-image-2x(/images/icons/nav-circles, 100px, 200px, 0 -100px);
color: #fff;
opacity: 1;
}
@@ -0,0 +1,10 @@
+@mixin background-image-2x($image_name, $w: auto, $h: auto, $pos: top right, $repeat: no-repeat, $ext: png) {
+ background: transparent url($image_name + '.' + $ext) $pos $repeat;
+ @media
+ only screen and (-webkit-min-device-pixel-ratio: 2),
+ only screen and ( min--moz-device-pixel-ratio: 2),
+ only screen and ( -o-min-device-pixel-ratio: 2/1) {
+ background: transparent url($image_name + '@2x.' + $ext) $pos $repeat;
+ background-size: $w $h;
+ }
+}
@@ -2,55 +2,55 @@
padding-left: 23px;
}
h3.setup {
- background: transparent url(/images/icons/setup-sm.png) 0 3px no-repeat;
+ @include background-image-2x(/images/icons/setup-sm, 17px, 17px, 0 50%);
}
h3.projects {
- background: transparent url(/images/icons/projects-sm.png) 0 7px no-repeat;
+ @include background-image-2x(/images/icons/projects-sm, 17px, 13px, 0 50%);
}
h3.snapshotting {
- background: transparent url(/images/icons/camera-sm.png) 0 8px no-repeat;
+ @include background-image-2x(/images/icons/camera-sm, 17px, 12px, 0 50%);
}
h3.branching {
- background: transparent url(/images/icons/branch-sm.png) 4px 4px no-repeat;
+ @include background-image-2x(/images/icons/branch-sm, 12px, 15px, 4px 50%);
}
h3.sharing {
- background: transparent url(/images/icons/sharing-sm.png) 2px 5px no-repeat;
+ @include background-image-2x(/images/icons/sharing-sm, 14px, 14px, 2px 50%);
}
h3.inspection {
- background: transparent url(/images/icons/inspection-sm.png) 1px 4px no-repeat;
+ @include background-image-2x(/images/icons/inspection-sm, 14px, 14px, 1px 50%);
}
h3.patching {
- background: transparent url(/images/icons/patching-sm.png) 1px 8px no-repeat;
+ @include background-image-2x(/images/icons/patching-sm, 18px, 11px, 1px 50%);
}
h3.debugging {
- background: transparent url(/images/icons/debugging-sm.png) 1px 5px no-repeat;
+ @include background-image-2x(/images/icons/debugging-sm, 17px, 16px, 1px 50%);
}
h3.email {
- background: transparent url(/images/icons/email-sm.png) 0px 8px no-repeat;
+ @include background-image-2x(/images/icons/email-sm, 17px, 12px, 1px 50%);
}
h3.external {
- background: transparent url(/images/icons/external-sm.png) 0px 5px no-repeat;
+ @include background-image-2x(/images/icons/external-sm, 17px, 15px, 0 50%);
}
h3.admin {
- background: transparent url(/images/icons/admin-sm.png) 2px 5px no-repeat;
+ @include background-image-2x(/images/icons/admin-sm, 16px, 16px, 2px 50%);
}
h3.server-admin {
- background: transparent url(/images/icons/server-admin-sm.png) 2px 5px no-repeat;
+ @include background-image-2x(/images/icons/server-admin-sm, 15px, 15px, 2px 50%);
}
h3.plumbing {
- background: transparent url(/images/icons/plumbing-sm.png) 2px 5px no-repeat;
+ @include background-image-2x(/images/icons/plumbing-sm, 17px, 14px, 2px 50%);
}
#reference-version {
@@ -235,15 +235,16 @@ ol.reference-previous-versions {
}
.callout.quickref {
- background: $callout-color url(/images/icons/document.png) 14px 7px no-repeat;
+ @include background-image-2x(/images/icons/document, 15px, 21px, 14px 7px);
padding-left: 36px ! important;
a {
font-weight: bold;
}
}
.callout.ref-manual {
- background: $callout-color url(/images/icons/book.png) 24px 20px no-repeat;
+ @include background-image-2x(/images/icons/book, 54px, 72px, 24px 20px);
+ background-color: $callout-color;
padding: 20px 30px 20px 100px !important;
h3 {
font-size: 18px;
@@ -255,7 +256,7 @@ ol.reference-previous-versions {
}
p.quickref {
- background: transparent url(/images/icons/document.png) 0 0 no-repeat;
+ @include background-image-2x(/images/icons/document, 15px, 21px, 0 0);
padding-left: 22px ! important;
margin-top: -0.4em;
margin-bottom: 1em;
@@ -2,7 +2,7 @@ hr.sidebar {
border: none ! important;
height: 12px;
width: 218px;
- background: transparent url(/images/sidebar-divider.png) 0 0 no-repeat;
+ @include background-image-2x(/images/sidebar-divider, 218px, 12px);
margin-bottom: 2em;
}
@@ -24,8 +24,12 @@ def latest_relnote_url
# overriding this because we're not using asset pipeline for images,
# but jason is using image_tag
- def image_tag(image)
- raw "<img src=\"/images/" + image + "\"/>"
+ def image_tag(image, options = {})
+ out = "<img src='/images/" + image + "'"
+ out += " width='" + options[:width].to_s + "'" if options[:width]
+ out += " height='" + options[:height].to_s + "'" if options[:height]
+ out += " />"
+ raw out
end
end
Oops, something went wrong.

0 comments on commit e640167

Please sign in to comment.