From f74f066a4472ad5ceac379eb3518307b51a18280 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 9 Sep 2015 19:42:03 +0500 Subject: MM-1866 - Adding download icon and adding download link for both file title and download icon --- web/react/components/file_attachment.jsx | 16 ++++++++++++++-- web/sass-files/sass/partials/_files.scss | 12 ++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) (limited to 'web') diff --git a/web/react/components/file_attachment.jsx b/web/react/components/file_attachment.jsx index 78693df98..c9aa06a97 100644 --- a/web/react/components/file_attachment.jsx +++ b/web/react/components/file_attachment.jsx @@ -97,6 +97,7 @@ export default class FileAttachment extends React.Component { var filename = this.props.filename; var fileInfo = utils.splitFileLocation(filename); + var fileUrl = utils.getFileUrl(filename); var type = utils.getFileType(fileInfo.ext); var thumbnail; @@ -150,14 +151,25 @@ export default class FileAttachment extends React.Component { {thumbnail}
-
{trimmedFilename} -
+
+ + + {fileInfo.ext.toUpperCase()} {fileSizeString}
diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss index 70f440989..405265f92 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -61,8 +61,8 @@ cursor: pointer; z-index: 5; opacity: inherit; - text-shadow: 0 0px 3px #444; - text-shadow: 0 0px 3px rgba(0, 0, 0, 0.7); + text-shadow: 0 0px 3px #444; + text-shadow: 0 0px 3px rgba(0, 0, 0, 0.7); } } } @@ -159,6 +159,14 @@ padding: 7px; .post-image__name { margin-bottom: 3px; + display: block; + color: #333; + } + .post-image__download { + display: inline-block; + padding-right: 7px; + cursor: pointer; + color: #555; } .post-image__type { color: grey; -- cgit v1.2.3-1-g7c22 From c5ce2fe933996c718522fb260c7a5a1bf3c63148 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 9 Sep 2015 21:26:15 +0500 Subject: MM-1825 - Improving UI for settings --- web/react/components/setting_item_min.jsx | 5 ++++- web/react/components/team_export_tab.jsx | 16 +++++++--------- web/react/components/user_settings_general.jsx | 26 +++++++++++++------------- web/sass-files/sass/partials/_settings.scss | 5 ++++- 4 files changed, 28 insertions(+), 24 deletions(-) (limited to 'web') diff --git a/web/react/components/setting_item_min.jsx b/web/react/components/setting_item_min.jsx index 098729a4f..d6ccc106c 100644 --- a/web/react/components/setting_item_min.jsx +++ b/web/react/components/setting_item_min.jsx @@ -19,7 +19,10 @@ export default class SettingItemMin extends React.Component { } return ( -
    +
    • {this.props.title}
      • {editButton}
    • {this.props.describe}
      • diff --git a/web/react/components/team_export_tab.jsx b/web/react/components/team_export_tab.jsx index 1bc5abdb1..2914904ad 100644 --- a/web/react/components/team_export_tab.jsx +++ b/web/react/components/team_export_tab.jsx @@ -75,15 +75,13 @@ export default class TeamExportTab extends React.Component {
      • diff --git a/web/react/components/user_settings_general.jsx b/web/react/components/user_settings_general.jsx index f2127ce0c..184534a9a 100644 --- a/web/react/components/user_settings_general.jsx +++ b/web/react/components/user_settings_general.jsx @@ -238,7 +238,7 @@ export default class UserSettingsGeneralTab extends React.Component { key='firstNameSetting' className='form-group' > - +
      - +
      - Notifications + {'Notifications'} ); const extraInfo = ( - By default, you will receive mention notifications when someone types your first name. - Go to {notifLink} settings to change this default. + {'By default, you will receive mention notifications when someone types your first name. '} + {'Go to '} {notifLink} {'settings to change this default.'} ); @@ -351,8 +351,8 @@ export default class UserSettingsGeneralTab extends React.Component { const extraInfo = ( - Use Nickname for a name you might be called that is different from your first name and user name. - This is most often used when two or more people have similar sounding names and usernames. + {'Use Nickname for a name you might be called that is different from your first name and user name.'} + {'This is most often used when two or more people have similar sounding names and usernames.'} ); @@ -406,7 +406,7 @@ export default class UserSettingsGeneralTab extends React.Component {
      ); - const extraInfo = (Pick something easy for teammates to recognize and recall.); + const extraInfo = ({'Pick something easy for teammates to recognize and recall.'}); usernameSection = ( Email is used for notifications, and requires verification if changed.
      ; if (!this.state.emailEnabled) { - helpText =

      Email has been disabled by your system administrator. No notification emails will be sent until it is enabled.
      ; + helpText =
      {'Email has been disabled by your system administrator. No notification emails will be sent until it is enabled.'}
      ; } inputs.push(
      - +
      - +

      - General Settings + {'General Settings'}

      -

      General Settings

      +

      {'General Settings'}

      {nameSection}
      diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index 25c093957..468880724 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -56,7 +56,11 @@ .section-min { padding: 1em 0; margin-bottom: 0; + cursor: pointer; @include clearfix; + &:hover { + background: #f9f9f9; + } } .section-max { @@ -97,7 +101,6 @@ } .setting-list__hint { - color: #555; margin-top: 20px; } -- cgit v1.2.3-1-g7c22 From 1f5e43b38817b8c6a3b121d6bd4447411e135f5d Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 9 Sep 2015 22:32:21 +0500 Subject: Adding minor hover changes for settings --- web/react/components/setting_item_min.jsx | 3 ++- web/sass-files/sass/partials/_settings.scss | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'web') diff --git a/web/react/components/setting_item_min.jsx b/web/react/components/setting_item_min.jsx index d6ccc106c..2c0fdf2f4 100644 --- a/web/react/components/setting_item_min.jsx +++ b/web/react/components/setting_item_min.jsx @@ -12,7 +12,8 @@ export default class SettingItemMin extends React.Component { href='#' onClick={this.props.updateSection} > - Edit + + {'Edit'} ); diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index 468880724..2b59a943b 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -61,6 +61,12 @@ &:hover { background: #f9f9f9; } + &:hover .fa { + display: inline-block; + } + &:hover .section-edit { + text-decoration: underline; + } } .section-max { @@ -81,6 +87,12 @@ .section-edit { text-align: right; margin-bottom: 5px; + .fa { + margin-right: 7px; + font-size: 12px; + color: #aaa; + display: none; + } } .section-describe { -- cgit v1.2.3-1-g7c22