diff --git a/src/routes/search.rs b/src/routes/search.rs index 1d50c06c5..d477e16d3 100644 --- a/src/routes/search.rs +++ b/src/routes/search.rs @@ -17,6 +17,7 @@ use std::time::Duration; #[serde(rename_all = "camelCase")] struct Attachment { url: String, + thumbnail_url: String, is_default: bool, } @@ -376,7 +377,8 @@ async fn index_curseforge(start_index: i32, end_index: i32) -> Result Result Result().parse()?, diff --git a/static/css/main.css b/static/css/main.css index 911907c72..34fa6dc65 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -1,4 +1,4 @@ -@import url('https://fonts.googleapis.com/css?family=Montserrat:400,600'); +@import url('https://fonts.googleapis.com/css?family=Montserrat:400,600&display=swap'); :root, [data-theme="light"] { --background: #f3f2f0; diff --git a/static/css/search.css b/static/css/search.css index 104368693..befd86f7c 100644 --- a/static/css/search.css +++ b/static/css/search.css @@ -118,7 +118,8 @@ user-select: none; } -.category-badge img { +.category-badge img, .category-badge svg { + height: 23px; width: 23px; } @@ -159,8 +160,9 @@ flex-wrap: wrap; } -.mod-info img { +.mod-info img, .mod-info svg { height: 12px; + width: 12px; padding: 0; } @@ -169,7 +171,7 @@ padding-right: 15px; white-space: nowrap; } -.mod-info > span > img { +.mod-info > span > img, .mod-info > span > svg { padding-right: 5px; vertical-align: top; } @@ -178,7 +180,7 @@ white-space: nowrap; display: inline-block; } -.loader-icons img { +.loader-icons img, .loader-icons svg { padding-right: 5px; } @@ -274,8 +276,9 @@ width: 155px; } -.result-badge img { +.result-badge img, .result-badge svg { height: 23px; + width: 23px; } .result-badge p { @@ -360,8 +363,9 @@ background-color: var(--equipment-color); } -.forge { - height: 12px; +svg.forge { + height: 12px; + width: auto; fill: var(--forge-color); } diff --git a/static/images/icon/adventure.svg b/static/images/icon/adventure.svg index 5599a1491..5c6dbd4c0 100644 --- a/static/images/icon/adventure.svg +++ b/static/images/icon/adventure.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/icon/category.svg b/static/images/icon/category.svg index 1ac1968cd..b8fe29c0e 100644 --- a/static/images/icon/category.svg +++ b/static/images/icon/category.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/icon/contributor.svg b/static/images/icon/contributor.svg index c8a02866f..ffec78e40 100644 --- a/static/images/icon/contributor.svg +++ b/static/images/icon/contributor.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/icon/created.svg b/static/images/icon/created.svg index d84e01263..f84d0f234 100644 --- a/static/images/icon/created.svg +++ b/static/images/icon/created.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/icon/curated.svg b/static/images/icon/curated.svg index 058e1f051..e757f4b9a 100644 --- a/static/images/icon/curated.svg +++ b/static/images/icon/curated.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/icon/cursed.png b/static/images/icon/cursed.png index 6320fd5bb..7a66f7006 100644 Binary files a/static/images/icon/cursed.png and b/static/images/icon/cursed.png differ diff --git a/static/images/icon/decoration.svg b/static/images/icon/decoration.svg index 8206744d1..3c1eae199 100644 --- a/static/images/icon/decoration.svg +++ b/static/images/icon/decoration.svg @@ -1,67 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/static/images/icon/donate.svg b/static/images/icon/donate.svg index 2e61cf680..5b521a4ff 100644 --- a/static/images/icon/donate.svg +++ b/static/images/icon/donate.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/icon/downarrow.svg b/static/images/icon/downarrow.svg index 38e48912c..a60ca1921 100644 --- a/static/images/icon/downarrow.svg +++ b/static/images/icon/downarrow.svg @@ -1,2 +1 @@ - - + \ No newline at end of file diff --git a/static/images/icon/download.svg b/static/images/icon/download.svg index a210e95c0..bbbcf20d8 100644 --- a/static/images/icon/download.svg +++ b/static/images/icon/download.svg @@ -1,2 +1 @@ - - + \ No newline at end of file diff --git a/static/images/icon/equipment.svg b/static/images/icon/equipment.svg index 50e2d08cf..d13ce1ad6 100644 --- a/static/images/icon/equipment.svg +++ b/static/images/icon/equipment.svg @@ -1,52 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/static/images/icon/follow.svg b/static/images/icon/follow.svg index d8ce65ee5..401b8b3c3 100644 --- a/static/images/icon/follow.svg +++ b/static/images/icon/follow.svg @@ -1,2 +1 @@ - - + \ No newline at end of file diff --git a/static/images/icon/followers.svg b/static/images/icon/followers.svg index 1893de4d9..4106b8e82 100644 --- a/static/images/icon/followers.svg +++ b/static/images/icon/followers.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/icon/food.svg b/static/images/icon/food.svg index 4a04a0ae1..1c950a2c6 100644 --- a/static/images/icon/food.svg +++ b/static/images/icon/food.svg @@ -1,48 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/static/images/icon/forge-alt.svg b/static/images/icon/forge-alt.svg index c79cd6d36..86b021901 100644 --- a/static/images/icon/forge-alt.svg +++ b/static/images/icon/forge-alt.svg @@ -1,21 +1 @@ - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/icon/forge.svg b/static/images/icon/forge.svg index 147dad49e..f78c27e04 100644 --- a/static/images/icon/forge.svg +++ b/static/images/icon/forge.svg @@ -1,21 +1 @@ - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/icon/information.svg b/static/images/icon/information.svg index 1dac62707..c2866ad4a 100644 --- a/static/images/icon/information.svg +++ b/static/images/icon/information.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/icon/library.svg b/static/images/icon/library.svg index 83f0ce728..e045e5713 100644 --- a/static/images/icon/library.svg +++ b/static/images/icon/library.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/icon/magic.svg b/static/images/icon/magic.svg index c13c657ed..b3ce1e752 100644 --- a/static/images/icon/magic.svg +++ b/static/images/icon/magic.svg @@ -1,94 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/static/images/icon/misc.svg b/static/images/icon/misc.svg index 205a18640..63f9e0d86 100644 --- a/static/images/icon/misc.svg +++ b/static/images/icon/misc.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/icon/search.svg b/static/images/icon/search.svg index 2abe89b6f..8fcdcab9a 100644 --- a/static/images/icon/search.svg +++ b/static/images/icon/search.svg @@ -1,18 +1 @@ - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/static/images/icon/spritesheet.svg b/static/images/icon/spritesheet.svg new file mode 100644 index 000000000..bf630ee02 --- /dev/null +++ b/static/images/icon/spritesheet.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/images/icon/star.svg b/static/images/icon/star.svg index 5f3f1ed92..03efb404c 100644 --- a/static/images/icon/star.svg +++ b/static/images/icon/star.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/icon/storage.svg b/static/images/icon/storage.svg index 84c389807..1d6957ceb 100644 --- a/static/images/icon/storage.svg +++ b/static/images/icon/storage.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/icon/tech.svg b/static/images/icon/tech.svg index 9f9a73ee5..edc99c998 100644 --- a/static/images/icon/tech.svg +++ b/static/images/icon/tech.svg @@ -1,2 +1 @@ - - + \ No newline at end of file diff --git a/static/images/icon/unfilled-star.svg b/static/images/icon/unfilled-star.svg index 443c744b5..de9b7ef6c 100644 --- a/static/images/icon/unfilled-star.svg +++ b/static/images/icon/unfilled-star.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/icon/up.svg b/static/images/icon/up.svg index f844e566f..04284681d 100644 --- a/static/images/icon/up.svg +++ b/static/images/icon/up.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/static/images/icon/updated.svg b/static/images/icon/updated.svg index 093bb9ef1..f9fc2af68 100644 --- a/static/images/icon/updated.svg +++ b/static/images/icon/updated.svg @@ -1,49 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/static/images/icon/util.svg b/static/images/icon/util.svg index 0e4f2830d..a9f20e2e6 100644 --- a/static/images/icon/util.svg +++ b/static/images/icon/util.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/icon/version.svg b/static/images/icon/version.svg index e8ace91f6..4fafc9273 100644 --- a/static/images/icon/version.svg +++ b/static/images/icon/version.svg @@ -1,51 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/static/images/icon/world.svg b/static/images/icon/world.svg index 9d9bf7e16..1f197287a 100644 --- a/static/images/icon/world.svg +++ b/static/images/icon/world.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/templates/search-results.hbs b/templates/search-results.hbs index ff3215229..8cd25c641 100644 --- a/templates/search-results.hbs +++ b/templates/search-results.hbs @@ -9,22 +9,22 @@

