diff --git a/axum_server/src/main.rs b/axum_server/src/main.rs index 224afba..594c127 100644 --- a/axum_server/src/main.rs +++ b/axum_server/src/main.rs @@ -35,6 +35,7 @@ async fn main() { .nest_service("/fonts", ServeDir::new("../static/fonts")) .nest_service("/generated_images", ServeDir::new("generated_images")) .nest_service("/svg", ServeDir::new("../static/svg")) + // TODO manifest logos have bad link, #directory-swap .nest_service( "/config.yml", ServeDir::new("../static/resources/config.yml"), @@ -53,11 +54,10 @@ async fn main() { // TODO Socials // - fotos -// TODO Colors -// Text slate, and gray should be somehow customised -// TODO print css and other 404 css linked in base.html // TODO go live pipeline // TODO after release +// Remove old web completely +// Restructure repository // - contact // - projects page // - linktree page diff --git a/axum_server/src/picture_generator/picture_markup_generator.rs b/axum_server/src/picture_generator/picture_markup_generator.rs index d6db6e3..a916f66 100644 --- a/axum_server/src/picture_generator/picture_markup_generator.rs +++ b/axum_server/src/picture_generator/picture_markup_generator.rs @@ -22,13 +22,24 @@ pub fn generate_picture_markup( generate_image: bool, ) -> Result { let exported_formats = get_export_formats(orig_img_path); + + if exported_formats.is_empty() { + return Ok(formatdoc!( + r#"{alt_text}"# + )); + } let path_to_generated = get_generated_file_name(orig_img_path); - // TODO This should get removed when we move the project structure #move - let dev_only_img_path = + // TODO This should get removed when we move the project structure #directory-swap + let disk_img_path = Path::new("../static/").join(orig_img_path.strip_prefix("/").unwrap_or(orig_img_path)); - let orig_img_dimensions = image_dimensions(&dev_only_img_path)?; + let orig_img_dimensions = image_dimensions(&disk_img_path)?; let resolutions = get_resolutions(orig_img_dimensions, width, height); let path_to_generated_arc = Arc::new(path_to_generated); @@ -40,8 +51,8 @@ pub fn generate_picture_markup( if generate_image { rayon::spawn(move || { - let orig_img = ImageReader::open(&dev_only_img_path) - .with_context(|| format!("Failed to read instrs from {:?}", &dev_only_img_path)) + let orig_img = ImageReader::open(&disk_img_path) + .with_context(|| format!("Failed to read instrs from {:?}", &disk_img_path)) .unwrap() .decode() .unwrap(); diff --git a/axum_server/styles/input.css b/axum_server/styles/input.css index 233e779..9525b39 100644 --- a/axum_server/styles/input.css +++ b/axum_server/styles/input.css @@ -80,6 +80,10 @@ strong { @apply font-medium; } +img[height] { + height: revert-layer; +} + .article-body { h1 { @apply px-4 text-2xl font-semibold text-blue-900 mb-3 mt-4 max-w-read mx-auto md:text-4xl lg:text-5xl; @@ -114,7 +118,7 @@ strong { } table { - @apply text-sm mx-auto my-4 max-w-image table-auto border-collapse border-spacing-12 border border-gray-200 rounded md:text-base lg:text-xl lg:my-8; + @apply text-sm mx-auto my-4 max-w-image table-auto border-collapse border-spacing-12 border border-slate-200 rounded md:text-base lg:text-xl lg:my-8; } thead { diff --git a/axum_server/styles/output.css b/axum_server/styles/output.css index 44eeb5c..6544d16 100644 --- a/axum_server/styles/output.css +++ b/axum_server/styles/output.css @@ -807,10 +807,6 @@ video { width: 180px; } -.w-full { - width: 100%; -} - .max-w-maxindex { max-width: 100rem; } @@ -828,6 +824,11 @@ video { transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); } +.break-inside-avoid { + -moz-column-break-inside: avoid; + break-inside: avoid; +} + .grid-flow-col { grid-auto-flow: column; } @@ -914,6 +915,11 @@ video { border-color: rgb(11 39 70 / var(--tw-border-opacity)); } +.border-slate-300 { + --tw-border-opacity: 1; + border-color: rgb(203 213 225 / var(--tw-border-opacity)); +} + .bg-blue-100 { --tw-bg-opacity: 1; background-color: rgb(225 239 253 / var(--tw-bg-opacity)); @@ -938,11 +944,6 @@ video { fill: #0b2746; } -.object-contain { - -o-object-fit: contain; - object-fit: contain; -} - .p-0 { padding: 0px; } @@ -1083,21 +1084,16 @@ video { color: rgb(11 39 70 / var(--tw-text-opacity)); } -.text-gray-600 { - --tw-text-opacity: 1; - color: rgb(75 85 99 / var(--tw-text-opacity)); -} - -.text-gray-800 { - --tw-text-opacity: 1; - color: rgb(31 41 55 / var(--tw-text-opacity)); -} - .text-pink-950 { --tw-text-opacity: 1; color: rgb(80 2 56 / var(--tw-text-opacity)); } +.text-slate-600 { + --tw-text-opacity: 1; + color: rgb(71 85 105 / var(--tw-text-opacity)); +} + .text-slate-800 { --tw-text-opacity: 1; color: rgb(30 41 59 / var(--tw-text-opacity)); @@ -1107,11 +1103,6 @@ video { text-decoration-line: none; } -.drop-shadow-md { - --tw-drop-shadow: drop-shadow(0 4px 3px rgb(0 0 0 / 0.07)) drop-shadow(0 2px 2px rgb(0 0 0 / 0.06)); - filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow); -} - .transition-colors { transition-property: color, background-color, border-color, text-decoration-color, fill, stroke; transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); @@ -1140,6 +1131,10 @@ strong { font-weight: 500; } +img[height] { + height: revert-layer; +} + .article-body { h1 { margin-left: auto; @@ -1505,7 +1500,7 @@ strong { } table { --tw-border-opacity: 1; - border-color: rgb(229 231 235 / var(--tw-border-opacity)); + border-color: rgb(226 232 240 / var(--tw-border-opacity)); } table { font-size: 0.875rem; @@ -1927,3 +1922,9 @@ strong { grid-template-columns: 1fr 2fr; } } + +@media print { + .print\:hidden { + display: none; + } +} diff --git a/axum_server/templates/base.html b/axum_server/templates/base.html index 6d5f51f..98b416e 100644 --- a/axum_server/templates/base.html +++ b/axum_server/templates/base.html @@ -1,7 +1,7 @@ - {% block title %} {{title}} @michalvankodev {% endblock %} + {% block title %} {{title}} {% endblock %} @michalvankodev @@ -13,16 +13,13 @@ rel="alternate" type="application/rss+xml" title="RSS feed for latest posts" - href="https://michalvanko.dev/feed.xml" + href="/feed.xml" /> - - - diff --git a/axum_server/templates/blog_post.html b/axum_server/templates/blog_post.html index 4062b98..5000c61 100644 --- a/axum_server/templates/blog_post.html +++ b/axum_server/templates/blog_post.html @@ -8,7 +8,7 @@

{{title}}