mirror of
https://github.com/zulip/zulip.git
synced 2026-06-03 21:01:43 +08:00
9a0d2876b6
The integrations and communities pages previously used
`legacy_portico_bundle.ts`, which pulls in Bootstrap and
`legacy_landing_page.css`. This commit swaps that entire setup
for a cleaner dependency tree:
1. A new `integrations_bundle.ts` imports the modern header,
`portico_variables.css`, `components.css`, `navbar.css`,
`footer.css`, and `markdown.css` — but not Bootstrap.
2. The webpack entries for `integrations` and `communities` now
use this new bundle plus `marketing_page.css`, which already
provides the same base element styles (body, headings,
paragraphs, `.main`, `.portico-landing`, `.padded-content`,
`.center`, `.button`) that `legacy_landing_page.css` was
being kept around for. Dropping `legacy_landing_page.css`
avoids cascade conflicts between its rules and the modern
styles we want (for example, `.button { font-size: 0.7em }`
in legacy was overriding the modern `.button { font-size: 18px }`
from `marketing_page.css` on these pages).
Add an explicit `img` reset on `.portico-landing.integrations .main`
to replace the Bootstrap `img` defaults that would otherwise be
lost: without `max-width: 100%; height: auto; vertical-align: middle`,
images embedded in integration instructions render at their natural
size and overflow the content column.
Legacy_portico.css also holds generic element-level markdown
content styling (paragraph margins, heading margins, horizontal
rules, list-padding resets, code-block backgrounds) scoped under
`.help .markdown`. Integration doc pages render the same markdown
but no longer load `legacy_portico.css`, so these rules would
regress on integration doc pages. Rather than leaving a regression
window and fixing it later, move those rules in this same commit
to `portico/markdown.css` under a shared selector
`.help .markdown, .integration-instructions`, so that
`help_bundle.ts` and `integrations_bundle.ts` — both of which
already load `markdown.css` — depend on a single source of truth.
Marketing pages (which also load `markdown.css` but use different
layout conventions for lists and paragraph margins) are left
unaffected because they match neither selector.
`.help .markdown a` link styling stays in `legacy_portico.css`
for now; consolidating it with the equivalent
`.integration-instructions a` /
`.portico-page-subheading a` /
`.eligible_realm_end_notice a` rules in `integrations.css` is a
follow-up.
Fixes part of #38904.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
136 lines
4.5 KiB
JSON
136 lines
4.5 KiB
JSON
{
|
|
"activity": [
|
|
"./third/bootstrap/css/bootstrap.portico.css",
|
|
"./src/bundles/common.ts",
|
|
"sorttable",
|
|
"./styles/portico/activity.css"
|
|
],
|
|
"billing": [
|
|
"./src/bundles/legacy_portico_bundle.ts",
|
|
"./src/billing/helpers.ts",
|
|
"./src/billing/billing.ts",
|
|
"./styles/portico/billing.css"
|
|
],
|
|
"sponsorship": [
|
|
"./src/bundles/legacy_portico_bundle.ts",
|
|
"jquery-validation",
|
|
"./src/portico/signup.ts",
|
|
"./src/billing/sponsorship.ts",
|
|
"./styles/portico/billing.css"
|
|
],
|
|
"billing_auth": [
|
|
"./src/bundles/legacy_portico_bundle.ts",
|
|
"./src/billing/helpers.ts",
|
|
"jquery-validation",
|
|
"./src/billing/remote_billing_auth.ts",
|
|
"./src/billing/deactivate_server.ts",
|
|
"./styles/portico/billing.css"
|
|
],
|
|
"upgrade": [
|
|
"./src/bundles/legacy_portico_bundle.ts",
|
|
"./src/billing/helpers.ts",
|
|
"./src/billing/upgrade.ts",
|
|
"jquery-validation",
|
|
"./styles/portico/billing.css"
|
|
],
|
|
"billing-event-status": [
|
|
"./src/bundles/legacy_portico_bundle.ts",
|
|
"./src/billing/event_status.ts",
|
|
"./src/billing/helpers.ts",
|
|
"./styles/portico/billing.css"
|
|
],
|
|
"portico": ["./src/bundles/legacy_portico_bundle.ts"],
|
|
"error-styles": [
|
|
"./third/bootstrap/css/bootstrap.portico.css",
|
|
"./styles/portico/legacy_portico_styles_bundle.css"
|
|
],
|
|
"common": ["./src/bundles/common.ts"],
|
|
"help": ["./src/bundles/help_bundle.ts", "simplebar/dist/simplebar.css", "simplebar"],
|
|
"marketing-page": [
|
|
"./src/bundles/marketing_page_bundle.ts",
|
|
"./src/portico/legacy_landing_page.ts",
|
|
"./styles/portico/marketing_page.css",
|
|
"./styles/portico/pricing_plans.css",
|
|
"./styles/portico/comparison_table.css"
|
|
],
|
|
"landing-page-hello": [
|
|
"./src/bundles/hello.ts",
|
|
"./src/portico/hello.ts",
|
|
"./src/portico/legacy_landing_page.ts",
|
|
"./src/portico/header.ts",
|
|
"./styles/portico/svg_icons.css",
|
|
"./styles/portico/hello.css",
|
|
"./styles/portico/navbar.css",
|
|
"./styles/portico/footer.css"
|
|
],
|
|
"plans-page": [
|
|
"./src/bundles/hello.ts",
|
|
"./src/portico/legacy_landing_page.ts",
|
|
"./src/portico/header.ts",
|
|
"./styles/portico/portico_variables.css",
|
|
"./styles/portico/hello.css",
|
|
"./styles/portico/navbar.css",
|
|
"./styles/portico/footer.css",
|
|
"./styles/portico/plans_pages.css",
|
|
"./styles/portico/pricing_plans.css",
|
|
"./styles/portico/comparison_table.css"
|
|
],
|
|
"integrations": [
|
|
"./src/bundles/integrations_bundle.ts",
|
|
"./src/portico/integrations.ts",
|
|
"./styles/portico/marketing_page.css",
|
|
"./styles/portico/integrations.css",
|
|
"./src/portico/help.ts"
|
|
],
|
|
"communities": [
|
|
"./src/bundles/integrations_bundle.ts",
|
|
"./src/portico/communities.ts",
|
|
"./styles/portico/marketing_page.css",
|
|
"./styles/portico/integrations.css"
|
|
],
|
|
"signup": [
|
|
"./src/bundles/legacy_portico_bundle.ts",
|
|
"jquery-validation",
|
|
"./src/portico/signup.ts"
|
|
],
|
|
"register": [
|
|
"./src/bundles/legacy_portico_bundle.ts",
|
|
"jquery-validation",
|
|
"./src/portico/signup.ts"
|
|
],
|
|
"slack-import": [
|
|
"./src/bundles/legacy_portico_bundle.ts",
|
|
"jquery-validation",
|
|
"./src/portico/signup.ts",
|
|
"@uppy/core/css/style.min.css",
|
|
"@uppy/dashboard/css/style.min.css",
|
|
"./src/portico/slack-import.ts"
|
|
],
|
|
"redirect-to-post": [
|
|
"./third/bootstrap/css/bootstrap.portico.css",
|
|
"./src/bundles/common.ts",
|
|
"./src/portico/redirect-to-post.ts"
|
|
],
|
|
"support": [
|
|
"./third/bootstrap/css/bootstrap.portico.css",
|
|
"./src/bundles/common.ts",
|
|
"sorttable",
|
|
"./styles/portico/activity.css",
|
|
"./src/support/support.ts",
|
|
"./src/portico/tippyjs.ts",
|
|
"tippy.js/dist/tippy.css"
|
|
],
|
|
"desktop-login": ["./src/bundles/legacy_portico_bundle.ts", "./src/portico/desktop-login.ts"],
|
|
"desktop-redirect": [
|
|
"./src/bundles/legacy_portico_bundle.ts",
|
|
"./src/portico/desktop-redirect.ts"
|
|
],
|
|
"stats": [
|
|
"./src/bundles/legacy_portico_bundle.ts",
|
|
"./styles/portico/stats.css",
|
|
"./src/stats/stats.ts"
|
|
],
|
|
"app": ["./src/bundles/app.ts"],
|
|
"digest": ["./src/bundles/legacy_portico_bundle.ts"]
|
|
}
|