Skip to content
This repository has been archived by the owner on Mar 15, 2018. It is now read-only.

Firefox Accounts migration banner (bug 1052864) #657

Closed
1 change: 0 additions & 1 deletion src/app.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
</div>

<header id="site-header" class="header site-header"></header>
<aside id="incompatibility-banner"></aside>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remember to remove from Zamboni

<div class="cloak"></div>
<main>
Expand Down
4 changes: 2 additions & 2 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<meta name="theme-color" content="#fff">

<title>Firefox Marketplace</title>

<link rel="icon" href="/media/img/logos/128.png" sizes="128x128">
<link rel="icon" href="/media/img/logos/64.png" sizes="64x64">
<link rel="icon" href="/media/img/logos/32.png" sizes="32x32">
Expand Down Expand Up @@ -36,7 +37,6 @@
<link rel="stylesheet" href="/media/css/feedback.styl.css">
<link rel="stylesheet" href="/media/css/forms.styl.css">
<link rel="stylesheet" href="/media/css/form-modal.styl.css">
<link rel="stylesheet" href="/media/css/incompatible.styl.css">
<link rel="stylesheet" href="/media/css/lightbox.styl.css">
<link rel="stylesheet" href="/media/css/menu.styl.css">
<link rel="stylesheet" href="/media/css/modal.styl.css">
Expand All @@ -46,6 +46,7 @@
<link rel="stylesheet" href="/media/css/purchase.styl.css">
<link rel="stylesheet" href="/media/css/ratings.styl.css">
<link rel="stylesheet" href="/media/css/search.styl.css">
<link rel="stylesheet" href="/media/css/site-banner.styl.css">
</head>
<body class="overlayed" data-media="">

Expand All @@ -55,7 +56,6 @@
</div>

<header id="site-header" class="header site-header"></header>
<aside id="incompatibility-banner"></aside>

<div class="cloak"></div>
<main>
Expand Down
45 changes: 23 additions & 22 deletions src/media/css/header.styl
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
// styles for the global site header only.
@import 'lib';

// Add the header's height back as padding. This is overriden when not the
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo? "when not the header"?

// header is not `position: fixed`.
body {
padding-top: $header-height;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As long as it doesn't cause regressions, I'm good.

And after applying + clicking around, I see nothing wrong.

}

// ***************** Wide Mobile (600+ px)

// usable on any header
Expand All @@ -9,8 +15,8 @@
border-top: 1px solid $salt-flat-white;
border-bottom: 1px solid $seavan-salt-white;
display-flex();
height: 48px;
max-height: 48px;
height: $header-height;
max-height: $header-height;
position: relative;
width: 100%;

