add new footer for desktop (bug 811345)
This commit is contained in:
Chris Van
Родитель
929bcc00ea
Коммит
590693e04b
|
|
@ -1,26 +1,34 @@
|
|||
@import 'lib';
|
||||
|
||||
#footzilla {
|
||||
background: url(../../img/mkt/logos/footzilla.png) 0 5px no-repeat;
|
||||
float: left;
|
||||
text-indent: -9999px;
|
||||
width: 100px;
|
||||
a {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
#footzilla,
|
||||
#footzilla a {
|
||||
height: 26px;
|
||||
width: 100px;
|
||||
}
|
||||
|
||||
#footer {
|
||||
.border-box;
|
||||
border-top: 1px solid @faint-gray;
|
||||
color: @note-gray;
|
||||
padding-top: 2em;
|
||||
overflow: hidden;
|
||||
padding: 30px 0;
|
||||
width: 100%;
|
||||
#footzilla {
|
||||
background: url(../../img/hub/footzilla.png) no-repeat;
|
||||
float: left;
|
||||
height: 50px;
|
||||
margin-top: 5px;
|
||||
opacity: .5;
|
||||
text-indent: -9999px;
|
||||
width: 100px;
|
||||
}
|
||||
p, ul {
|
||||
.border-box;
|
||||
border-left: 1px dotted @faint-gray;
|
||||
font-size: 12px;
|
||||
border-left: 1px dotted @light-gray;
|
||||
font-size: 11px;
|
||||
line-height: 1.3;
|
||||
margin-bottom: 1.5em;
|
||||
margin: 0;
|
||||
padding-left: 1em;
|
||||
}
|
||||
p {
|
||||
|
|
@ -29,10 +37,27 @@
|
|||
}
|
||||
ul {
|
||||
float: right;
|
||||
line-height: 1.1;
|
||||
line-height: 1.2;
|
||||
width: 20%;
|
||||
li + li {
|
||||
margin-top: 2px;
|
||||
a {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
li + li {
|
||||
margin-top: 2px;
|
||||
}
|
||||
a {
|
||||
color: lighten(#2189d9, 10%);
|
||||
&:hover {
|
||||
color: #2189d9;
|
||||
text-decoration: underline;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@media @retina {
|
||||
#footzilla {
|
||||
background-image: url(../../img/mkt/logos/footzilla-2x.png);
|
||||
background-size: 81px auto;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,6 +46,10 @@
|
|||
@mono-stack: Menlo, "Ubuntu Mono", "Andale Mono", monospace;
|
||||
|
||||
|
||||
// Retina
|
||||
@retina: ~'screen and (-webkit-min-device-pixel-ratio: 2), screen and (min--moz-device-pixel-ratio: 2), screen and (min-device-pixel-ratio: 2)';
|
||||
|
||||
|
||||
// Fixed Sizes
|
||||
@page-min-height: 404px; // height of the current gradient background image on #page
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
}
|
||||
|
||||
* {
|
||||
text-rendering: optimizeLegibility;
|
||||
text-rendering: optimizeLegibility;
|
||||
}
|
||||
|
||||
a[rel="external"]:after, a.external:after {
|
||||
|
|
@ -470,20 +470,3 @@ a.app-source, .app-generator-detail #download-link {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
#footer {
|
||||
float: left;
|
||||
padding: 1.5em 0 1em;
|
||||
|
||||
p {
|
||||
width: 550px;
|
||||
}
|
||||
|
||||
ul {
|
||||
float: left;
|
||||
}
|
||||
|
||||
#footzilla {
|
||||
margin-top: 16px;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,10 @@
|
|||
@mono-stack: "andale mono", monospace;
|
||||
|
||||
|
||||
// Retina
|
||||
@retina: ~'screen and (-webkit-min-device-pixel-ratio: 2), screen and (min--moz-device-pixel-ratio: 2), screen and (min-device-pixel-ratio: 2)';
|
||||
|
||||
|
||||
// Fixed Sizes
|
||||
@page-min-height: 404px; // height of the current gradient background image on #page
|
||||
|
||||
|
|
|
|||
|
|
@ -668,10 +668,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
@media screen and (-webkit-min-device-pixel-ratio: 1.5),
|
||||
screen and (min--moz-device-pixel-ratio: 1.5),
|
||||
screen and (min--moz-device-pixel-ratio: 1.5),
|
||||
screen and (min-device-pixel-ratio: 1.5) {
|
||||
@media @retina {
|
||||
#holiday {
|
||||
.amazon, .ebay {
|
||||
background-size: auto 50%;
|
||||
|
|
|
|||
|
|
@ -120,10 +120,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
@media screen and (-webkit-min-device-pixel-ratio: 1.5),
|
||||
screen and (min--moz-device-pixel-ratio: 1.5),
|
||||
screen and (min--moz-device-pixel-ratio: 1.5),
|
||||
screen and (min-device-pixel-ratio: 1.5) {
|
||||
@media @retina {
|
||||
.incompatible-browser {
|
||||
div {
|
||||
background-image: url(../../img/mkt/icons/firefox-beta-2x.png);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,18 @@
|
|||
@import 'lib';
|
||||
|
||||
#footer,
|
||||
#directory-footer {
|
||||
display: none;
|
||||
}
|
||||
|
||||
@media (min-width: @desktop) {
|
||||
body {
|
||||
background: @white;
|
||||
}
|
||||
#page {
|
||||
background: @grain-src @bg;
|
||||
}
|
||||
|
||||
#featured-home {
|
||||
border-bottom: 1px solid @white;
|
||||
}
|
||||
|
|
@ -46,4 +58,98 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
footer {
|
||||
padding: 30px 0;
|
||||
.pad {
|
||||
margin: 0 auto;
|
||||
padding: 0;
|
||||
width: 600px; // TODO: Change this to 768px when we increase page width.
|
||||
}
|
||||
ul {
|
||||
list-style: none;
|
||||
}
|
||||
}
|
||||
|
||||
#footer,
|
||||
#directory-footer {
|
||||
display: block;
|
||||
}
|
||||
|
||||
#footer {
|
||||
background: @white;
|
||||
border-top-color: rgba(0,0,0,.08);
|
||||
}
|
||||
|
||||
#directory-footer {
|
||||
.box-shadow(0 1px 0 rgba(3,16,26,.15) inset);
|
||||
background: #d5d9dc @grain-src;
|
||||
//min-height: 100px;
|
||||
.devhub {
|
||||
background: url(../../img/mkt/icons/rocket.png) 0 35px no-repeat;
|
||||
margin: -30px -20px -30px;
|
||||
padding: 30px 20px 30px 60px;
|
||||
h1 {
|
||||
color: @dark-gray;
|
||||
font-size: 20px;
|
||||
text-shadow: 0 1px 1px rgba(245,247,250,.75);
|
||||
}
|
||||
b {
|
||||
font-size: 14px;
|
||||
font-weight: 400;
|
||||
}
|
||||
&:hover {
|
||||
text-decoration: none;
|
||||
h1 {
|
||||
color: @black;
|
||||
}
|
||||
b {
|
||||
text-decoration: underline;
|
||||
}
|
||||
}
|
||||
}
|
||||
.group {
|
||||
float: left;
|
||||
min-height: 71px;
|
||||
padding: 0 20px; // TODO: Change this to 40px when we increase page width.
|
||||
width: 25%;
|
||||
position: relative;
|
||||
&:after,
|
||||
+ .group:before {
|
||||
content: "";
|
||||
display: block;
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
width: 1px;
|
||||
}
|
||||
&:after {
|
||||
.gradient(~'top, rgba(185,190,195,0), rgba(185,190,195,.75) 25%, rgba(185,190,195,.75) 75%, rgba(185,190,195,0) 100%');
|
||||
right: 0;
|
||||
}
|
||||
+ .group:before {
|
||||
.gradient(~'top, rgba(226,228,231,0), rgba(226,228,231,.75) 25%, rgba(226,228,231,.75) 75%, rgba(226,228,231,0) 100%');
|
||||
left: 0;
|
||||
}
|
||||
&:first-child {
|
||||
width: 50%;
|
||||
}
|
||||
&:last-child:after {
|
||||
display: none;
|
||||
}
|
||||
a {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (min-width: @desktop),
|
||||
@retina {
|
||||
#directory-footer {
|
||||
.devhub {
|
||||
background-image: url(../../img/mkt/icons/rocket-2x.png);
|
||||
background-size: 47px auto;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -96,6 +96,10 @@
|
|||
@open-stack: "Open Sans", "Helvetica Neue", Arial, sans-serif;
|
||||
|
||||
|
||||
// Retina
|
||||
@retina: ~'screen and (-webkit-min-device-pixel-ratio: 2), screen and (min--moz-device-pixel-ratio: 2), screen and (min-device-pixel-ratio: 2)';
|
||||
|
||||
|
||||
// Mixins
|
||||
@grain-src: url(../../img/mkt/grain.png);
|
||||
.grain() {
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@
|
|||
}
|
||||
|
||||
@media screen and (-webkit-min-device-pixel-ratio: 1.5),
|
||||
screen and (min--moz-device-pixel-ratio: 1.5),
|
||||
screen and (min--moz-device-pixel-ratio: 1.5),
|
||||
screen and (min-device-pixel-ratio: 1.5) {
|
||||
#splash-overlay {
|
||||
|
|
|
|||
Двоичные данные
media/img/hub/footzilla.png
Двоичные данные
media/img/hub/footzilla.png
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 1.8 KiB |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 1.4 KiB |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 927 B |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 918 B |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 665 B |
|
|
@ -930,6 +930,10 @@ class TestFeedback(amo.tests.TestCase):
|
|||
"""Check that anonymous users get the correct feedback page."""
|
||||
res = self.client.get(self.url)
|
||||
eq_(res.status_code, 200)
|
||||
eq_(pq(res.content)('footer .feedback').attr('href'), self.url)
|
||||
|
||||
res = self.client.get(self.url, {'mobile': 'true'})
|
||||
eq_(res.status_code, 200)
|
||||
doc = pq(res.content)
|
||||
assert not doc('.toggles')
|
||||
eq_(doc('.header-button.settings').attr('href'), self.url)
|
||||
|
|
|
|||
|
|
@ -154,6 +154,7 @@ CSS = {
|
|||
CSS.update({
|
||||
'mkt/consumer-desktop': CSS['mkt/consumer'] + (
|
||||
# TODO: Split components into individual, appropriate stylesheets.
|
||||
'css/devreg/footer.less',
|
||||
'css/mkt/desktop.less',
|
||||
),
|
||||
})
|
||||
|
|
|
|||
|
|
@ -17,23 +17,3 @@
|
|||
</div>
|
||||
</section>
|
||||
{% endblock %}
|
||||
|
||||
{% block sitefooter %}
|
||||
<footer id="site-footer">
|
||||
<div>
|
||||
<p id="access-devhub">
|
||||
<b>Have an app to submit?</b>
|
||||
The Marketplace Developers site is now open.
|
||||
<a href="{{ url('ecosystem.landing') }}">Upload your app »</a>
|
||||
</p>
|
||||
<div>
|
||||
<nav class="footer-links" role="navigation">
|
||||
<a href="{{ url('site.privacy') }}">
|
||||
{{ _('Privacy Policy') }}</a>
|
||||
<a href="{{ url('site.terms') }}">
|
||||
{{ _('Terms of Use') }}</a>
|
||||
</nav>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -175,29 +175,7 @@
|
|||
<span></span>
|
||||
</div>
|
||||
{% block site_nav_footer %}{% endblock %}
|
||||
<footer id="footer" class="c">
|
||||
<div class="pad">
|
||||
<h1 id="footzilla">mozilla</h1>
|
||||
<p>
|
||||
{% trans %}
|
||||
Except where otherwise
|
||||
<a href="http://mozilla.com/about/legal.html#site">noted</a>,
|
||||
content on this site is licensed under the <br />
|
||||
<a href="http://creativecommons.org/licenses/by-sa/3.0/">
|
||||
Creative Commons Attribution Share-Alike License v3.0
|
||||
</a> or any later version.
|
||||
{% endtrans %}
|
||||
</p>
|
||||
<ul>
|
||||
<li><a href="{{ url('site.privacy') }}">
|
||||
{{ _('Privacy Policy') }}</a></li>
|
||||
<li><a href="{{ url('site.terms') }}">
|
||||
{{ _('Terms of Use') }}</a></li>
|
||||
<li><a href="http://mozilla.com/legal/fraud-report/index.html">
|
||||
{{ _('Report Trademark Abuse') }}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</footer>
|
||||
{% include 'mkt/footer.html' %}
|
||||
|
||||
{% if not logged %}
|
||||
<div id="login" class="overlay">
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ class TestCreate(ReviewTest):
|
|||
r = self.client.get(self.add)
|
||||
eq_(r.status_code, 200)
|
||||
self.assertTemplateUsed(r, 'ratings/add.html')
|
||||
eq_(pq(r.content)('#site-header h1').html(), 'Edit Your Review')
|
||||
assert pq(r.content)('title').text().startswith('Edit Your Review')
|
||||
|
||||
def test_add_admin(self):
|
||||
self.log_in_admin()
|
||||
|
|
|
|||
|
|
@ -6,3 +6,29 @@
|
|||
{% block site_css %}
|
||||
{{ css('mkt/consumer-desktop') }}
|
||||
{% endblock %}
|
||||
|
||||
{% block sitefooter %}
|
||||
<footer id="directory-footer" class="c">
|
||||
<div class="pad">
|
||||
<div class="group">
|
||||
<a class="devhub" href="{{ url('ecosystem.landing') }}">
|
||||
<h1>{{ _('Develop apps for the Marketplace!') }}</h1>
|
||||
<b>{{ _('Visit the Developer Hub') }}</b>
|
||||
</a>
|
||||
</div>
|
||||
{% if logged and tools_links|length > 1 %}
|
||||
<div class="group">
|
||||
{% for link in tools_links[1:] -%}
|
||||
<a href="{{ link.href }}" class="sync">{{ link.text }}</a>
|
||||
{%- endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="group">
|
||||
<a href="{{ url('ecosystem.landing') }}">{{ _('Developer Hub') }}</a>
|
||||
<a href="{{ url('account.feedback') }}" class="feedback">{{ _('Feedback') }}</a>
|
||||
<a href="https://support.mozilla.org/en-US/products/marketplace">{{ _('Support') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
{% include 'mkt/footer.html' %}
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
<footer id="footer">
|
||||
<div class="pad">
|
||||
<h1 id="footzilla"><a href="https://www.mozilla.org/">mozilla</a></h1>
|
||||
<p>
|
||||
{% trans legal_url='http://www.mozilla.org/about/legal.html#site',
|
||||
cc_url='http://creativecommons.org/licenses/by-sa/3.0/' %}
|
||||
Except where otherwise <a href="{{ legal_url }}">noted</a>,
|
||||
content on this site is licensed under the
|
||||
<a href="{{ cc_url }}">Creative Commons Attribution Share-Alike License v3.0</a>
|
||||
or any later version.
|
||||
{% endtrans %}
|
||||
</p>
|
||||
<ul>
|
||||
<li><a href="{{ url('site.privacy') }}">
|
||||
{{ _('Privacy Policy') }}</a></li>
|
||||
<li><a href="{{ url('site.terms') }}">
|
||||
{{ _('Terms of Use') }}</a></li>
|
||||
<li><a href="http://mozilla.com/legal/fraud-report/index.html">
|
||||
{{ _('Report Trademark Abuse') }}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</footer>
|
||||
Загрузка…
Ссылка в новой задаче