Permalink
Browse files

Bug 814203: Fix IE6 issues.

  • Loading branch information...
1 parent 5536d75 commit 0ad7cf0201e35d28a7dca2d2350991c0dc0415a2 @jpetto jpetto committed with pmac Dec 20, 2012
View
9 apps/firefox/templates/firefox/new-b.html
@@ -50,16 +50,14 @@ <h1 class="large">{{_('Different <span>by design</span>')}}</h1>
</p>
<ol class="installation">
- <li>
- <img src="" data-src="{{ media('img/firefox/new/install1-win.png') }}" class="install-image" id="install1" alt="" />
+ <li id="install1">
<strong>{{_('1')}}.</strong>
<span class="install-win">
{{_('Start the process by clicking Run.')}}
</span>
{{_('Your download should begin automatically. If not, <a id="%s" href="">click here</a>. It could take a few minutes, but it’s worth the wait.')|format('direct-download-link')}}
</li>
- <li>
- <img src="" data-src="{{ media('img/firefox/new/install2-win.png') }}" class="install-image" id="install2" alt="" />
+ <li id="install2">
<strong>{{_('2')}}.</strong>
<span class="install-osx">
{{_('When prompted, drag the Firefox icon into the image of your Applications folder.')}}
@@ -68,8 +66,7 @@ <h1 class="large">{{_('Different <span>by design</span>')}}</h1>
{{_("Click Run to launch the Mozilla Firefox setup wizard. Then, just follow the steps (we've made the process as painless as possible).")}}
</span>
</li>
- <li>
- <img src="" data-src="{{ media('img/firefox/new/install3-win.png') }}" class="install-image" id="install3" alt="" />
+ <li id="install3">
<strong>{{_('3')}}.</strong>
<span class="install-osx">
{{_('Drag the Firefox icon from the Applications folder into the dock. Then, just click on Firefox whenever you want to use the web!')}}
View
44 media/css/firefox/new-test.less
@@ -20,7 +20,7 @@
top: 0;
bottom: 0;
width: 100%;
- background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC4AAAAuCAMAAABgZ9sFAAAAOVBMVEWzs7OoqKjDw8PPz8+YmJjb29uNjY2AgIDn5+d0dHTy8vJpaWn///+mpqaWlpaOjo7Z2dlcXFyXl5d+/Ed9AAAAE3RSTlMTExMTExMTExMTExMTExMTExMTdz7yJQAAAy1JREFUeF6VlQ2OXkUQxFw/3TPvfZsEuP9hOQAINjcolSybpvZGjVwMU2kdR1afWhGplMuKRsm1VusIL3HD+DEnaeixZaNleCGRj0zarS+mkZ9cxtHpelIJArGKlO3O8ivy2rbXznF6dVPY62z/gHtCUVYurLoS4jLt7J8jHnCxV2HOHWY6uJrR0UQSRh3Zqq2tiFtjWRrVJEa7vqG79rVxo7TXPWe9QvdQNxRODtgwc2uOGrPvepSpZ0MnnoKY9IT1RhcFvTd0iUXU0WsD664TNUlQJIhbHwyPdcaTvojy7FUd0RuJKJLt1YvygVgf2xraMfJtGjBGO0TJw8JB8XtOLHtnKoX/GCqGgZGIiO8xv3OLTL2EUZTYmloJuPUzO1vt5iW2RIjIl0dyXYNG8zZqY9c48SrbDVqikTS560NVO8XM0Nx6n5yK3GgYkYiX1KmsV0dG0vHIGVNzmuzKHJibil12vNJfY00tOZu+bRUNTLwUao69RJfpodopMle1oDzN4tpOWbmcIxFg0ila+zJdLmZFTjg/8pgVEmRuZS6OZVNXyTqPsPdk5rCD/YzmDMZmWYICcRR1Y4Er3vEKhrM6msqo4fVo5K31eDvJTiKfpwxzj0iqo0exDiqQzzOUR3q7IcFvF7qXFS/gwu1aFZQpHN9+ETuqd4VVmxmTM7KOPGdvX2sISUXADFaZJuHeKSTuvljKkkq1JN3ngNBXDs+TLiUCyyzaU8VYgHLcp/Jsg4lV9PNGUix5V/ps6ciN7Oy42DD+HdYn5jvejd3DKCKzhLrqN3Cj43XljZ24SJkdmanwbS1tuKoGbBp7RCMezbmfu+KyFPgy+65lNyrb4FTqWmaHIvcgonGXDJc+t18D/6oTgzSaPVaqs5XQi1GQ5AHaJf83rpPHCLyxe1ZC1jrQS7Qqmu5g4b7qNBqwBZbFOZkxtED1y0JowTuPMXrOl+nKwoKf+SQ4W+fojGFugIK4adQzLUmMaLz0kohTryCLuLqUqTQhRpHxWvpnt+gh8559d86NML31JX4V3Y22EC2JL4VizfeSBsrEm7L2D3Ezp3iiO69vLOzzSmrtvwHzThlF3RYPUQAAAABJRU5ErkJggg==);
+ background: url(/media/img/firefox/new/bg-noise.png);
}
}
@@ -103,7 +103,7 @@
line-height: 100%;
color: @textColorSecondary;
.open-sans-light;
- background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAB1CAMAAACiRJviAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAHVQTFRFAAAAN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIN0FIQEl50QAAACd0Uk5TAAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmZiD6WAAAAUFJREFUOI1tU0sSQzEIAu9/Z7rwh+nrdKYxKgKxQWI/AfBEFgbJDcOD6qP38fRdzLl5cqQ1Rp4rDhJbHAnBrXyZ9Yxkffq4mDAVkRLqIis7nHmVS4HsPkfpCY5SVI0LE4WYSlThVuJB+dNA9hu1F2GzWZ61TbFtOX3bWsO+Cmr+cGnQ6GPPm/kcZs5zFOXlKLIFKeeft52oB4Acr1nMYJ/APBfAvxz8je6WP/8Aj9i0P3I3Uv5KX5W6fRaGBM1FCG/lJEOWVCBhJGVOdZQQdXTMnSBLRpPW5k4lkN+cLkE1oYROH6YzIDQTKFE0GlKPXHsxf5llmwAIIWDCrizcf9amCJ1TOaGjdlUUynptmgIz+jrhLn05mNhVW07g1fBwaQcN06SXZ7MTuNrRvnelc3m37qi13EJMn2v3zfKwN/Jr3g9aywD8JHqUKAAAAABJRU5ErkJggg==) right top no-repeat;
+ background: url(/media/img/firefox/new/features-divider.png) right top no-repeat;
&:last-child {
background: none;
}
@@ -136,21 +136,35 @@
li {
float: left;
width: 248px;
- padding: 0 26px;
+ padding: 196px 0 0 0;
overflow: hidden;
- margin: 0;
+ margin: 0 26px;
text-align: left;
font-size: 12px;
color: @textColorTertiary;
font-style: italic;
- img {
- display: block;
- margin: 0 0 5px 0;
- width: 100%;
- height: auto;
- }
+ background-size: 100%;
+ background-repeat: no-repeat;
}
}
+
+ #install3 { margin-right: 0; }
+}
+
+.osx .ready-for-scene2 {
+ #install1 { background-image: url(/media/img/firefox/new/install1-mac.png); }
+ #install2 { background-image: url(/media/img/firefox/new/install2-mac.png); }
+ #install3 { background-image: url(/media/img/firefox/new/install3-mac.png); }
+}
+
+.windows .ready-for-scene2 {
+ #install1 { background-image: url(/media/img/firefox/new/install1-win.png); }
+ #install2 { background-image: url(/media/img/firefox/new/install2-win.png); }
+ #install3 { background-image: url(/media/img/firefox/new/install3-win.png); }
+}
+
+.winIE8 .ready-for-scene2 #install1 {
+ background-image: url(/media/img/firefox/new/install1-winIE8.png);
}
.osx .install-win { display: none; }
@@ -269,7 +283,8 @@ noscript {
width: 700px;
li {
width: 200px;
- padding: 0 15px;
+ padding: 159px 0 0 0;
+ margin: 0 15px;
}
}
}
@@ -307,7 +322,7 @@ noscript {
}
#masthead h2 { display: none; }
.theater, .stage, .scene {
- height: 310px;
+ height: 356px;
}
#main-feature {
padding-bottom: 0px;
@@ -374,11 +389,10 @@ noscript {
font-style: normal;
text-align: left;
padding: 0;
- img {
- display: none;
- }
}
}
+
+ #install1, #install1.mac, #install1.winIE8, #install2, #install2.mac, #install3, #install3.mac { background: none; }
}
.android {
View
BIN media/img/firefox/new/features-divider.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
15 media/js/firefox/new.js
@@ -7,21 +7,12 @@
// Load images on load so as not to block the loading of other images.
$(window).on('load', function() {
- // Replace install images depending on the user's platform.
- var $install1 = $('#install1');
- var $install2 = $('#install2');
- var $install3 = $('#install3');
- var img_os = (site.platform === 'osx') ? 'mac' : 'win';
-
- $('html').addClass('ready-for-scene2');
- $install2.attr('src', $install2.data('src').replace(/win/gi, img_os));
- $install3.attr('src', $install3.data('src').replace(/win/gi, img_os));
-
// Screen 1 is unique for IE < 9
if (site.platform === 'windows' && $.browser.msie && $.browser.version < 9) {
- img_os = 'winIE8';
+ $('html').addClass('winIE8');
}
- $install1.attr('src', $install1.data('src').replace(/win/gi, img_os));
+
+ $('body').addClass('ready-for-scene2');
});
// Bind events on domReady.

0 comments on commit 0ad7cf0

Please sign in to comment.