From 9045368b16cfe61c9e4734a85463c40afaa14780 Mon Sep 17 00:00:00 2001 From: Florian Agbuya Date: Thu, 12 Dec 2024 12:22:02 +0800 Subject: [PATCH] mattermost: remove free edition banner --- .../remove-free-edition-banner.patch | 163 ++++++++++++++++++ 1 file changed, 163 insertions(+) create mode 100644 nixbld-etc-nixos/mattermost/remove-free-edition-banner.patch diff --git a/nixbld-etc-nixos/mattermost/remove-free-edition-banner.patch b/nixbld-etc-nixos/mattermost/remove-free-edition-banner.patch new file mode 100644 index 0000000..3bd9502 --- /dev/null +++ b/nixbld-etc-nixos/mattermost/remove-free-edition-banner.patch @@ -0,0 +1,163 @@ +diff --git webapp/channels/src/components/global_header/left_controls/product_menu/product_branding_team_edition/product_branding_team_edition.tsx webapp/channels/src/components/global_header/left_controls/product_menu/product_branding_team_edition/product_branding_team_edition.tsx +index 9af4fc7354..60ae3160e8 100644 +--- webapp/channels/src/components/global_header/left_controls/product_menu/product_branding_team_edition/product_branding_team_edition.tsx ++++ webapp/channels/src/components/global_header/left_controls/product_menu/product_branding_team_edition/product_branding_team_edition.tsx +@@ -9,10 +9,6 @@ import Logo from 'components/common/svg_images_components/logo_dark_blue_svg'; + const ProductBrandingTeamEditionContainer = styled.div` + display: flex; + align-items: center; +- +- > * + * { +- margin-left: 8px; +- } + `; + + const StyledLogo = styled(Logo)` +@@ -21,23 +17,6 @@ const StyledLogo = styled(Logo)` + } + `; + +-const Badge = styled.div` +- display: flex; +- align-self: center; +- padding: 2px 6px; +- position: relative; +- top: 1px; +- border-radius: var(--radius-s); +- margin-left: 12px; +- background: rgba(var(--sidebar-text-rgb), 0.08); +- color: rgba(var(--sidebar-text-rgb), 0.75); +- font-family: 'Open Sans', sans-serif; +- font-size: 10px; +- font-weight: 600; +- letter-spacing: 0.025em; +- line-height: 16px; +-`; +- + const ProductBrandingTeamEdition = (): JSX.Element => { + return ( + +@@ -45,7 +24,6 @@ const ProductBrandingTeamEdition = (): JSX.Element => { + width={116} + height={20} + /> +- {'FREE EDITION'} + + ); + }; +diff --git webapp/channels/src/components/header_footer_route/header.scss webapp/channels/src/components/header_footer_route/header.scss +index e7c76f9861..2841858f44 100644 +--- webapp/channels/src/components/header_footer_route/header.scss ++++ webapp/channels/src/components/header_footer_route/header.scss +@@ -39,23 +39,6 @@ + width: 170px; + fill: var(--center-channel-color); + } +- +- .freeBadge { +- position: relative; +- top: 1px; +- display: flex; +- align-self: center; +- padding: 2px 6px; +- border-radius: var(--radius-s); +- margin-left: 12px; +- background: rgba(var(--center-channel-color-rgb), 0.08); +- color: rgba(var(--center-channel-color-rgb), 0.75); +- font-family: 'Open Sans', sans-serif; +- font-size: 10px; +- font-weight: 600; +- letter-spacing: 0.025em; +- line-height: 16px; +- } + } + } + +@@ -77,12 +60,6 @@ + margin-top: 12px; + } + } +- +- &.has-free-banner.has-custom-site-name { +- .header-back-button { +- bottom: -20px; +- } +- } + } + + @media screen and (max-width: 699px) { +diff --git webapp/channels/src/components/header_footer_route/header.tsx webapp/channels/src/components/header_footer_route/header.tsx +index 8cd1d8a624..55554fb0ad 100644 +--- webapp/channels/src/components/header_footer_route/header.tsx ++++ webapp/channels/src/components/header_footer_route/header.tsx +@@ -25,33 +25,15 @@ const Header = ({alternateLink, backButtonURL, onBackButtonClick}: HeaderProps) + + const ariaLabel = SiteName || 'Mattermost'; + +- let freeBanner = null; +- if (license.IsLicensed === 'false') { +- freeBanner = <>{'FREE EDITION'}; +- } +- + let title: React.ReactNode = SiteName; + if (title === 'Mattermost') { +- if (freeBanner) { +- title = ''; +- } else { +- title = ; +- } ++ title = ; + } + + return ( +-
++
+
+
+- {freeBanner && +- +- {freeBanner} +- +- } + {title && + { + role='menuitem' + id={props.id} + > +- {'FREE EDITION'} +
+ {formatMessage( + {