Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

some base b2g mobile stuff

  • Loading branch information...
commit 9a27828a3024d106892d14a468dbc91dcd1d0520 1 parent 0d41a02
@potch potch authored
View
17 media/css/mkt/header.less
@@ -255,7 +255,24 @@
}
}
}
+ .featured.slider {
+ background-image: url(../../img/mkt/grain.png),
+ linear-gradient(#394C58, #60747F);
+ background-image: url(../../img/mkt/grain.png),
+ -moz-linear-gradient(#394C58, #60747F);
+ background-image: url(../../img/mkt/grain.png),
+ -webkit-linear-gradient(#394C58, #60747F);
+ background-image: url(../../img/mkt/grain.png),
+ -webkit-gradient(linear, left bottom, left top, from(#60747F), to(#394C58));
+ }
#site-header {
+ height: 53px;
+ h1 {
+ padding: 1px 0 0;
+ }
+ .menu-button {
+ margin-top: 14px;
+ }
nav #flyout {
top: 115px;
&.active {
View
1  media/css/mkt/home.less
@@ -29,6 +29,7 @@
-webkit-gradient(linear, left bottom, left top, from(#60747F), to(#394C58));
/*.gradient-two-color(#394C58, #60747F);*/
min-height: 320px;
+ overflow: hidden;
color: @white;
overflow: hidden;
text-shadow: 0 1px 0 rgba(0,0,0,.25);
@cvan Owner
cvan added a note

we can get that weird hiccup where the header and #page meet (see). I removed the box-shadow hack when I started fiddling with things. maybe we can use the original hack - or hopefully we can ditch it and do something smarter. the latter would make @cvan :satisfied:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
View
2  media/css/mkt/lib.less
@@ -20,7 +20,7 @@
@spacing: @gutter * @px;
//Breakpoints
-@3col: 0px;
+@3col: 400px;
@4col: 480px;
@7col: 672px;
@10col: 1024px;
View
58 media/css/mkt/site.less
@@ -141,6 +141,26 @@ body {
}
}
+#site-footer {
+ background-color: @pale-bg;
+ .grain;
+ padding: 16px;
+ text-align: center;
+ .footer-links {
+ a:before {
+ content: "\00b7";
+ margin: 0 4px;
+ color: @gray;
+ }
+ a:hover:before {
+ text-decoration: none;
+ }
+ a:first-child:before {
+ content: none;
+ }
+ }
+}
+
// 10 columns (portrait tablet)
@media (max-width: @10col) {
#site-header, #page {
@@ -163,19 +183,40 @@ body {
#site-header section {
.width(5.5);
}
+ #search {
+ display: none;
+ }
+ #site-footer {
+ padding: 0;
+ .footer-links {
+ text-align: left;
+ a {
+ display: block;
+ padding: 10px;
+ font-size: 18px;
+ border-bottom: 1px solid black;
+ &:first-child {
+ border-top: 1px solid black;
+ }
+ &:before {
+ content: none;
+ }
+ }
+ }
+ }
}
// 3 columns (portrait smartphone)
@media (max-width: @3col) {
#site-header, #page {
> section, > section.full > div {
- .width(3);
+ .border-box;
+ width: 100%;
+ min-width: 320px;
}
- }
- #site-header {
- margin-bottom: 20px;
> section {
- .width(3);
+ padding-left: 10px;
+ padding-right: 10px;
}
}
}
@@ -226,13 +267,6 @@ body {
}
}
-#site-footer {
- background-color: @pale-bg;
- .grain;
- padding: 16px;
- text-align: center;
-}
-
// Fixes z-index footer issue on login page.
.login #site-footer {
background: none;
View
7 media/css/mkt/slider.less
@@ -255,3 +255,10 @@
right: 5px;
}
}
+
+@media (max-width: @4col) {
+ .promo-slider ul li {
+ margin-right: 11px;
+ }
+
+}
View
7 media/js/mkt/slider.js
@@ -81,6 +81,9 @@ z.page.on('fragmentloaded', function() {
}
function initSliders() {
+ if (z.capabilities.touch) {
+ return;
+ }
$('.categories h3').linefit();
$('.promo-grid h3').lineclamp(2);
$('.slider').each(function() {
@@ -92,8 +95,8 @@ z.page.on('fragmentloaded', function() {
perPage = itemsPerPage($li),
maxPage = numPages($li, perPage);
- $prevLink.click(_pd(prevPage));
- $nextLink.click(_pd(nextPage));
+ $prevLink.on('touchstart', _pd(prevPage));
@cvan Owner
cvan added a note

this breaks desktop though, right?

@potch Owner
potch added a note

oops, yeah this bit was an accidental checkin

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+ $nextLink.on('touchstart', _pd(nextPage));
var showNext = false,
$window = $(window),
View
27 mkt/templates/mkt/base.html
@@ -14,6 +14,7 @@
<meta name="robots" content="noindex">
{% endif %}
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
+ <meta name="apple-mobile-web-app-capable" content="yes">
{% block extrameta %}{% endblock %}
<title>{% block title %}{{ _('Mozilla Marketplace') }}{% endblock %}</title>
@@ -69,32 +70,28 @@
{% else %}
{{ request.amo_user.email }}
{% endif %}
- <a href="{{ url('users.logout') }}">(log out)</a>
- <p>
+ {% endif %}
+ <nav class="footer-links">
@cvan Owner
cvan added a note

this gets funny on desktop - we should probably add a max-width

@potch Owner
potch added a note

That's an opinion :grin:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+ {% if logged %}
+ <a href="{{ url('users.logout') }}">Log out</a>
{% for link in tools_links %}
<a href="{{ link.href }}">{{ link.text }}</a>
- {% if not loop.last %}&middot;{% endif %}
+ {% if not loop.last %}{% endif %}
{% endfor %}
- {% if tools_links|length > 2 %}
- <br>
- {% elif request.can_view_consumer %}
- &middot;
- {% endif %}
{% if request.can_view_consumer %}
<a href="{{ url('account.purchases') }}">
{{ _('Account History') }}</a>
- &middot;
<a href="{{ url('account.settings') }}">
{{ _('Account Settings') }}</a>
{% endif %}
- </p>
- {% else %}
+ {% endif %}
+ <a href="{{ url('site.privacy') }}">{{ _('Privacy Policy') }}</a>
+ <a href="{{ url('site.terms') }}">{{ _('Terms of Use') }}</a>
+ </nav>
+ {% if not logged %}
<a class="button browserid" href="#">{{ _('Log in / Register') }}</a>
{% endif %}
- {% include 'site/includes/languages.html' %}
- <a href="{{ url('site.privacy') }}">{{ _('Privacy Policy') }}</a>
- &middot;
- <a href="{{ url('site.terms') }}">{{ _('Terms of Use') }}</a>
+ {% include 'site/includes/languages.html' %}
</footer>
{% endblock %}
@cvan

this breaks desktop though, right?

@cvan

this gets funny on desktop - we should probably add a max-width

@cvan

we can get that weird hiccup where the header and #page meet (see). I removed the box-shadow hack when I started fiddling with things. maybe we can use the original hack - or hopefully we can ditch it and do something smarter. the latter would make @cvan :satisfied:

@potch

oops, yeah this bit was an accidental checkin

@potch

That's an opinion :grin:

Please sign in to comment.
Something went wrong with that request. Please try again.