diff --git a/innovedus_cms/base/static/css/newsletter.css b/innovedus_cms/base/static/css/newsletter.css index 111fe39..30e9138 100644 --- a/innovedus_cms/base/static/css/newsletter.css +++ b/innovedus_cms/base/static/css/newsletter.css @@ -1,5 +1,5 @@ .newsletter-page { - background: #0e1b42 url("../img/newsletter_bg.png") center center / cover no-repeat fixed; + background: #0e1b42 url("../img/newsletter_bg.webp") center center / cover no-repeat fixed; } .newsletter-page .site-main > .site-container { @@ -170,4 +170,4 @@ .newsletter-back-link__text { font-size: 14px; } -} \ No newline at end of file +} diff --git a/innovedus_cms/base/static/img/email/facebook-white.original.png b/innovedus_cms/base/static/img/email/facebook-white.original.png new file mode 100644 index 0000000..6d87840 Binary files /dev/null and b/innovedus_cms/base/static/img/email/facebook-white.original.png differ diff --git a/innovedus_cms/base/static/img/email/instagram-white.original.png b/innovedus_cms/base/static/img/email/instagram-white.original.png new file mode 100644 index 0000000..f3b31e0 Binary files /dev/null and b/innovedus_cms/base/static/img/email/instagram-white.original.png differ diff --git a/innovedus_cms/base/static/img/email/logo.png b/innovedus_cms/base/static/img/email/logo.png new file mode 100644 index 0000000..ca652d8 Binary files /dev/null and b/innovedus_cms/base/static/img/email/logo.png differ diff --git a/innovedus_cms/base/static/img/email/mailback.jpg b/innovedus_cms/base/static/img/email/mailback.jpg new file mode 100644 index 0000000..77922fb Binary files /dev/null and b/innovedus_cms/base/static/img/email/mailback.jpg differ diff --git a/innovedus_cms/base/static/img/email/threads-white.original.png b/innovedus_cms/base/static/img/email/threads-white.original.png new file mode 100644 index 0000000..f016f42 Binary files /dev/null and b/innovedus_cms/base/static/img/email/threads-white.original.png differ diff --git a/innovedus_cms/base/static/img/newsletter_bg.webp b/innovedus_cms/base/static/img/newsletter_bg.webp new file mode 100644 index 0000000..3451143 Binary files /dev/null and b/innovedus_cms/base/static/img/newsletter_bg.webp differ diff --git a/innovedus_cms/base/static/img/og_default.jpg b/innovedus_cms/base/static/img/og_default.jpg new file mode 100644 index 0000000..5e7a69d Binary files /dev/null and b/innovedus_cms/base/static/img/og_default.jpg differ diff --git a/innovedus_cms/home/feeds.py b/innovedus_cms/home/feeds.py index ff473c0..f89b083 100644 --- a/innovedus_cms/home/feeds.py +++ b/innovedus_cms/home/feeds.py @@ -1,3 +1,5 @@ +import os + from django.contrib.syndication.views import Feed from django.utils.feedgenerator import Rss201rev2Feed from django.utils.html import strip_tags @@ -5,6 +7,20 @@ from django.utils.html import strip_tags from .models import ArticlePage +def _get_env_int(name, default): + value = os.environ.get(name) + if value is None: + return default + try: + parsed = int(value) + except ValueError: + return default + return parsed if parsed > 0 else default + + +ARTICLE_FEED_SIZE = _get_env_int("ARTICLE_FEED_SIZE", 50) + + class LatestArticlesFeed(Feed): feed_type = Rss201rev2Feed title = "DeBuT AI 最新文章" @@ -12,7 +28,7 @@ class LatestArticlesFeed(Feed): description = "DeBuT AI 最新文章 RSS feed" def items(self): - return ArticlePage.objects.live().order_by("-date", "-id")[:20] + return ArticlePage.objects.live().order_by("-date", "-id")[:ARTICLE_FEED_SIZE] def item_title(self, item): return item.title diff --git a/innovedus_cms/home/static/css/article_list.css b/innovedus_cms/home/static/css/article_list.css index 4fb498d..22f357f 100644 --- a/innovedus_cms/home/static/css/article_list.css +++ b/innovedus_cms/home/static/css/article_list.css @@ -141,23 +141,27 @@ justify-content: center; align-items: center; gap: 8px; - margin: 40px 0 20px; - font-size: 14px; + margin: 0; + font-size: 12px; + font-weight: 400; + line-height: 15px; + letter-spacing: 0.3em; } .page-size-label { - color: #0e1b4266; + color: #0e1b42; } .page-size-option { display: inline-flex; align-items: center; justify-content: center; - min-width: 40px; - height: 32px; + min-width: 37px; + height: 24px; border: 1px solid #0e1b42; - border-radius: 4px; color: #0e1b42; + font-weight: 600; + letter-spacing: 0.05em; } .page-size-option.is-current { diff --git a/innovedus_cms/home/static/css/category.css b/innovedus_cms/home/static/css/category.css index 222243b..7f41574 100644 --- a/innovedus_cms/home/static/css/category.css +++ b/innovedus_cms/home/static/css/category.css @@ -11,6 +11,21 @@ line-height: 60px; } +.category-toolbar { + display: flex; + align-items: center; + justify-content: space-between; + gap: 24px; +} + +.category-toolbar .category-title { + flex: 0 0 auto; +} + +.category-toolbar .page-size-selector { + margin: 0 0 0 auto; +} + .subcategory-title { display: flex; align-items: center; @@ -38,6 +53,16 @@ } @media (max-width: 767px) { + .category-toolbar { + align-items: flex-start; + flex-direction: column; + gap: 12px; + } + + .category-toolbar .page-size-selector { + margin-left: 0; + } + .subcategory-title::after { display: none; } diff --git a/innovedus_cms/home/static/img/default_cover_1.jpg b/innovedus_cms/home/static/img/default_cover_1.jpg new file mode 100644 index 0000000..f4340dd Binary files /dev/null and b/innovedus_cms/home/static/img/default_cover_1.jpg differ diff --git a/innovedus_cms/home/static/img/default_cover_1.png b/innovedus_cms/home/static/img/default_cover_1.png deleted file mode 100644 index d039c62..0000000 Binary files a/innovedus_cms/home/static/img/default_cover_1.png and /dev/null differ diff --git a/innovedus_cms/home/static/img/default_cover_2.jpg b/innovedus_cms/home/static/img/default_cover_2.jpg new file mode 100644 index 0000000..a2772f1 Binary files /dev/null and b/innovedus_cms/home/static/img/default_cover_2.jpg differ diff --git a/innovedus_cms/home/static/img/default_cover_2.png b/innovedus_cms/home/static/img/default_cover_2.png deleted file mode 100644 index 1e8436b..0000000 Binary files a/innovedus_cms/home/static/img/default_cover_2.png and /dev/null differ diff --git a/innovedus_cms/home/static/img/default_cover_3.jpg b/innovedus_cms/home/static/img/default_cover_3.jpg new file mode 100644 index 0000000..f9ff3f8 Binary files /dev/null and b/innovedus_cms/home/static/img/default_cover_3.jpg differ diff --git a/innovedus_cms/home/static/img/default_cover_3.png b/innovedus_cms/home/static/img/default_cover_3.png deleted file mode 100644 index 83e3e27..0000000 Binary files a/innovedus_cms/home/static/img/default_cover_3.png and /dev/null differ diff --git a/innovedus_cms/home/templates/home/category_page.html b/innovedus_cms/home/templates/home/category_page.html index cb35545..6d0be30 100644 --- a/innovedus_cms/home/templates/home/category_page.html +++ b/innovedus_cms/home/templates/home/category_page.html @@ -27,8 +27,11 @@ {% endif %}