summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--web/react/components/admin_console/email_settings.jsx2
-rw-r--r--web/react/components/admin_console/jobs_settings.jsx2
-rw-r--r--web/react/components/change_url_modal.jsx2
-rw-r--r--web/react/components/search_bar.jsx4
-rw-r--r--web/react/components/setting_item_max.jsx2
-rw-r--r--web/react/components/sidebar.jsx7
-rw-r--r--web/sass-files/sass/partials/_headers.scss8
-rw-r--r--web/sass-files/sass/partials/_responsive.scss3
-rw-r--r--web/sass-files/sass/partials/_sidebar--left.scss10
9 files changed, 33 insertions, 7 deletions
diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx
index 3c53a8ee1..e8fb25858 100644
--- a/web/react/components/admin_console/email_settings.jsx
+++ b/web/react/components/admin_console/email_settings.jsx
@@ -300,7 +300,7 @@ export default class EmailSettings extends React.Component {
type='submit'
className='btn btn-primary'
>
- {'Submit'}
+ {'Save'}
</button>
</div>
</div>
diff --git a/web/react/components/admin_console/jobs_settings.jsx b/web/react/components/admin_console/jobs_settings.jsx
index 34ec9693d..0b4fc4185 100644
--- a/web/react/components/admin_console/jobs_settings.jsx
+++ b/web/react/components/admin_console/jobs_settings.jsx
@@ -172,7 +172,7 @@ export default class Jobs extends React.Component {
type='submit'
className='btn btn-primary'
>
- {'Submit'}
+ {'Save'}
</button>
</div>
</div>
diff --git a/web/react/components/change_url_modal.jsx b/web/react/components/change_url_modal.jsx
index 28fa70c1f..3553e1107 100644
--- a/web/react/components/change_url_modal.jsx
+++ b/web/react/components/change_url_modal.jsx
@@ -159,7 +159,7 @@ ChangeUrlModal.defaultProps = {
title: 'Change URL',
desciption: '',
urlLabel: 'URL',
- submitButtonText: 'Submit',
+ submitButtonText: 'Save',
currentURL: '',
serverError: ''
};
diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx
index 006d15459..77166fef9 100644
--- a/web/react/components/search_bar.jsx
+++ b/web/react/components/search_bar.jsx
@@ -75,6 +75,9 @@ export default class SearchBar extends React.Component {
PostStore.emitSearchTermChange(false);
this.setState({searchTerm: term});
}
+ handleMouseInput(e) {
+ e.preventDefault();
+ }
handleUserFocus(e) {
e.target.select();
$('.search-bar__container').addClass('focused');
@@ -140,6 +143,7 @@ export default class SearchBar extends React.Component {
value={this.state.searchTerm}
onFocus={this.handleUserFocus}
onChange={this.handleUserInput}
+ onMouseUp={this.handleMouseInput}
/>
{isSearching}
</form>
diff --git a/web/react/components/setting_item_max.jsx b/web/react/components/setting_item_max.jsx
index b1bab1d48..1bffa7c79 100644
--- a/web/react/components/setting_item_max.jsx
+++ b/web/react/components/setting_item_max.jsx
@@ -26,7 +26,7 @@ export default class SettingItemMax extends React.Component {
href='#'
onClick={this.props.submit}
>
- Submit
+ Save
</a>
);
}
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 977fecb5c..697fc09c9 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -348,6 +348,11 @@ export default class Sidebar extends React.Component {
);
}
+ var badgeClass;
+ if (msgCount > 0) {
+ badgeClass = 'has-badge';
+ }
+
// set up status icon for direct message channels
var status = null;
if (channel.type === 'D') {
@@ -408,7 +413,7 @@ export default class Sidebar extends React.Component {
className={linkClass}
>
<a
- className={'sidebar-channel ' + titleClass}
+ className={'sidebar-channel ' + titleClass + ' ' + badgeClass}
href={href}
onClick={handleClick}
>
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index e83981397..702f0fd60 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -133,7 +133,7 @@
.navbar-right {
font-size: 0.85em;
position: absolute;
- top: 10px;
+ top: 11px;
right: 22px;
z-index: 5;
.dropdown-toggle {
@@ -171,7 +171,6 @@
}
.team__name, .user__name {
display: block;
- line-height: 18px;
font-weight: 600;
font-size: 16px;
max-width: 80%;
@@ -180,9 +179,14 @@
text-overflow: ellipsis;
text-decoration: none;
}
+ .team__name {
+ line-height: 22px;
+ margin-top: -2px;
+ }
.user__name {
@include single-transition(all, 0.1s, linear);
font-size: 14px;
+ line-height: 18px;
font-weight: 400;
color: #eee;
color: rgba(#fff, 0.8);
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index a30782dd0..d29c653ff 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -584,6 +584,9 @@
&.move--right {
@include translate3d(0, 0, 0);
}
+ .badge {
+ top: 13px;
+ }
> div {
padding-bottom: 105px;
}
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 514d22f24..f714a23f8 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -30,6 +30,9 @@
}
.badge {
background-color: $primary-color;
+ position: absolute;
+ right: 10px;
+ top: 5px;
}
.status {
position:relative;
@@ -90,6 +93,12 @@
line-height: 1.5;
border-radius: 0;
color: #999;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ &.has-badge {
+ padding-right: 30px;
+ }
&.nav-more {
text-decoration: underline;
}
@@ -104,6 +113,7 @@
&.active {
a, a:hover, a:focus {
color: #111;
+ padding-right: 10px;
background-color: #e1e1e1;
border-radius: 0;
font-weight: 400;
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-30 12:39:29 +0000