Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions assets/fontello/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
1. Open [Fontello](https://fontello.com/) and import `assets/fontello/config.json`
2. Add or remove glyphs
3. Use code points within U+E000..U+F8FF (Private Use Area)
4. Download the webfont and replace `assets/fontello/config.json` and `fonts/halloy-icons.ttf`
224 changes: 79 additions & 145 deletions assets/fontello/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,234 +7,168 @@
"ascent": 850,
"glyphs": [
{
"uid": "ecf8edb95c3f45eb433b4cce7ba9f740",
"css": "users",
"code": 59396,
"uid": "d2c6b59d9a239140cb76be0627480855",
"css": "dot",
"code": 57344,
"src": "entypo"
},
{
"uid": "c76b7947c957c9b78b11741173c8349b",
"css": "attention",
"code": 59405,
"uid": "399ef63b1e23ab1b761dfbb5591fa4da",
"css": "right-open",
"code": 57345,
"src": "fontawesome"
},
{
"uid": "130380e481a7defc690dfb24123a1f0c",
"css": "circle",
"code": 61713,
"uid": "ccddff8e8670dcd130e3cb55fdfc2fd0",
"css": "down-open",
"code": 57346,
"src": "fontawesome"
},
{
"uid": "3a3f65b92c9b2fcbb3a8dcd0d42ee806",
"css": "resize-full-1",
"code": 59393,
"src": "entypo"
},
{
"uid": "108c8ac13badc00ce66da014436e6eb1",
"css": "resize-small-1",
"code": 59397,
"src": "entypo"
"uid": "3cfb8a60567283287e7faf0cd212ed3b",
"css": "fontawesome-robot",
"code": 57347,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M550 100C550 72.3 527.7 50 500 50 472.3 50 450 72.3 450 100L450 200 300 200C217.2 200 150 267.2 150 350L150 700C150 782.8 217.2 850 300 850L700 850C782.8 850 850 782.8 850 700L850 350C850 267.2 782.8 200 700 200L550 200 550 100ZM250 675C250 654.2 266.7 637.5 287.5 637.5L337.5 637.5C358.3 637.5 375 654.2 375 675 375 695.8 358.3 712.5 337.5 712.5L287.5 712.5C266.7 712.5 250 695.8 250 675ZM437.5 675C437.5 654.2 454.2 637.5 475 637.5L525 637.5C545.8 637.5 562.5 654.2 562.5 675 562.5 695.8 545.8 712.5 525 712.5L475 712.5C454.2 712.5 437.5 695.8 437.5 675ZM625 675C625 654.2 641.7 637.5 662.5 637.5L712.5 637.5C733.3 637.5 750 654.2 750 675 750 695.8 733.3 712.5 712.5 712.5L662.5 712.5C641.7 712.5 625 695.8 625 675ZM350 375C391.4 375 425 408.6 425 450 425 491.4 391.4 525 350 525 308.6 525 275 491.4 275 450 275 408.6 308.6 375 350 375ZM575 450C575 408.6 608.6 375 650 375 691.4 375 725 408.6 725 450 725 491.4 691.4 525 650 525 608.6 525 575 491.4 575 450ZM100 450C100 422.3 77.7 400 50 400 22.3 400 0 422.3 0 450L0 600C0 627.7 22.3 650 50 650 77.7 650 100 627.7 100 600L100 450ZM950 400C922.3 400 900 422.3 900 450L900 600C900 627.7 922.3 650 950 650 977.7 650 1000 627.7 1000 600L1000 450C1000 422.3 977.7 400 950 400Z",
"width": 1000
},
"search": [
"fontawesome-robot"
]
},
{
"uid": "14017aae737730faeda4a6fd8fb3a5f0",
"css": "check",
"code": 59398,
"src": "entypo"
"uid": "37c5ab63f10d7ad0b84d0978dcd0c7a8",
"css": "shuffle",
"code": 57348,
"src": "fontawesome"
},
{
"uid": "c709da589c923ba3c2ad48d9fc563e93",
"css": "cancel-1",
"code": 59407,
"src": "entypo"
"uid": "d870630ff8f81e6de3958ecaeac532f2",
"css": "left-open",
"code": 57349,
"src": "fontawesome"
},
{
"uid": "875ab0f6d417223f6ec76ff7f0a4baed",
"css": "tag-1",
"code": 59395,
"src": "entypo"
"uid": "fe6697b391355dec12f3d86d6d490397",
"css": "up-open",
"code": 57350,
"src": "fontawesome"
},
{
"uid": "b08cfe8039de2ce815686aced2caef06",
"css": "download",
"code": 59394,
"uid": "3a3f65b92c9b2fcbb3a8dcd0d42ee806",
"css": "resize-full-1",
"code": 57351,
"src": "entypo"
},
{
"uid": "7222571caa5c15f83dcfd447c58d68d9",
"css": "search-1",
"code": 59400,
"uid": "875ab0f6d417223f6ec76ff7f0a4baed",
"css": "tag-1",
"code": 57352,
"src": "entypo"
},
{
"uid": "3bd18d47a12b8709e9f4fe9ead4f7518",
"css": "arrows-ccw",
"code": 59399,
"uid": "ecf8edb95c3f45eb433b4cce7ba9f740",
"css": "users",
"code": 57353,
"src": "entypo"
},
{
"uid": "489090690d8bd1745e365485946e20a8",
"css": "megaphone",
"code": 59401,
"uid": "108c8ac13badc00ce66da014436e6eb1",
"css": "resize-small-1",
"code": 57354,
"src": "entypo"
},
{
"uid": "80451d627470ea7f977a263fdb771d7b",
"css": "palette",
"code": 59402,
"uid": "14017aae737730faeda4a6fd8fb3a5f0",
"css": "check",
"code": 57355,
"src": "entypo"
},
{
"uid": "465bb89b6f204234e5787c326b4ae54c",
"css": "ccw",
"code": 59403,
"code": 57356,
"src": "entypo"
},
{
"uid": "c8585e1e5b0467f28b70bce765d5840c",
"css": "docs",
"code": 61637,
"uid": "c76b7947c957c9b78b11741173c8349b",
"css": "attention",
"code": 57357,
"src": "fontawesome"
},
{
"uid": "ca1c07c0df52dbf2af6813c9e36c2611",
"css": "popup",
"code": 59406,
"code": 57358,
"src": "typicons"
},
{
"uid": "8ea66d97faf9816abd34f48f3f26d216",
"css": "bucket",
"code": 59408,
"src": "entypo"
},
{
"uid": "2c5335c6e56b876139d7a58ab2f4b2fe",
"css": "bell",
"code": 59409,
"uid": "c709da589c923ba3c2ad48d9fc563e93",
"css": "cancel-1",
"code": 57359,
"src": "entypo"
},
{
"uid": "9755f76110ae4d12ac5f9466c9152031",
"css": "book",
"code": 59410,
"src": "fontawesome"
},
{
"uid": "390d6d13398cbf8c8c3c5493f7d34088",
"css": "export",
"code": 59411,
"code": 57360,
"src": "entypo"
},
{
"uid": "26613a2e6bc41593c54bead46f8c8ee3",
"css": "file-code",
"code": 61897,
"src": "fontawesome"
},
{
"uid": "a3662e0fce8c28f9b91a3889094cd1e9",
"css": "glasses",
"code": 59415,
"code": 57361,
"src": "elusive"
},
{
"uid": "dfec4ffa849d8594c2e4b86f6320b8a6",
"css": "angle-double-down",
"code": 61699,
"src": "fontawesome"
},
{
"uid": "a6b6f85116fc55e4a7c83d66973035a7",
"css": "logout",
"code": 61485,
"src": "mfglabs"
},
{
"uid": "d2c6b59d9a239140cb76be0627480855",
"css": "dot",
"code": 8226,
"uid": "b6fc2f656ef87275889422e19550680a",
"css": "reply-1",
"code": 57362,
"src": "entypo"
},
{
"uid": "399ef63b1e23ab1b761dfbb5591fa4da",
"css": "right-open",
"code": 62,
"src": "fontawesome"
},
{
"uid": "ccddff8e8670dcd130e3cb55fdfc2fd0",
"css": "down-open",
"code": 118,
"src": "fontawesome"
},
{
"uid": "31972e4e9d080eaa796290349ae6c1fd",
"css": "users-1",
"code": 59421,
"src": "fontawesome"
},
{
"uid": "70370693ada58ef0a60fa0984fe8d52a",
"css": "plus-1",
"code": 59424,
"code": 57363,
"src": "entypo"
},
{
"uid": "3cfb8a60567283287e7faf0cd212ed3b",
"css": "fontawesome-robot",
"code": 129302,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M550 100C550 72.3 527.7 50 500 50 472.3 50 450 72.3 450 100L450 200 300 200C217.2 200 150 267.2 150 350L150 700C150 782.8 217.2 850 300 850L700 850C782.8 850 850 782.8 850 700L850 350C850 267.2 782.8 200 700 200L550 200 550 100ZM250 675C250 654.2 266.7 637.5 287.5 637.5L337.5 637.5C358.3 637.5 375 654.2 375 675 375 695.8 358.3 712.5 337.5 712.5L287.5 712.5C266.7 712.5 250 695.8 250 675ZM437.5 675C437.5 654.2 454.2 637.5 475 637.5L525 637.5C545.8 637.5 562.5 654.2 562.5 675 562.5 695.8 545.8 712.5 525 712.5L475 712.5C454.2 712.5 437.5 695.8 437.5 675ZM625 675C625 654.2 641.7 637.5 662.5 637.5L712.5 637.5C733.3 637.5 750 654.2 750 675 750 695.8 733.3 712.5 712.5 712.5L662.5 712.5C641.7 712.5 625 695.8 625 675ZM350 375C391.4 375 425 408.6 425 450 425 491.4 391.4 525 350 525 308.6 525 275 491.4 275 450 275 408.6 308.6 375 350 375ZM575 450C575 408.6 608.6 375 650 375 691.4 375 725 408.6 725 450 725 491.4 691.4 525 650 525 608.6 525 575 491.4 575 450ZM100 450C100 422.3 77.7 400 50 400 22.3 400 0 422.3 0 450L0 600C0 627.7 22.3 650 50 650 77.7 650 100 627.7 100 600L100 450ZM950 400C922.3 400 900 422.3 900 450L900 600C900 627.7 922.3 650 950 650 977.7 650 1000 627.7 1000 600L1000 450C1000 422.3 977.7 400 950 400Z",
"width": 1000
},
"search": [
"fontawesome-robot"
]
},
{
"uid": "1a7104205ea96e6f40ac716d0ca72f21",
"css": "lock",
"code": 59425,
"code": 57364,
"src": "entypo"
},
{
"uid": "b6fc2f656ef87275889422e19550680a",
"css": "reply-1",
"code": 59419,
"src": "entypo"
},
{
"uid": "ebc57fa8400e4ede049ac5dc665210e1",
"css": "eraser",
"code": 61741,
"uid": "c8585e1e5b0467f28b70bce765d5840c",
"css": "docs",
"code": 57365,
"src": "fontawesome"
},
{
"uid": "6533bdc16ab201eb3f3b27ce989cab33",
"css": "folder-open-empty",
"code": 61717,
"uid": "dfec4ffa849d8594c2e4b86f6320b8a6",
"css": "angle-double-down",
"code": 57366,
"src": "fontawesome"
},
{
"uid": "37c5ab63f10d7ad0b84d0978dcd0c7a8",
"css": "shuffle",
"code": 10542,
"uid": "130380e481a7defc690dfb24123a1f0c",
"css": "circle",
"code": 57367,
"src": "fontawesome"
},
{
"uid": "d870630ff8f81e6de3958ecaeac532f2",
"css": "left-open",
"code": 60,
"uid": "6533bdc16ab201eb3f3b27ce989cab33",
"css": "folder-open-empty",
"code": 57368,
"src": "fontawesome"
},
{
"uid": "fe6697b391355dec12f3d86d6d490397",
"css": "up-open",
"code": 94,
"uid": "ebc57fa8400e4ede049ac5dc665210e1",
"css": "eraser",
"code": 57369,
"src": "fontawesome"
}
]
}
}
Binary file modified fonts/halloy-icons.ttf
100755 → 100644
Binary file not shown.
2 changes: 1 addition & 1 deletion src/font.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ pub fn width_of_message_marker(config: &config::Font) -> f32 {
* MESSAGE_MARKER_FONT_SCALE;

Paragraph::with_text(Text {
content: "\u{2022}",
content: "\u{E000}",
bounds: Size::INFINITE,
size: font_size.into(),
line_height: line_height(config),
Expand Down
Loading
Loading