forked from M-Labs/it-infra
164 lines
5.8 KiB
Diff
164 lines
5.8 KiB
Diff
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 (
|
|
<ProductBrandingTeamEditionContainer tabIndex={0}>
|
|
@@ -45,7 +24,6 @@ const ProductBrandingTeamEdition = (): JSX.Element => {
|
|
width={116}
|
|
height={20}
|
|
/>
|
|
- <Badge>{'FREE EDITION'}</Badge>
|
|
</ProductBrandingTeamEditionContainer>
|
|
);
|
|
};
|
|
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 = <><Logo/><span className='freeBadge'>{'FREE EDITION'}</span></>;
|
|
- }
|
|
-
|
|
let title: React.ReactNode = SiteName;
|
|
if (title === 'Mattermost') {
|
|
- if (freeBanner) {
|
|
- title = '';
|
|
- } else {
|
|
- title = <Logo/>;
|
|
- }
|
|
+ title = <Logo/>;
|
|
}
|
|
|
|
return (
|
|
- <div className={classNames('hfroute-header', {'has-free-banner': freeBanner, 'has-custom-site-name': title})}>
|
|
+ <div className={classNames('hfroute-header', {'has-custom-site-name': title})}>
|
|
<div className='header-main'>
|
|
<div>
|
|
- {freeBanner &&
|
|
- <Link
|
|
- className='header-logo-link'
|
|
- to='/'
|
|
- aria-label={ariaLabel}
|
|
- >
|
|
- {freeBanner}
|
|
- </Link>
|
|
- }
|
|
{title &&
|
|
<Link
|
|
className='header-logo-link'
|
|
diff --git webapp/channels/src/components/widgets/menu/menu_items/menu_start_trial.tsx webapp/channels/src/components/widgets/menu/menu_items/menu_start_trial.tsx
|
|
index 35646539c4..c1d1713948 100644
|
|
--- webapp/channels/src/components/widgets/menu/menu_items/menu_start_trial.tsx
|
|
+++ webapp/channels/src/components/widgets/menu/menu_items/menu_start_trial.tsx
|
|
@@ -14,22 +14,6 @@ import {LicenseLinks} from 'utils/constants';
|
|
|
|
import './menu_item.scss';
|
|
|
|
-const FreeVersionBadge = styled.div`
|
|
- position: relative;
|
|
- top: 1px;
|
|
- display: flex;
|
|
- padding: 2px 6px;
|
|
- border-radius: var(--radius-s);
|
|
- margin-bottom: 6px;
|
|
- 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;
|
|
-`;
|
|
-
|
|
type Props = {
|
|
id: string;
|
|
}
|
|
@@ -50,7 +34,6 @@ const MenuStartTrial = (props: Props): JSX.Element | null => {
|
|
role='menuitem'
|
|
id={props.id}
|
|
>
|
|
- <FreeVersionBadge>{'FREE EDITION'}</FreeVersionBadge>
|
|
<div className='editionText'>
|
|
{formatMessage(
|
|
{
|