New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bug 1210864 - Add Private Browsing to Firefox Family subnav #3474
Bug 1210864 - Add Private Browsing to Firefox Family subnav #3474
Conversation
Should add the link to the iOS subnav as well. |
@craigcook Oh I thought that's what you would do? I am confusing what you were going to add the menu. |
Sorry, I added the iOS top link and subnav previously but couldn't add Private Browsing to the iOS subnav until the page was ready. I'm happy to add it separately once this merges but it doesn't have to wait, it can go into the same commit if you're up for it. |
@craigcook Ahh okay no problemo! |
ee3b9a4
to
8bfbbda
Compare
r? |
8bfbbda
to
a3fb999
Compare
Includes a waffle switch. r? |
@@ -482,6 +482,9 @@ | |||
</li> | |||
<li><a href="{{ url('firefox.sync') }}"{% if activesub == 'sync' %} class="selected"{% endif %}><div>{{ _('Sync') }}</div></a></li> | |||
<li><a href="{{ url('firefox.hello') }}"{% if activesub == 'hello' %} class="selected"{% endif %}><div>{{ _('Hello') }}</div></a></li> | |||
{% if l10n_has_tag('tracking_protection') and waffle.switch('tracking-protection') %} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove the l10n tag check, only waffle is needed. We can't use tags on a shared thing like navigation.
609d9ef
to
f38163a
Compare
We knew it would eventually come to this - the subnav is now too long in some locales. Here's a shot of es-ES at tablet viewport: Unless there are other tenable ideas, I think our best option is to drop the sub-sub nav (Trusted/Flexible/Fast) for the desktop pages. Will need to get sign-off from jbertsch & habber. |
e671f05
to
f619a1e
Compare
@@ -281,7 +281,7 @@ | |||
opacity: 0.8; | |||
height: 77px; | |||
line-height: 77px; | |||
max-width: 125px; // uhhh, seems to work? | |||
//max-width: 145px; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should keep this restriction in place, and should set it to 129px
. At tablet width, the #desktop-subnav
is 556px wide, which, divided by 4 (the max elements now possible in the subnav) is 139. Each <a>
has a left and right padding of 5px, hence 129.
If this restriction isn't in place, text will not wrap to two lines, which means an <li>
could get pushed underneath and out of view for some locales.
One small CSS issue, but otherwise looking good! r+wc |
d5c42fa
to
f2ef5cf
Compare
@jpetto updated and squashed commits. |
f2ef5cf
to
2143b7d
Compare
Gah, I'm sorry to ask this late, but can we make a special CSS rule for I think we can just add a bit of CSS to line 428:
|
2143b7d
to
0ad71cd
Compare
@jpetto no problemo updated! |
Looks great! Just waiting for Travis... ⌛ |
…-to-family-nav Bug 1210864 - Add Private Browsing to Firefox Family subnav
https://bugzilla.mozilla.org/show_bug.cgi?id=1210864