Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Bug 731678 channelpage #90

Merged
merged 11 commits into from May 11, 2012

Conversation

Projects
None yet
2 participants
Contributor

sgarrity commented May 11, 2012

Ported the channel page to bedrock along with a new design from https://bugzilla.mozilla.org/show_bug.cgi?id=731678

@jlongster jlongster commented on an outdated diff May 11, 2012

apps/firefox/templates/firefox/channel.html
+ <div class="download-box mobile" id="firefox-mobile">
+ {{ mobile_download_button('primary-download-mobile', 'channel') }}
+ </div>
+ <p class="more"><a href="{{ php_url('/firefox/') }}">Learn more about Firefox<span> »</span></a></p>
+ </div>
+
+ <div id="aurora" class="pager-page">
+ <h2 class="channel-title channel-title-aurora"><img src="{{ media('/img/firefox/channel/title-aurora.png') }}" alt="Firefox Aurora" /></h2>
+ <h3>The newest innovations in an experimental environment</h3>
+ <div class="download-box" id="aurora-desktop">
+ {{ download_button('download', 'channel', build='aurora') }}
+ </div>
+ <div class="download-box mobile" id="aurora-mobile">
+ {{ mobile_download_button('beta-download-mobile', 'channel', build='aurora') }}
+ </div>
+ <p class="more"><a href="/<?=$lang?>/mobile/aurora/">Learn more about Firefox Aurora<span> »</span></a></p>
@jlongster

jlongster May 11, 2012

Member

Hardcoded URL. This is python now, right?

{{ url('firefox.mobile_aurora') }}

Or whatever the name of the page is.

@jlongster jlongster commented on an outdated diff May 11, 2012

apps/mozorg/templates/mozorg/home.html
@@ -32,7 +32,7 @@
<li><small>Fast, flexible, <br>secure</small></li>
</ul>
- {{ download_button('download','small') }}
+ {{ mobile_download_button('download', 'small', 'aurora') }}
@jlongster

jlongster May 11, 2012

Member

This was my mistake, I committed this. Please revert this change so that the main download button doesn't point to the mobile version :)

@jlongster jlongster commented on an outdated diff May 11, 2012

media/css/sandstone-guide.less
@@ -31,17 +31,21 @@
}
}
}
- li#theme-sand a span {
+ li#theme-sand a span {

@jlongster jlongster commented on an outdated diff May 11, 2012

media/css/sandstone-guide.less
background: url(/media/img/sandstone/bg-sand.png);
}
- li#theme-sky a span {
+ li#theme-sky a span {
@jlongster

jlongster May 11, 2012

Member

space space

@jlongster jlongster commented on the diff May 11, 2012

media/css/sandstone/sandstone.less
@@ -285,7 +323,7 @@ px 68 160 252 344 436 528 620 712 804 896 */
#masthead {
h2 {
- padding: (@baseLine * 2) 0 (@baseLine * 1.5) 0;
+ padding: (@baseLine * 1.5) 0;
@jlongster

jlongster May 11, 2012

Member

Woot, that's cool

@jlongster jlongster commented on the diff May 11, 2012

media/css/sandstone/variables.less
@@ -1,11 +1,15 @@
@textColorPrimary: #333;
@textColorSecondary: #484848;
-@textColorTertiary: #666;
+@textColorTertiary: #666;
@sgarrity

sgarrity May 11, 2012

Contributor

This is to line up with the other colors on the lines before/after.

Member

jlongster commented May 11, 2012

Looks great, r+ if you fix the home download button and the hardcoded URL. Let me know when you finished those and I'll merge it in.

@sgarrity sgarrity merged commit a4fc5da into mozilla:dev May 11, 2012

@craigcook craigcook added a commit that referenced this pull request Feb 25, 2013

@craigcook craigcook Merge pull request #90 from mozilla/mwc-sancus-fx
[Fix Bug 828671] Update android content on /fx
67da59a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment