Skip to content

Commit

Permalink
docs: Add logo
Browse files Browse the repository at this point in the history
  • Loading branch information
emmyoh committed Jun 11, 2024
1 parent e30340b commit 5f3403c
Show file tree
Hide file tree
Showing 51 changed files with 283,670 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ thiserror = "1.0.61"
glob = "0.3.1"
tokio = { version = "1.38.0", features = ["full"], optional = true }
futures = "0.3.30"
tracing-subscriber = { version = "0.3.18", optional = true }
tracing-subscriber = { version = "0.3.18", optional = true, features = ["env-filter"]}
tracing = "0.1.40"
notify-debouncer-full = { version = "0.3.1", default-features = false, optional = true }
actix-files = { version = "0.6.5", optional = true }
Expand Down
Binary file added branding/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
141,015 changes: 141,015 additions & 0 deletions branding/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added branding/logo_compressed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/assets/favicon/android-chrome-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/assets/favicon/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/assets/favicon/android-chrome-256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/assets/favicon/android-chrome-36x36.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/assets/favicon/android-chrome-384x384.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/assets/favicon/android-chrome-48x48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/assets/favicon/android-chrome-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/assets/favicon/android-chrome-72x72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/assets/favicon/android-chrome-96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/assets/favicon/apple-touch-icon-114x114.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/assets/favicon/apple-touch-icon-120x120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/assets/favicon/apple-touch-icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/assets/favicon/apple-touch-icon-152x152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/assets/favicon/apple-touch-icon-57x57.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/assets/favicon/apple-touch-icon-60x60.png
Binary file added site/assets/favicon/apple-touch-icon-72x72.png
Binary file added site/assets/favicon/apple-touch-icon-76x76.png
Binary file added site/assets/favicon/apple-touch-icon.png
9 changes: 9 additions & 0 deletions site/assets/favicon/browserconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<TileColor>#d99b29</TileColor>
</tile>
</msapplication>
</browserconfig>
Binary file added site/assets/favicon/favicon-16x16.png
Binary file added site/assets/favicon/favicon-32x32.png
Binary file added site/assets/favicon/favicon.ico
Binary file not shown.
Binary file added site/assets/favicon/favicon.png
141,013 changes: 141,013 additions & 0 deletions site/assets/favicon/favicon.svg

Large diffs are not rendered by default.

Binary file added site/assets/favicon/mstile-150x150.png
1,528 changes: 1,528 additions & 0 deletions site/assets/favicon/safari-pinned-tab.svg

Large diffs are not rendered by default.

53 changes: 53 additions & 0 deletions site/assets/favicon/site.webmanifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"name": "",
"short_name": "",
"icons": [
{
"src": "/android-chrome-36x36.png",
"sizes": "36x36",
"type": "image/png"
},
{
"src": "/android-chrome-48x48.png",
"sizes": "48x48",
"type": "image/png"
},
{
"src": "/android-chrome-72x72.png",
"sizes": "72x72",
"type": "image/png"
},
{
"src": "/android-chrome-96x96.png",
"sizes": "96x96",
"type": "image/png"
},
{
"src": "/android-chrome-144x144.png",
"sizes": "144x144",
"type": "image/png"
},
{
"src": "/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/android-chrome-256x256.png",
"sizes": "256x256",
"type": "image/png"
},
{
"src": "/android-chrome-384x384.png",
"sizes": "384x384",
"type": "image/png"
},
{
"src": "/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff"
}
Binary file added site/assets/logo.png
8 changes: 8 additions & 0 deletions site/assets/style/_extended.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,12 @@
#skip:focus {
top: 10px;
left: 10px;
}

.logo {
float: left;
width: 40px;
position: relative;
left: -5px;
margin-left: -40px;
}
3 changes: 3 additions & 0 deletions site/diary/almost_done.vox
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ In `main.rs`, upon initial inspection, the following loops may be parallelised:

### Logo

I wanted the logo to depict something living.
I ended up picking [a botanical illustration of a pineapple](https://biodiversitylibrary.org/page/5176503).

---

## Future Goals
Expand Down
2 changes: 1 addition & 1 deletion site/diary/inheritance_guide.vox
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Two code patterns were found in the code: [`manual_flatten`](https://rust-lang.g

##### Before
```rust
for entry in snippets_directory.flatten() {
for entry in snippets_directory {
if let Ok(entry) = entry {
if entry.file_type().unwrap().is_file() {
let name = entry
Expand Down
2 changes: 2 additions & 0 deletions site/layouts/default.vox
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<a id="skip" href="#skip-target">Skip to main content</a>
<div class="container content">
<header class="masthead">
<img src="{{ '/logo.png' | prepend: global.url }}" class="logo"></img>
<h3 class="masthead-title">
<a href="{{ global.url }}" title="Home">{{ global.title }}</a>
<small>{{ global.description }}</small>
Expand All @@ -29,5 +30,6 @@
</small>
</footer>
</div>
<script src="//instant.page/5.2.0" type="module" integrity="sha384-jnZyxPjiipYXnSU0ygqeac2q7CVYMbh84q0uHVRRxEtvFPiQYbXWUorga2aqZJ0z"></script>
</body>
</html>
4 changes: 3 additions & 1 deletion site/prebuild.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/sh
mkdir -p ./output/
grass ./assets/style/styles.scss > ./output/styles.css
grass ./assets/style/styles.scss > ./output/styles.css
cp ./assets/favicon/* ./output
cp ./assets/logo.png ./output
13 changes: 11 additions & 2 deletions site/snippets/head.voxs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,16 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fontsource/geist-sans@5.0.3/400.min.css">
<link rel="stylesheet" href="{{ '/styles.css' | prepend: global.url }}">
<link rel="stylesheet" href="{{ '/css/code.css' | prepend: global.url }}">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ '/assets/apple-touch-icon-precomposed.png' | prepend: global.url }}">
<link rel="shortcut icon" href="{{ '/assets/favicon.ico' | prepend: global.url }}">
<link rel="apple-touch-icon" sizes="180x180" href="{{ global.url }}/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="{{ global.url }}/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="192x192" href="{{ global.url }}/android-chrome-192x192.png">
<link rel="icon" type="image/png" sizes="16x16" href="{{ global.url }}/favicon-16x16.png">
<link rel="manifest" href="{{ global.url }}/site.webmanifest">
<link rel="mask-icon" href="{{ global.url }}/safari-pinned-tab.svg" color="#D99B29">
<link rel="icon" type="image/png" href="{{ '/favicon.png' | prepend: global.url }}">
<!--<link rel="icon" type="image/svg+xml" href="{{ '/favicon.svg' | prepend: global.url }}">-->
<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-TileImage" content="{{ global.url }}/mstile-144x144.png">
<meta name="theme-color" content="#D99B29">
<link rel="alternate" type="application/atom+xml" title="{{ global.title }}" href="{{ '/atom.xml' | prepend: global.url }}">
</head>
4 changes: 2 additions & 2 deletions src/date.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use serde::Deserialize;
use serde::Serialize;
use std::fmt;
use sys_locale::get_locale;
use tracing::trace;
use tracing::debug;

#[derive(Eq, PartialEq, PartialOrd, Clone, Default, Debug, Serialize, Deserialize)]
/// A page's date-time metadata
Expand Down Expand Up @@ -147,6 +147,6 @@ pub fn default_locale() -> chrono::Locale {

/// Gets a `chrono::Locale` from a string
pub fn locale_string_to_locale(locale: String) -> chrono::Locale {
trace!("Locale: {}", locale);
debug!("Locale: {}", locale);
chrono::Locale::try_from(locale.as_str()).unwrap_or(default_locale())
}
23 changes: 21 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ async fn main() -> miette::Result<()> {
_ => Level::TRACE,
};
let mut subscriber_builder = tracing_subscriber::fmt()
.with_env_filter("vox")
.pretty()
.with_max_level(verbosity_level)
.with_file(false)
Expand Down Expand Up @@ -438,10 +439,28 @@ async fn build(watch: bool, visualise_dag: bool, generate_syntax_css: bool) -> m
path.strip_prefix(current_path.clone())
.unwrap_or(path)
.starts_with("global.toml")
|| path.starts_with("snippets/")
|| path
.strip_prefix(current_path.clone())
.unwrap_or(path)
.starts_with("snippets/")
})
});
trace!("Changes detected: {:#?} … ", events);
trace!(
"Changes detected: {:#?} … ",
events
.into_iter()
.map(|event| event
.paths
.clone()
.into_iter()
.map(|path| {
path.strip_prefix(current_path.clone())
.unwrap_or(&path)
.to_path_buf()
})
.collect::<Vec<_>>())
.collect::<Vec<_>>()
);
}

// 1. Build a new DAG.
Expand Down

0 comments on commit 5f3403c

Please sign in to comment.