Bundle Newsreader serif and apply to hero text
Embeds Newsreader (variable opsz/wght, OFL-licensed) into the ely_app binary via include_bytes!, registers it through GPUI's text_system at startup (chrome::typography::register_serif_fonts), and exposes the SERIF_FAMILY constant for downstream surfaces. Apply the family to every page hero where the design uses ely-serif: home headline, settings/appearance headline, plugin marketplace headline, sync headline, plugin detail name, and the home reading-list cover headline. The OFL license file ships alongside the .ttf assets to satisfy the font's redistribution clause.
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,93 @@
|
||||
Copyright 2020 The Newsreader Project Authors (http://github.com/productiontype/Newsreader)
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
http://scripts.sil.org/OFL
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
@@ -60,6 +60,9 @@ fn main() {
|
||||
application.on_open_urls(move |urls| open_url_queue.push(urls));
|
||||
application.run(move |cx: &mut App| {
|
||||
gpui_component::init(cx);
|
||||
if let Err(error) = shell::chrome::register_serif_fonts(cx) {
|
||||
eprintln!("ELY: failed to register serif fonts: {error}");
|
||||
}
|
||||
cx.on_action(quit);
|
||||
bind_shortcuts(cx);
|
||||
cx.on_action(open_private_window);
|
||||
|
||||
@@ -9,6 +9,7 @@ use gpui::{
|
||||
use gpui_component::{IconName, scroll::ScrollableElement};
|
||||
|
||||
use crate::shell::ElyShell;
|
||||
use crate::shell::chrome::SERIF_FAMILY;
|
||||
|
||||
pub(crate) fn render_appearance_form(
|
||||
snapshot: &BrowserSnapshot,
|
||||
@@ -48,6 +49,7 @@ fn render_header() -> AnyElement {
|
||||
)
|
||||
.child(
|
||||
div()
|
||||
.font_family(SERIF_FAMILY)
|
||||
.text_size(px(34.0))
|
||||
.font_weight(FontWeight(400.0))
|
||||
.text_color(rgb(colors::INK))
|
||||
|
||||
@@ -7,6 +7,8 @@ use gpui_component::IconName;
|
||||
|
||||
use crate::shell::ElyShell;
|
||||
|
||||
use crate::shell::chrome::SERIF_FAMILY;
|
||||
|
||||
use super::style::{
|
||||
ARROW_CHIP_BG, PILL_BG, PILL_BG_HOVER, SEARCH_BG, card_shadow, soft_shadow,
|
||||
};
|
||||
@@ -42,6 +44,7 @@ fn render_greeting_row(text: String) -> AnyElement {
|
||||
|
||||
fn render_serif_headline() -> AnyElement {
|
||||
div()
|
||||
.font_family(SERIF_FAMILY)
|
||||
.text_size(px(64.0))
|
||||
.font_weight(FontWeight(400.0))
|
||||
.text_color(rgb(colors::INK))
|
||||
|
||||
@@ -10,7 +10,7 @@ use gpui::{
|
||||
};
|
||||
|
||||
use crate::shell::ElyShell;
|
||||
use crate::shell::chrome::render_glyph_for;
|
||||
use crate::shell::chrome::{SERIF_FAMILY, render_glyph_for};
|
||||
|
||||
use super::style::{CARD_BG, card_shadow};
|
||||
use super::time::relative_time_label;
|
||||
@@ -217,6 +217,7 @@ fn render_reading_list_cover(
|
||||
.gap_1()
|
||||
.child(
|
||||
div()
|
||||
.font_family(SERIF_FAMILY)
|
||||
.text_size(px(18.0))
|
||||
.font_weight(FontWeight(500.0))
|
||||
.text_color(rgb(0xffffff))
|
||||
|
||||
@@ -8,6 +8,7 @@ pub(crate) mod sidebar;
|
||||
pub(crate) mod sidebar_header;
|
||||
pub(crate) mod split_pane;
|
||||
pub(crate) mod topbar;
|
||||
pub(crate) mod typography;
|
||||
pub(crate) mod wallpaper;
|
||||
|
||||
pub(crate) use appearance_form::render_appearance_form;
|
||||
@@ -22,4 +23,5 @@ pub(crate) use split_pane::{
|
||||
render_split_pane_header,
|
||||
};
|
||||
pub(crate) use topbar::render_topbar;
|
||||
pub(crate) use typography::{SERIF_FAMILY, register_serif_fonts};
|
||||
pub(crate) use wallpaper::render_wallpaper;
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
use std::borrow::Cow;
|
||||
|
||||
use gpui::App;
|
||||
|
||||
const NEWSREADER_REGULAR: &[u8] =
|
||||
include_bytes!("../../../assets/fonts/Newsreader.ttf");
|
||||
const NEWSREADER_ITALIC: &[u8] =
|
||||
include_bytes!("../../../assets/fonts/Newsreader-Italic.ttf");
|
||||
|
||||
pub(crate) const SERIF_FAMILY: &str = "Newsreader";
|
||||
|
||||
pub(crate) fn register_serif_fonts(cx: &App) -> gpui::Result<()> {
|
||||
cx.text_system().add_fonts(vec![
|
||||
Cow::Borrowed(NEWSREADER_REGULAR),
|
||||
Cow::Borrowed(NEWSREADER_ITALIC),
|
||||
])
|
||||
}
|
||||
@@ -10,6 +10,7 @@ use gpui_component::{IconName, scroll::ScrollableElement};
|
||||
|
||||
use super::plugin_editors_pick::{action_button, render_editors_pick};
|
||||
use super::{ElyShell, render_canvas_surface};
|
||||
use crate::shell::chrome::SERIF_FAMILY;
|
||||
|
||||
impl ElyShell {
|
||||
pub(super) fn render_plugin_catalog_page(
|
||||
@@ -58,6 +59,7 @@ fn render_hero_left(snapshot: &BrowserSnapshot, cx: &mut Context<ElyShell>) -> A
|
||||
)
|
||||
.child(
|
||||
div()
|
||||
.font_family(SERIF_FAMILY)
|
||||
.text_size(px(48.0))
|
||||
.font_weight(FontWeight(400.0))
|
||||
.text_color(rgb(colors::INK))
|
||||
|
||||
@@ -10,6 +10,7 @@ use gpui_component::{
|
||||
};
|
||||
|
||||
use super::{ElyShell, render_canvas_surface};
|
||||
use crate::shell::chrome::SERIF_FAMILY;
|
||||
|
||||
impl ElyShell {
|
||||
pub(super) fn render_plugin_detail_page(
|
||||
@@ -75,7 +76,8 @@ impl ElyShell {
|
||||
.gap_2()
|
||||
.child(
|
||||
div()
|
||||
.text_size(px(26.0))
|
||||
.font_family(SERIF_FAMILY)
|
||||
.text_size(px(28.0))
|
||||
.truncate()
|
||||
.text_color(rgb(colors::INK))
|
||||
.child(plugin.manifest().name().to_string()),
|
||||
|
||||
@@ -12,6 +12,7 @@ use gpui_component::{IconName, scroll::ScrollableElement};
|
||||
use crate::brand::SYNC_SERVICE_NAME;
|
||||
|
||||
use super::{ElyShell, render_canvas_surface};
|
||||
use crate::shell::chrome::SERIF_FAMILY;
|
||||
|
||||
impl ElyShell {
|
||||
pub(super) fn render_sync_page(
|
||||
@@ -78,6 +79,7 @@ fn render_status_pill(snapshot: &BrowserSnapshot) -> AnyElement {
|
||||
|
||||
fn render_serif_headline() -> AnyElement {
|
||||
div()
|
||||
.font_family(SERIF_FAMILY)
|
||||
.text_size(px(46.0))
|
||||
.font_weight(FontWeight(400.0))
|
||||
.text_color(rgb(colors::INK))
|
||||
|
||||
Reference in New Issue
Block a user