Skip to content
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

Add Fira Code, Input Mono, Support ligatures #16

Merged
merged 1 commit into from
Sep 20, 2017

Conversation

mynetx
Copy link
Contributor

@mynetx mynetx commented Sep 19, 2017

See #15.

@chrissimpkins
Copy link
Contributor

Mind splitting Input Mono out into a separate PR so that we can sort out the license issue? Otherwise we can hold on this until we have clarification. May need to contact the team there to confirm that this use falls within what is acceptable based upon the license. Didn't realize that they were using a restrictive license when I suggested the face.

@mynetx
Copy link
Contributor Author

mynetx commented Sep 19, 2017

@chrissimpkins This PR adds Input Mono only for the case that you have it locally. No files are redistributed as web font.

Copy link
Contributor Author

@mynetx mynetx left a comment

Choose a reason for hiding this comment

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

@chrissimpkins Explanations for you.

@@ -227,3 +227,8 @@ body.vertical.fullscreen pre.playground {
font-size: 1.5em;
}
}

.ace_content {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is applied to the WYSIWYG code editor.

@@ -45,7 +45,7 @@

<!-- CSS Customization -->
<link rel="stylesheet" href="assets/css/custom.css">
<link rel="stylesheet" href="assets/css/playground.css">
<link rel="stylesheet" href="assets/css/playground.css?ver=20170919">
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This forces browsers to ignore their cache.

Copy link
Contributor

Choose a reason for hiding this comment

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

good idea

@@ -132,8 +132,10 @@
<option data-href="https://damieng.com/blog/2008/05/26/envy-code-r-preview-7-coding-font-released">Envy Code R</option>
<option data-href="https://github.com/belluzj/fantasque-sans">Fantasque Sans Mono</option>
<option data-href="http://mozilla.github.io/Fira/" data-webfont>Fira Mono</option>
<option data-href="http://mozilla.github.io/Fira/" data-webfont="custom">Fira Code</option>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Offer Fira Code from our fonts folder (see files added with this PR).

<option data-href="https://github.com/i-tu/Hasklig/">Hasklig</option>
<option data-href="http://www.levien.com/type/myfonts/inconsolata.html" data-webfont>Inconsolata</option>
<option data-href="http://input.fontbureau.com/">Input Mono</option>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Add Input Mono if installed locally – no webfont for now.

@chrissimpkins
Copy link
Contributor

@jublo thanks JM. These new Fira Code web fonts their releases or did you generate new web fonts from their releases?

@mynetx
Copy link
Contributor Author

mynetx commented Sep 19, 2017

Copy link
Contributor

@chrissimpkins chrissimpkins left a comment

Choose a reason for hiding this comment

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

Will merge this tomorrow morning.

@@ -45,7 +45,7 @@

<!-- CSS Customization -->
<link rel="stylesheet" href="assets/css/custom.css">
<link rel="stylesheet" href="assets/css/playground.css">
<link rel="stylesheet" href="assets/css/playground.css?ver=20170919">
Copy link
Contributor

Choose a reason for hiding this comment

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

good idea

/* Source: https://github.com/tonsky/FiraCode */

@font-face{
font-family: 'Fira Code';
Copy link
Contributor

Choose a reason for hiding this comment

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

Do you think that we still need to support all of these web font file types? Based upon source-foundry/Hack#286 (comment) and source-foundry/Hack#286 (comment) it seems that we can simplify this to woff and woff2 since there is support in nearly all modern browsers at this stage. Thoughts?

Not necessary for this PR but a thought for down the road.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Let’s remove TTF, EOT and SVG (if any) at a later stage and open an issue for it.

Copy link
Contributor

Choose a reason for hiding this comment

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

agree!

@chrissimpkins
Copy link
Contributor

Looks great @jublo!

cc: @burodepeper

@chrissimpkins chrissimpkins merged commit e93d8ab into sf-web:master Sep 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants