Skip to content
This repository has been archived by the owner on Jan 12, 2022. It is now read-only.

branding #1

Merged
merged 3 commits into from
Aug 30, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions webapp/components/about_build_modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ export default class AboutBuildModal extends React.Component {
<div>
<FormattedMessage
id='about.teamEditionLearn'
defaultMessage='Join the Mattermost community at '
defaultMessage='Visit us at '
/>
<a
target='_blank'
rel='noopener noreferrer'
href='http://www.mattermost.org/'
href='https://www.analyticsmd.com/'
>
{'mattermost.org'}
{'analyticsmd.com'}
</a>
</div>
);
Expand Down Expand Up @@ -78,9 +78,9 @@ export default class AboutBuildModal extends React.Component {
<a
target='_blank'
rel='noopener noreferrer'
href='http://about.mattermost.com/'
href='https://www.analyticsmd.com/'
>
{'about.mattermost.com'}
{'analyticsmd.com'}
</a>
</div>
);
Expand Down Expand Up @@ -114,20 +114,14 @@ export default class AboutBuildModal extends React.Component {
<Modal.Title>
<FormattedMessage
id='about.title'
defaultMessage='About Mattermost'
defaultMessage='About Last Mile'
/>
</Modal.Title>
</Modal.Header>
<Modal.Body>
<div className='about-modal__content'>
<div className='about-modal__logo'>
<span
className='icon'
dangerouslySetInnerHTML={{__html: mattermostLogo}}
/>
</div>
<div>
<h3 className='about-modal__title'>{'Mattermost'} {title}</h3>
<h3 className='about-modal__title'>{'Last Mile'} {title}</h3>
<p className='about-modal__subtitle padding-bottom'>{subTitle}</p>
<div className='form-group less'>
<div>
Expand All @@ -146,7 +140,7 @@ export default class AboutBuildModal extends React.Component {
<div className='form-group about-modal__copyright'>
<FormattedMessage
id='about.copyright'
defaultMessage='Copyright 2016 Mattermost, Inc. All rights reserved'
defaultMessage='Copyright 2016 analyticsMD, Inc. All rights reserved'
/>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion webapp/components/header_footer_template.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default class NotLoggedIn extends React.Component {
<span className='pull-right footer-site-name'>{global.window.mm_config.SiteName}</span>
</div>
<div className='col-xs-12'>
<span className='pull-right footer-link copyright'>{'© 2015-2016 Mattermost, Inc.'}</span>
<span className='pull-right footer-link copyright'>{'© 2011-2016 analyticsMD, Inc.'}</span>
<a
id='help_link'
className='pull-right footer-link'
Expand Down
2 changes: 1 addition & 1 deletion webapp/components/navbar_dropdown.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ export default class NavbarDropdown extends React.Component {
>
<FormattedMessage
id='navbar_dropdown.about'
defaultMessage='About Mattermost'
defaultMessage='About Last Mile'
/>
</a>
</li>
Expand Down
9 changes: 5 additions & 4 deletions webapp/components/post.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,11 @@ export default class Post extends React.Component {

if (Utils.isSystemMessage(post)) {
profilePic = (
<span
className='icon'
dangerouslySetInnerHTML={{__html: mattermostLogo}}
/>
<img
src={Constants.SYSTEM_MESSAGE_PROFILE_IMAGE}
height='36'
width='36'
/>
);
}

Expand Down
2 changes: 1 addition & 1 deletion webapp/components/sidebar_right_menu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ export default class SidebarRightMenu extends React.Component {
<i className='fa fa-info'></i>
<FormattedMessage
id='navbar_dropdown.about'
defaultMessage='About Mattermost'
defaultMessage='About Last Mile'
/>
</a>
</li>
Expand Down
8 changes: 4 additions & 4 deletions webapp/i18n/en.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"about.close": "Close",
"about.copyright": "Copyright 2016 Mattermost, Inc. All rights reserved",
"about.copyright": "Copyright 2016 analyticsMD, Inc. All rights reserved",
"about.date": "Build Date:",
"about.enterpriseEditionLearn": "Learn more about Enterprise Edition at ",
"about.enterpriseEditionSt": "Modern enterprise communication from behind your firewall.",
Expand All @@ -9,11 +9,11 @@
"about.hashee": "EE Build Hash:",
"about.licensed": "Licensed by:",
"about.number": "Build Number:",
"about.teamEditionLearn": "Join the Mattermost community at ",
"about.teamEditionLearn": "Join the analyticsMD community at ",
"about.teamEditionSt": "All your team communication in one place, instantly searchable and accessible anywhere.",
"about.teamEditiont0": "Team Edition",
"about.teamEditiont1": "Enterprise Edition",
"about.title": "About Mattermost",
"about.title": "About Last Mile",
"about.version": "Version:",
"access_history.title": "Access History",
"activity_log.activeSessions": "Active Sessions",
Expand Down Expand Up @@ -1035,7 +1035,7 @@
"navbar.toggle1": "Toggle sidebar",
"navbar.toggle2": "Toggle sidebar",
"navbar.viewInfo": "View Info",
"navbar_dropdown.about": "About Mattermost",
"navbar_dropdown.about": "About Last Mile",
"navbar_dropdown.accountSettings": "Account Settings",
"navbar_dropdown.console": "System Console",
"navbar_dropdown.create": "Create a New Team",
Expand Down
2 changes: 1 addition & 1 deletion webapp/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"about.hash": "Clé de compilation :",
"about.licensed": "Clé de licence : ",
"about.number": "Numéro de compilation :",
"about.teamEditionLearn": "Join the Mattermost community at ",
"about.teamEditionLearn": "Join the analyticsMD community at ",
"about.teamEditionSt": "Toute la communication de votre équipe à un endroit, accessible de partout",
"about.teamEditiont0": "Édition Team",
"about.teamEditiont1": "Édition Enterprise",
Expand Down
Binary file modified webapp/images/logo_compact.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added webapp/images/logo_compact_analyticsmd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 22 additions & 22 deletions webapp/utils/constants.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import wordIcon from 'images/icons/word.png';
import patchIcon from 'images/icons/patch.png';
import genericIcon from 'images/icons/generic.png';

import logoImage from 'images/logo_compact.png';
import logoImage from 'images/logo_compact_analyticsmd.png';
import logoWebhook from 'images/webhook_icon.jpg';

import solarizedDarkCSS from '!!file?name=files/code_themes/[hash].[ext]!highlight.js/styles/solarized-dark.css';
Expand Down Expand Up @@ -273,27 +273,27 @@ export default {
UPDATE_TYPING_MS: 5000,
THEMES: {
default: {
type: 'Organization',
sidebarBg: '#2071a7',
sidebarText: '#fff',
sidebarUnreadText: '#fff',
sidebarTextHoverBg: '#136197',
sidebarTextActiveBorder: '#7AB0D6',
sidebarTextActiveColor: '#FFFFFF',
sidebarHeaderBg: '#2f81b7',
sidebarHeaderTextColor: '#FFFFFF',
onlineIndicator: '#7DBE00',
awayIndicator: '#DCBD4E',
mentionBj: '#FBFBFB',
mentionColor: '#2071A7',
centerChannelBg: '#f2f4f8',
centerChannelColor: '#333333',
newMessageSeparator: '#FF8800',
linkColor: '#2f81b7',
buttonBg: '#1dacfc',
buttonColor: '#FFFFFF',
mentionHighlightBg: '#fff2bb',
mentionHighlightLink: '#2f81b7',
type: 'analyticsMD',
sidebarBg: '#b8b0b0',
sidebarText: '#000000',
sidebarUnreadText: '#ffffff',
sidebarTextHoverBg: '#ebe2e2',
sidebarTextActiveBorder: '#424040',
sidebarTextActiveColor: '#ffffff',
sidebarHeaderBg: '#786f6f',
sidebarHeaderTextColor: '#ffffff',
onlineIndicator: '#af192b',
awayIndicator: '#e8bfc6',
mentionBj: '#c90808',
mentionColor: '#ffffff',
centerChannelBg: '#ffffff',
centerChannelColor: '#757575',
newMessageSeparator: '#cc992d',
linkColor: '#3c86bd',
buttonBg: '#3c86bd',
buttonColor: '#ffffff',
mentionHighlightBg: '#ffffff',
mentionHighlightLink: '#3c86bd',
codeTheme: 'github',
image: defaultThemeImage
},
Expand Down