diff options
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/components/about_build_modal.jsx | 127 | ||||
-rw-r--r-- | webapp/components/post.jsx | 12 | ||||
-rw-r--r-- | webapp/i18n/en.json | 5 | ||||
-rw-r--r-- | webapp/sass/layout/_forms.scss | 11 | ||||
-rw-r--r-- | webapp/sass/layout/_post.scss | 9 | ||||
-rw-r--r-- | webapp/sass/responsive/_mobile.scss | 20 | ||||
-rw-r--r-- | webapp/sass/routes/_about-modal.scss | 65 | ||||
-rw-r--r-- | webapp/sass/routes/_module.scss | 1 | ||||
-rw-r--r-- | webapp/utils/constants.jsx | 1 | ||||
-rw-r--r-- | webapp/utils/utils.jsx | 1 |
10 files changed, 56 insertions, 196 deletions
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 = ( <FormattedMessage @@ -30,28 +28,6 @@ export default class AboutBuildModal extends React.Component { /> ); - let subTitle = ( - <FormattedMessage - id='about.teamEditionSt' - defaultMessage='All your team communication in one place, instantly searchable and accessible anywhere.' - /> - ); - - let learnMore = ( - <div> - <FormattedMessage - id='about.teamEditionLearn' - defaultMessage='Join the Mattermost community at ' - /> - <a - target='_blank' - href='http://www.mattermost.org/' - > - {'mattermost.org'} - </a> - </div> - ); - let licensee; if (config.BuildEnterpriseReady === 'true') { title = ( @@ -60,29 +36,6 @@ export default class AboutBuildModal extends React.Component { defaultMessage='Enterprise Edition' /> ); - - subTitle = ( - <FormattedMessage - id='about.enterpriseEditionSt' - defaultMessage='Modern enterprise communication from behind your firewall.' - /> - ); - - learnMore = ( - <div> - <FormattedMessage - id='about.enterpriseEditionLearn' - defaultMessage='Learn more about Enterprise Edition at ' - /> - <a - target='_blank' - href='http://about.mattermost.com/' - > - {'about.mattermost.com'} - </a> - </div> - ); - if (license.IsLicensed === 'true') { title = ( <FormattedMessage @@ -91,12 +44,14 @@ export default class AboutBuildModal extends React.Component { /> ); licensee = ( - <div className='form-group'> - <FormattedMessage - id='about.licensed' - defaultMessage='Licensed by:' - /> - {license.Company} + <div className='row form-group'> + <div className='col-sm-3 info__label'> + <FormattedMessage + id='about.licensed' + defaultMessage='Licensed by:' + /> + </div> + <div className='col-sm-9'>{license.Company}</div> </div> ); } @@ -104,7 +59,6 @@ export default class AboutBuildModal extends React.Component { return ( <Modal - dialogClassName='about-modal' show={this.props.show} onHide={this.doHide} > @@ -117,38 +71,57 @@ export default class AboutBuildModal extends React.Component { </Modal.Title> </Modal.Header> <Modal.Body> - <div className='about-modal__content'> - <div className='about-modal__logo'> - <span - className='icon' - dangerouslySetInnerHTML={{__html: mattermostLogo}} + <h4 className='padding-bottom x2'>{'Mattermost'} {title}</h4> + {licensee} + <div className='row form-group'> + <div className='col-sm-3 info__label'> + <FormattedMessage + id='about.version' + defaultMessage='Version:' /> </div> - <div> - <h3 className='about-modal__title'>{'Mattermost'} {title}</h3> - <p className='about-modal__subtitle padding-bottom'>{subTitle}</p> - <div className='form-group less'> - <div> - <FormattedMessage - id='about.version' - defaultMessage='Version:' - /> - {config.Version} ({config.BuildNumber}) - </div> - </div> - {licensee} + <div className='col-sm-9'>{config.Version}</div> + </div> + <div className='row form-group'> + <div className='col-sm-3 info__label'> + <FormattedMessage + id='about.number' + defaultMessage='Build Number:' + /> + </div> + <div className='col-sm-9'>{config.BuildNumber}</div> + </div> + <div className='row form-group'> + <div className='col-sm-3 info__label'> + <FormattedMessage + id='about.date' + defaultMessage='Build Date:' + /> </div> + <div className='col-sm-9'>{config.BuildDate}</div> </div> - <div className='about-modal__footer'> - {learnMore} - <div className='form-group about-modal__copyright'> + <div className='row form-group'> + <div className='col-sm-3 info__label'> <FormattedMessage - id='about.copyright' - defaultMessage='Copyright 2016 Mattermost, Inc. All rights reserved' + id='about.hash' + defaultMessage='Build Hash:' /> </div> + <div className='col-sm-9'>{config.BuildHash}</div> </div> </Modal.Body> + <Modal.Footer> + <button + type='button' + className='btn btn-default' + onClick={this.doHide} + > + <FormattedMessage + id='about.close' + defaultMessage='Close' + /> + </button> + </Modal.Footer> </Modal> ); } 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 = ( - <span - className='icon' - dangerouslySetInnerHTML={{__html: mattermostLogo}} - /> - ); - } } 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: "<svg version='1.1' id='Layer_1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px'viewBox='0 0 500 500' style='enable-background:new 0 0 500 500;' xml:space='preserve'> <style type='text/css'> .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#222222;} </style> <g id='XMLID_1_'> <g id='XMLID_3_'> <path id='XMLID_4_' class='st0' d='M396.9,47.7l2.6,53.1c43,47.5,60,114.8,38.6,178.1c-32,94.4-137.4,144.1-235.4,110.9 S51.1,253.1,83,158.7C104.5,95.2,159.2,52,222.5,40.5l34.2-40.4C150-2.8,49.3,63.4,13.3,169.9C-31,300.6,39.1,442.5,169.9,486.7 s272.6-25.8,316.9-156.6C522.7,223.9,483.1,110.3,396.9,47.7z'/> </g> <path id='XMLID_2_' class='st0' d='M335.6,204.3l-1.8-74.2l-1.5-42.7l-1-37c0,0,0.2-17.8-0.4-22c-0.1-0.9-0.4-1.6-0.7-2.2 c0-0.1-0.1-0.2-0.1-0.3c0-0.1-0.1-0.2-0.1-0.2c-0.7-1.2-1.8-2.1-3.1-2.6c-1.4-0.5-2.9-0.4-4.2,0.2c0,0-0.1,0-0.1,0 c-0.2,0.1-0.3,0.1-0.4,0.2c-0.6,0.3-1.2,0.7-1.8,1.3c-3,3-13.7,17.2-13.7,17.2l-23.2,28.8l-27.1,33l-46.5,57.8 c0,0-21.3,26.6-16.6,59.4s29.1,48.7,48,55.1c18.9,6.4,48,8.5,71.6-14.7C336.4,238.4,335.6,204.3,335.6,204.3z'/> </g> </svg>", ONLINE_ICON_SVG: "<svg version='1.1'id='Layer_1' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:svg='http://www.w3.org/2000/svg' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:cc='http://creativecommons.org/ns#' inkscape:version='0.48.4 r9939' sodipodi:docname='TRASH_1_4.svg'xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' viewBox='-243 245 12 12'style='enable-background:new -243 245 12 12;' xml:space='preserve'> <sodipodi:namedview inkscape:cx='26.358185' inkscape:zoom='1.18' bordercolor='#666666' pagecolor='#ffffff' borderopacity='1' objecttolerance='10' inkscape:cy='139.7898' gridtolerance='10' guidetolerance='10' showgrid='false' showguides='true' id='namedview6' inkscape:pageopacity='0' inkscape:pageshadow='2' inkscape:guide-bbox='true' inkscape:window-width='1366' inkscape:current-layer='Layer_1' inkscape:window-height='705' inkscape:window-y='-8' inkscape:window-maximized='1' inkscape:window-x='-8'> <sodipodi:guide position='50.036793,85.991376' orientation='1,0' id='guide2986'></sodipodi:guide> <sodipodi:guide position='58.426196,66.216355' orientation='0,1' id='guide3047'></sodipodi:guide> </sodipodi:namedview> <g> <path class='online--icon' d='M-236,250.5C-236,250.5-236,250.5-236,250.5C-236,250.5-236,250.5-236,250.5C-236,250.5-236,250.5-236,250.5z'/> <ellipse class='online--icon' cx='-238.5' cy='248' rx='2.5' ry='2.5'/> </g> <path class='online--icon' d='M-238.9,253.8c0-0.4,0.1-0.9,0.2-1.3c-2.2-0.2-2.2-2-2.2-2s-1,0.1-1.2,0.5c-0.4,0.6-0.6,1.7-0.7,2.5c0,0.1-0.1,0.5,0,0.6 c0.2,1.3,2.2,2.3,4.4,2.4c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0C-238.7,255.7-238.9,254.8-238.9,253.8z'/> <g> <g> <path class='online--icon' d='M-232.3,250.1l1.3,1.3c0,0,0,0.1,0,0.1l-4.1,4.1c0,0,0,0-0.1,0c0,0,0,0,0,0l-2.7-2.7c0,0,0-0.1,0-0.1l1.2-1.2 c0,0,0.1,0,0.1,0l1.4,1.4l2.9-2.9C-232.4,250.1-232.3,250.1-232.3,250.1z'/> </g> </g> </svg>", AWAY_ICON_SVG: "<svg version='1.1'id='Layer_1' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:svg='http://www.w3.org/2000/svg' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:cc='http://creativecommons.org/ns#' inkscape:version='0.48.4 r9939' sodipodi:docname='TRASH_1_4.svg'xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' viewBox='-299 391 12 12'style='enable-background:new -299 391 12 12;' xml:space='preserve'> <sodipodi:namedview inkscape:cx='26.358185' inkscape:zoom='1.18' bordercolor='#666666' pagecolor='#ffffff' borderopacity='1' objecttolerance='10' inkscape:cy='139.7898' gridtolerance='10' guidetolerance='10' showgrid='false' showguides='true' id='namedview6' inkscape:pageopacity='0' inkscape:pageshadow='2' inkscape:guide-bbox='true' inkscape:window-width='1366' inkscape:current-layer='Layer_1' inkscape:window-height='705' inkscape:window-y='-8' inkscape:window-maximized='1' inkscape:window-x='-8'> <sodipodi:guide position='50.036793,85.991376' orientation='1,0' id='guide2986'></sodipodi:guide> <sodipodi:guide position='58.426196,66.216355' orientation='0,1' id='guide3047'></sodipodi:guide> </sodipodi:namedview> <g> <ellipse class='away--icon' cx='-294.6' cy='394' rx='2.5' ry='2.5'/> <path class='away--icon' d='M-293.8,399.4c0-0.4,0.1-0.7,0.2-1c-0.3,0.1-0.6,0.2-1,0.2c-2.5,0-2.5-2-2.5-2s-1,0.1-1.2,0.5c-0.4,0.6-0.6,1.7-0.7,2.5 c0,0.1-0.1,0.5,0,0.6c0.2,1.3,2.2,2.3,4.4,2.4c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0c0.7,0,1.4-0.1,2-0.3 C-293.3,401.5-293.8,400.5-293.8,399.4z'/> </g> <path class='away--icon' d='M-287,400c0,0.1-0.1,0.1-0.1,0.1l-4.9,0c-0.1,0-0.1-0.1-0.1-0.1v-1.6c0-0.1,0.1-0.1,0.1-0.1l4.9,0c0.1,0,0.1,0.1,0.1,0.1 V400z'/> </svg>", OFFLINE_ICON_SVG: "<svg version='1.1'id='Layer_1' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:svg='http://www.w3.org/2000/svg' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:cc='http://creativecommons.org/ns#' inkscape:version='0.48.4 r9939' sodipodi:docname='TRASH_1_4.svg'xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' viewBox='-299 391 12 12'style='enable-background:new -299 391 12 12;' xml:space='preserve'> <sodipodi:namedview inkscape:cx='26.358185' inkscape:zoom='1.18' bordercolor='#666666' pagecolor='#ffffff' borderopacity='1' objecttolerance='10' inkscape:cy='139.7898' gridtolerance='10' guidetolerance='10' showgrid='false' showguides='true' id='namedview6' inkscape:pageopacity='0' inkscape:pageshadow='2' inkscape:guide-bbox='true' inkscape:window-width='1366' inkscape:current-layer='Layer_1' inkscape:window-height='705' inkscape:window-y='-8' inkscape:window-maximized='1' inkscape:window-x='-8'> <sodipodi:guide position='50.036793,85.991376' orientation='1,0' id='guide2986'></sodipodi:guide> <sodipodi:guide position='58.426196,66.216355' orientation='0,1' id='guide3047'></sodipodi:guide> </sodipodi:namedview> <g> <g> <ellipse class='offline--icon' cx='-294.5' cy='394' rx='2.5' ry='2.5'/> <path class='offline--icon' d='M-294.3,399.7c0-0.4,0.1-0.8,0.2-1.2c-0.1,0-0.2,0-0.4,0c-2.5,0-2.5-2-2.5-2s-1,0.1-1.2,0.5c-0.4,0.6-0.6,1.7-0.7,2.5 c0,0.1-0.1,0.5,0,0.6c0.2,1.3,2.2,2.3,4.4,2.4h0.1h0.1c0.3,0,0.7,0,1-0.1C-293.9,401.6-294.3,400.7-294.3,399.7z'/> </g> </g> <g> <path class='offline--icon' d='M-288.9,399.4l1.8-1.8c0.1-0.1,0.1-0.3,0-0.3l-0.7-0.7c-0.1-0.1-0.3-0.1-0.3,0l-1.8,1.8l-1.8-1.8c-0.1-0.1-0.3-0.1-0.3,0 l-0.7,0.7c-0.1,0.1-0.1,0.3,0,0.3l1.8,1.8l-1.8,1.8c-0.1,0.1-0.1,0.3,0,0.3l0.7,0.7c0.1,0.1,0.3,0.1,0.3,0l1.8-1.8l1.8,1.8 c0.1,0.1,0.3,0.1,0.3,0l0.7-0.7c0.1-0.1,0.1-0.3,0-0.3L-288.9,399.4z'/> </g> </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) { |