{{this.description}}

- downloads{{format this.downloads}} - created{{this.date_created}} - updated{{this.date_modified}} - version{{this.latest_version}} @@ -45,43 +45,43 @@
{{#contains this.keywords "technology"}}
- tech +

TECH

{{/contains}} {{#contains this.keywords "adventure"}}
- adventure +

ADVENTURE

{{/contains}} {{#contains this.keywords "magic"}}
- magic +

MAGIC

{{/contains}} {{#contains this.keywords "utility"}}
- util +

UTILITY

{{/contains}} {{#contains this.keywords "decoration"}}
- decoration +

DECORATION

{{/contains}} {{#contains this.keywords "library"}}
- library +

LIBRARY

{{/contains}} {{#contains this.keywords "worldgen"}} -
- world +
+

WORLDGEN

{{/contains}} @@ -89,30 +89,29 @@
cursed

CURSED

-

CURSED

{{/contains}} {{#contains this.keywords "storage"}}
- storage +

STORAGE

{{/contains}} {{#contains this.keywords "food"}}
- food +

FOOD

{{/contains}} {{#contains this.keywords "equipment"}}
- equipment +

EQUIPMENT

{{/contains}} {{#contains this.keywords "misc"}}
- misc +

MISC

{{/contains}} diff --git a/templates/search.hbs b/templates/search.hbs index 4a7daea1e..4b90f6fa9 100644 --- a/templates/search.hbs +++ b/templates/search.hbs @@ -10,6 +10,7 @@ + Search @@ -67,31 +68,31 @@

Categories

- tech +

TECH

- adventure +

ADVENTURE

- magic +

MAGIC

- util +

UTILITY

- decoration +

DECORATION

- library +

LIBRARY

- world +

WORLDGEN

@@ -99,19 +100,19 @@

CURSED

- storage +

STORAGE

- food +

FOOD

- equipment +

EQUIPMENT

- misc +

MISC

@@ -120,11 +121,11 @@

Loaders

- - forge + +

FORGE

- + fabric

FABRIC