diff --git a/src/main.rs b/src/main.rs index 30b479a..7aa0333 100644 --- a/src/main.rs +++ b/src/main.rs @@ -134,7 +134,7 @@ async fn main() -> std::io::Result<()> { .route("/search/", web::get().to(search::find)) // View wiki of subreddit .service( - web::scope("/wiki") + web::scope("/{scope:wiki|w}") .route("/", web::get().to(subreddit::wiki)) .route("/{page}/", web::get().to(subreddit::wiki)), ), diff --git a/static/manifest.json b/static/manifest.json index 4f02724..c017876 100644 --- a/static/manifest.json +++ b/static/manifest.json @@ -2,9 +2,9 @@ "name": "Libreddit", "short_name": "Libreddit", "display": "standalone", - "background_color": "#2A3443", + "background_color": "#1F1F1F", "description": "An alternative private front-end to Reddit", - "theme_color": "#2A3443", + "theme_color": "#1F1F1F", "icons": [ { "src": "./logo.png", diff --git a/static/style.css b/static/style.css index 6a599e5..458bf35 100644 --- a/static/style.css +++ b/static/style.css @@ -286,9 +286,9 @@ aside { background-color: var(--highlighted); } -/* Subscribed subreddit list */ +/* Feeds */ -#subscriptions { +#feeds { position: relative; border-radius: 5px; border: var(--panel-border); @@ -299,11 +299,11 @@ aside { display: inline-block; } -#subscriptions > summary { +#feeds > summary { padding: 8px 15px; } -#sub_list { +#feed_list { position: absolute; display: flex; min-width: 100%; @@ -315,17 +315,24 @@ aside { z-index: 1; } -#sub_list > a { +#feed_list > p { + font-size: 13px; + opacity: 0.5; + padding: 5px 20px; + margin-top: 10px; +} + +#feed_list > a { padding: 10px 20px; transition: 0.2s background; } -#sub_list > .selected { +#feed_list > .selected { background-color: var(--accent); color: var(--foreground); } -#sub_list > a:not(.selected):hover { +#feed_list > a:not(.selected):hover { background-color: var(--foreground); } diff --git a/templates/base.html b/templates/base.html index 343c759..6caad37 100644 --- a/templates/base.html +++ b/templates/base.html @@ -7,13 +7,12 @@ - + - diff --git a/templates/utils.html b/templates/utils.html index b0d76b6..5c82b48 100644 --- a/templates/utils.html +++ b/templates/utils.html @@ -42,9 +42,14 @@ {% macro sub_list(current) -%} {% if prefs.subs.len() > 0 %} - - Subscriptions - + + Feeds + + MAIN FEEDS + Home + Popular + All + REDDIT FEEDS {% for sub in prefs.subs %} {{ sub }} {% endfor %}
MAIN FEEDS
REDDIT FEEDS