From 7ecd23bb6cf828f61e65c1211f65c89bcdf5d3e2 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 1 Apr 2016 12:02:14 -0400 Subject: Revert "PLT-2027- Improvements to about dialog" --- webapp/components/about_build_modal.jsx | 127 +++++++++++++------------------- webapp/components/post.jsx | 12 +-- webapp/i18n/en.json | 5 -- webapp/sass/layout/_forms.scss | 11 +-- webapp/sass/layout/_post.scss | 9 --- webapp/sass/responsive/_mobile.scss | 20 ----- webapp/sass/routes/_about-modal.scss | 65 ---------------- webapp/sass/routes/_module.scss | 1 - webapp/utils/constants.jsx | 1 - webapp/utils/utils.jsx | 1 - 10 files changed, 56 insertions(+), 196 deletions(-) delete mode 100644 webapp/sass/routes/_about-modal.scss (limited to 'webapp') diff --git a/webapp/components/about_build_modal.jsx b/webapp/components/about_build_modal.jsx index 0dd2a7db6..a47225f7e 100644 --- a/webapp/components/about_build_modal.jsx +++ b/webapp/components/about_build_modal.jsx @@ -6,7 +6,6 @@ import {Modal} from 'react-bootstrap'; import {FormattedMessage} from 'react-intl'; import React from 'react'; -import Constants from 'utils/constants.jsx'; export default class AboutBuildModal extends React.Component { constructor(props) { @@ -21,7 +20,6 @@ export default class AboutBuildModal extends React.Component { render() { const config = global.window.mm_config; const license = global.window.mm_license; - const mattermostLogo = Constants.MATTERMOST_ICON_SVG; let title = ( ); - let subTitle = ( - - ); - - let learnMore = ( -
- - - {'mattermost.org'} - -
- ); - let licensee; if (config.BuildEnterpriseReady === 'true') { title = ( @@ -60,29 +36,6 @@ export default class AboutBuildModal extends React.Component { defaultMessage='Enterprise Edition' /> ); - - subTitle = ( - - ); - - learnMore = ( -
- - - {'about.mattermost.com'} - -
- ); - if (license.IsLicensed === 'true') { title = ( ); licensee = ( -
- -  {license.Company} +
+
+ +
+
{license.Company}
); } @@ -104,7 +59,6 @@ export default class AboutBuildModal extends React.Component { return ( @@ -117,38 +71,57 @@ export default class AboutBuildModal extends React.Component { -
-
- {'Mattermost'} {title} + {licensee} +
+
+
-
-

{'Mattermost'} {title}

-

{subTitle}

-
-
- -  {config.Version} ({config.BuildNumber}) -
-
- {licensee} +
{config.Version}
+
+
+
+ +
+
{config.BuildNumber}
+
+
+
+
+
{config.BuildDate}
-
- {learnMore} -
+
+
+
{config.BuildHash}
+ + + ); } diff --git a/webapp/components/post.jsx b/webapp/components/post.jsx index bbf8d9bf6..30c47ee22 100644 --- a/webapp/components/post.jsx +++ b/webapp/components/post.jsx @@ -129,7 +129,6 @@ export default class Post extends React.Component { const post = this.props.post; const parentPost = this.props.parentPost; const posts = this.props.posts; - const mattermostLogo = Constants.MATTERMOST_ICON_SVG; if (!post.props) { post.props = {}; @@ -192,6 +191,8 @@ export default class Post extends React.Component { } else { src = Constants.DEFAULT_WEBHOOK_LOGO; } + } else if (Utils.isSystemMessage(post)) { + src = Constants.SYSTEM_MESSAGE_PROFILE_IMAGE; } profilePic = ( @@ -201,15 +202,6 @@ export default class Post extends React.Component { width='36' /> ); - - if (Utils.isSystemMessage(post)) { - profilePic = ( - - ); - } } return ( diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index c1450ef48..d58d282bc 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -3,15 +3,10 @@ "about.date": "Build Date:", "about.enterpriseEditione1": "Enterprise Edition", "about.hash": "Build Hash:", - "about.copyright": "Copyright 2016 Mattermost, Inc. All rights reserved", "about.licensed": "Licensed by:", "about.number": "Build Number:", "about.teamEditiont0": "Team Edition", "about.teamEditiont1": "Enterprise Edition", - "about.teamEditionSt": "All your team communication in one place, instantly searchable and accessible anywhere.", - "about.teamEditionLearn": "Join the Mattermost community at ", - "about.enterpriseEditionSt": "Modern enterprise communication from behind your firewall.", - "about.enterpriseEditionLearn": "Learn more about Enterprise Edition at ", "about.title": "About Mattermost", "about.version": "Version:", "access_history.title": "Access History", diff --git a/webapp/sass/layout/_forms.scss b/webapp/sass/layout/_forms.scss index 00590495a..259beeb57 100644 --- a/webapp/sass/layout/_forms.scss +++ b/webapp/sass/layout/_forms.scss @@ -12,7 +12,7 @@ text-align: left; &.light { - @include opacity(.6); + color: $dark-gray; font-size: 1.05em; font-style: italic; font-weight: normal; @@ -41,13 +41,10 @@ .form-group { margin-bottom: 25px; - } -} - -.form-group { - &.less { - margin-bottom: 10px; + &.less { + margin-bottom: 10px; + } } } diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss index 947a81318..e2bce5562 100644 --- a/webapp/sass/layout/_post.scss +++ b/webapp/sass/layout/_post.scss @@ -644,15 +644,6 @@ body.ios { .post__img { width: 46px; - svg { - height: 36px; - width: 36px; - } - - path { - fill: inherit; - } - img { @include border-radius(50px); height: 36px; diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index 909d98416..0e1a471cf 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -786,26 +786,6 @@ } @media screen and (max-width: 640px) { - .modal { - .about-modal { - .about-modal__logo { - float: none; - padding: 0; - text-align: center; - width: 100%; - - svg { - height: 100px; - width: 100px; - } - } - - .about-modal__logo + div { - padding: 2em 0 0; - } - } - } - .access-history__table { > div { display: block; diff --git a/webapp/sass/routes/_about-modal.scss b/webapp/sass/routes/_about-modal.scss deleted file mode 100644 index da6a5717a..000000000 --- a/webapp/sass/routes/_about-modal.scss +++ /dev/null @@ -1,65 +0,0 @@ -@charset 'UTF-8'; - -.modal { - .about-modal { - .modal-header { - background: transparent; - border: none; - color: inherit; - padding: 20px 25px 0; - - .close { - color: inherit; - font-weight: normal; - right: 15px; - } - - .modal-title { - color: inherit; - font-size: 16px; - } - } - - .modal-body { - padding: 20px 25px 5px; - } - - .about-modal__content { - @include clearfix; - padding: 1em 0 3em; - } - - .about-modal__copyright { - @include opacity(.6); - margin-top: .5em; - } - - .about-modal__footer { - font-size: 13.5px; - } - - .about-modal__title { - line-height: 1.5; - margin: 0 0 10px; - } - - .about-modal__subtitle { - @include opacity(.6); - } - - .about-modal__logo { - @include opacity(.9); - float: left; - padding: 0 40px 0 20px; - - svg { - height: 125px; - width: 125px; - } - - path { - fill: inherit; - } - } - } -} diff --git a/webapp/sass/routes/_module.scss b/webapp/sass/routes/_module.scss index 4f3f6f9cd..b76dd147f 100644 --- a/webapp/sass/routes/_module.scss +++ b/webapp/sass/routes/_module.scss @@ -1,5 +1,4 @@ // Only for combining all the files in this folder -@import 'about-modal'; @import 'access-history'; @import 'activity-log'; @import 'admin-console'; diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx index b876f3221..68df771f9 100644 --- a/webapp/utils/constants.jsx +++ b/webapp/utils/constants.jsx @@ -246,7 +246,6 @@ export default { OPEN_TEAM: 'O', MAX_POST_LEN: 4000, EMOJI_SIZE: 16, - MATTERMOST_ICON_SVG: " ", ONLINE_ICON_SVG: " ", AWAY_ICON_SVG: " ", OFFLINE_ICON_SVG: " ", diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index ccdc00ea5..b248368fc 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -756,7 +756,6 @@ export function applyTheme(theme) { changeCss('.search-help-popover .search-autocomplete__item.selected', 'background:' + changeOpacity(theme.centerChannelColor, 0.15), 1); changeCss('::-webkit-scrollbar-thumb', 'background:' + changeOpacity(theme.centerChannelColor, 0.4), 1); changeCss('body', 'scrollbar-arrow-color:' + theme.centerChannelColor, 4); - changeCss('.modal .about-modal .about-modal__logo svg, .post .post__img svg', 'fill:' + theme.centerChannelColor, 1); } if (theme.newMessageSeparator) { -- cgit v1.2.3-1-g7c22