Expand All @@ -25,7 +31,7 @@
color: $castle-skull-gray;
font-size: 18px;
font-weight: 400;
line-height: 48px;
line-height: $header-height;
z-index: 10;
}
}
Expand All @@ -45,7 +51,7 @@
display: block;
}
> nav {
height: 48px;
height: $header-height;
display-flex();
position: relative;
text-align: left;
Expand All @@ -56,7 +62,7 @@
}
}
.site {
height: 48px;
height: $header-height;
margin: 0 5px;
width: 200px;

Expand Down Expand Up @@ -197,10 +203,10 @@
.header-button {
color: $castle-skull-gray;
display: block;
height: 48px;
line-height: 48px;
height: $header-height;
line-height: $header-height;
text-align: center;
width: 48px;
width: $header-height; // $header-height so it's square.

// header buttons with icons
&.icon {
Expand Down Expand Up @@ -425,23 +431,15 @@
flex(1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm glad you're removing this, but check with @ngokevin and @spasovski

}
}

[data-page-type~=root] {
main {
padding-top: 48px;
}
}
main {
padding-top: 38px;

&:before {
// This makes a sweet gradient below the header
// (which will appear when scrolling past the category drop-down menu).
content: '';
display: block;
gradientLinear(unquote('to top, rgba(15,15,15,0) 0%, rgba(15,15,15,.3) 100%'));
height: 2px;
top: 48px;
top: $header-height;
position: fixed;
width: 100%;
z-index: 18;
Expand All @@ -465,7 +463,7 @@ main {
}
}
[data-page-type] main {
padding: 0 0 48px;
padding: 0 0 $header-height;

&:before {
display: none;
Expand All @@ -477,6 +475,10 @@ main {

// This probably shouldn't be media query based.
@media $wider-desktop {
body {
padding-top: 0;
}

.header-button.settings {
right: 0;
top: 0;
Expand Down Expand Up @@ -514,7 +516,7 @@ main {
> nav {
height: 60px;
margin: 0 auto;
max-width: 1024px;
max-width: $max-site-width;
}
.site {
margin: 0;
Expand Down Expand Up @@ -594,13 +596,12 @@ main {
}

// ***************** Wide Mobile (> 671px)

@media $at-least-desktop {
.secondary-header {
background: none;
border: 0;
height: 48px;
max-height: 48px;
height: $header-height;
max-height: $header-height;
position: relative;

&:before {
Expand Down
76 changes: 0 additions & 76 deletions src/media/css/incompatible.styl

This file was deleted.

2 changes: 2 additions & 0 deletions src/media/css/lib.styl
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Widths
$desktop-content = 690px;
$desktop-ftr = 732px;
$header-height = 48px;
$max-site-width = 1024px;

// Use these as @media $at-least-desktop {}
$at-least-desktop = unquote('(min-width: 710px)');
Expand Down
5 changes: 2 additions & 3 deletions src/media/css/navbar.styl
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
body[data-page-type~=leaf],
body[data-page-type~=search] {
.site-nav {
// Slide up and down.
// Slide out of view.
bottom: 50px;
margin-bottom: -40px;
margin-bottom: -50px;
}
}
.site-nav {
Expand Down Expand Up @@ -182,7 +182,6 @@
}
.site-nav {
background-color: #E0E0E0;
bottom: 38px;
height: 50px;
margin: 0 auto;
z-index: 25;
Expand Down
67 changes: 67 additions & 0 deletions src/media/css/site-banner.styl
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
@import 'lib';

.mkt-banner {
background: $grey-gardens-gray;
color: $cement-gray;
display: block;
overflow: hidden;
position: relative;

&:before,
&:after {
content: "";
display: block;
height: 1px;
position: relative;
top: -1px;
width: 100%;
}

&:after {
bottom: -1px;
top: auto;
}

.mkt-banner-content {
$content-height = 60px;
$content-padding-verticle = 10px;
background: url("../img/logos/firefox-64.png") no-repeat scroll 0px 50% / 64px 60px transparent;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can't use background-size shorthand because it breaks in Safari.

just make a separate background-size rule.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't need to include transparent

// Center the text vertically. Only one line, sorry.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we try another approach?

line-height: $content-height - (2 * $content-padding-verticle);
margin: 0 auto;
max-width: $max-site-width;
min-height: $content-height;
padding: $content-padding-verticle 40px $content-padding-verticle 70px;
position: relative;
text-align: left;
}

.close {
margin-top: -17px;
top: 50%;
}
}

.mkt-banner.mkt-banner-success {
background: #64be3c;
color: #fff;
font-family: $open-stack;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do you have to set the font family here?


.mkt-banner-content {
line-height: 1;
font-size: 15px;
font-weight: 300;
}

small {
display: block;
font-size: 12px;
padding-top: 10px;
}

a {
color: #fff;
font-weight: 500;
text-decoration: underline;
}
}
7 changes: 0 additions & 7 deletions src/media/css/site.styl
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,6 @@ body {
position: relative;
}

@media $small-desktop {
nav.site-nav {
// Account for header height change.
margin-bottom: -38px;
}
}

.row {
clear: both;
}
Expand Down
Binary file added src/media/img/logos/firefox-64.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.