Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Commit

Permalink
Fix #3266, Use standard Firefox product font-family throughout
Browse files Browse the repository at this point in the history
Based on Photon design style,
http://design.firefox.com/photon/visual/typography.html#typefaces

Except we are not using Fira Sans anywhere, relying instead on system
fonts.
  • Loading branch information
jaredhirsch committed Aug 8, 2017
1 parent feef990 commit 7720f65
Show file tree
Hide file tree
Showing 13 changed files with 15 additions and 23 deletions.
5 changes: 2 additions & 3 deletions server/src/pages/homepage/view.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const style = `
html, body {
padding: 0;
margin: 0;
font-family: SF UI Text, sans-serif;
font-family: -apple-system, BlinkMacSystemFont, "segoe ui", "helvetica neue", helvetica, ubuntu, roboto, noto, arial, sans-serif;
font-size: 12pt;
}
Expand Down Expand Up @@ -129,7 +129,6 @@ const style = `
border-radius: 3px;
cursor: pointer;
display: inline-block;
font-family: Fira Sans,sans-serif;
font-weight: 400;
height: 40px;
line-height: 40px;
Expand Down Expand Up @@ -236,7 +235,7 @@ const style = `
.section-content h3 {
font-size: 2.5em;
font-weight: 100;
font-weight: 400;
margin: 0;
}
Expand Down
4 changes: 2 additions & 2 deletions static/css/inline-selection.scss
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ $very-light-grey: #ededed;
position: absolute;
pointer-events: none;
font-weight: bold;
font-family: sans-serif;
font-family: -apple-system, BlinkMacSystemFont, "segoe ui", "helvetica neue", helvetica, ubuntu, roboto, noto, arial, sans-serif;
font-size: 70%;
color: #000;
text-shadow:
Expand Down Expand Up @@ -379,7 +379,7 @@ $very-light-grey: #ededed;
@include flex-container(row, center, center);
animation: pulse 125mm $bezier;
color: #fff;
font-family: -apple-system, BlinkMacSystemFont, sans-serif;
font-family: -apple-system, BlinkMacSystemFont, "segoe ui", "helvetica neue", helvetica, ubuntu, roboto, noto, arial, sans-serif;
font-size: 24px;
line-height: 32px;
text-align: center;
Expand Down
2 changes: 1 addition & 1 deletion static/css/metrics.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
body {
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
font-family: -apple-system, BlinkMacSystemFont, "segoe ui", "helvetica neue", helvetica, ubuntu, roboto, noto, arial, sans-serif;
}

table.generic-table {
Expand Down
2 changes: 1 addition & 1 deletion static/css/onboarding.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ $super-blue: #00d1e6;
html,
body {
box-sizing: border-box;
font-family: -apple-system, BlinkMacSystemFont, sans-serif;
font-family: -apple-system, BlinkMacSystemFont, "segoe ui", "helvetica neue", helvetica, ubuntu, roboto, noto, arial, sans-serif;
height: 100%;
margin: 0;
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion static/css/partials/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ html {
}

body {
font-family: -apple-system, BlinkMacSystemFont, sans-serif;
font-family: -apple-system, BlinkMacSystemFont, "segoe ui", "helvetica neue", helvetica, ubuntu, roboto, noto, arial, sans-serif;
margin: 0;
}

Expand Down
4 changes: 0 additions & 4 deletions static/css/settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,11 @@
.header {
color: #383e49;
font-size: 28px;
font-family: SFUIDisplay-Regular, sans-serif;
}

.sub-header {
color: #222;
font-size: 16.8px;
font-family: SFUIText-Bold, sans-serif;
font-weight: bold;
letter-spacing: -0.31px;
}
Expand All @@ -41,15 +39,13 @@
}

.username {
font-family: SFUIDisplay-Semibold, sans-serif;
font-weight: 500;
font-size: 19.2px;
color: #383e49;
margin: 0 0 -20px;
}

.email {
font-family: SFUIDisplay-Regular, sans-serif;
font-size: 14.6px;
color: #383e49;
}
Expand Down
5 changes: 1 addition & 4 deletions static/css/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ body {
min-height: 100%;
width: 100%;
margin: 0;
font-family: sans-serif;
font-family: -apple-system, BlinkMacSystemFont, "segoe ui", "helvetica neue", helvetica, ubuntu, roboto, noto, arial, sans-serif;
background-color: $background-color;
color: $text-color;
box-sizing: border-box;
Expand Down Expand Up @@ -57,7 +57,6 @@ body {
}

#private-notice {
font-family: sans-serif;
font-size: 14px;
margin-top: 7px;
padding: 7px;
Expand Down Expand Up @@ -242,7 +241,6 @@ a:hover {
background: #f25820;
color: #fff;
text-decoration: none;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
text-align: center;
text-transform: uppercase;
padding: 3px 40px;
Expand Down Expand Up @@ -306,7 +304,6 @@ a.subheading-link {
vertical-align: middle;
background-image: none;
font-weight: normal;
font-family: sans-serif;
text-transform: none;
text-indent: 0;
border-radius: 4px;
Expand Down
2 changes: 1 addition & 1 deletion static/homepage/css/help.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
html {
font-family: sans-serif;
font-family: -apple-system, BlinkMacSystemFont, "segoe ui", "helvetica neue", helvetica, ubuntu, roboto, noto, arial, sans-serif;
height: 100%;
}

Expand Down
2 changes: 1 addition & 1 deletion static/homepage/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ body {

html {
box-sizing: border-box;
font-family: -apple-system, BlinkMacSystemFont, sans-serif;
font-family: -apple-system, BlinkMacSystemFont, "segoe ui", "helvetica neue", helvetica, ubuntu, roboto, noto, arial, sans-serif;
}

.myshots-button {
Expand Down
2 changes: 1 addition & 1 deletion static/homepage/install-test-local.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Install Dev Firefox Screenshots</title>
<style type="text/css">
html {
font-family: sans-serif;
font-family: -apple-system, BlinkMacSystemFont, "segoe ui", "helvetica neue", helvetica, ubuntu, roboto, noto, arial, sans-serif;
}
.button {
font-size: 120%;
Expand Down
2 changes: 1 addition & 1 deletion static/img/landing-screenshots_image_02.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions static/img/landing-screenshots_image_04.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion static/img/question-mark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7720f65

Please sign in to comment.