summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--web/react/components/edit_channel_modal.jsx6
-rw-r--r--web/react/components/edit_channel_purpose_modal.jsx7
-rw-r--r--web/react/components/member_list.jsx28
-rw-r--r--web/react/components/rename_channel_modal.jsx6
-rw-r--r--web/react/components/tutorial/tutorial_tip.jsx2
-rw-r--r--web/react/utils/utils.jsx2
-rw-r--r--web/sass-files/sass/partials/_base.scss2
-rw-r--r--web/sass-files/sass/partials/_modal.scss2
-rw-r--r--web/sass-files/sass/partials/_tutorial.scss14
9 files changed, 45 insertions, 24 deletions
diff --git a/web/react/components/edit_channel_modal.jsx b/web/react/components/edit_channel_modal.jsx
index 5b3c74e82..2557a55ca 100644
--- a/web/react/components/edit_channel_modal.jsx
+++ b/web/react/components/edit_channel_modal.jsx
@@ -12,6 +12,7 @@ export default class EditChannelModal extends React.Component {
this.handleUserInput = this.handleUserInput.bind(this);
this.handleClose = this.handleClose.bind(this);
this.onShow = this.onShow.bind(this);
+ this.handleShown = this.handleShown.bind(this);
this.state = {
header: '',
@@ -55,9 +56,13 @@ export default class EditChannelModal extends React.Component {
const button = e.relatedTarget;
this.setState({header: $(button).attr('data-header'), title: $(button).attr('data-title'), channelId: $(button).attr('data-channelid'), serverError: ''});
}
+ handleShown() {
+ $('#edit_channel #edit_header').focus();
+ }
componentDidMount() {
$(ReactDOM.findDOMNode(this.refs.modal)).on('show.bs.modal', this.onShow);
$(ReactDOM.findDOMNode(this.refs.modal)).on('hidden.bs.modal', this.handleClose);
+ $(ReactDOM.findDOMNode(this.refs.modal)).on('shown.bs.modal', this.handleShown);
}
componentWillUnmount() {
$(ReactDOM.findDOMNode(this.refs.modal)).off('hidden.bs.modal', this.handleClose);
@@ -114,6 +119,7 @@ export default class EditChannelModal extends React.Component {
<textarea
className='form-control no-resize'
rows='6'
+ id='edit_header'
maxLength='1024'
value={this.state.header}
onChange={this.handleUserInput}
diff --git a/web/react/components/edit_channel_purpose_modal.jsx b/web/react/components/edit_channel_purpose_modal.jsx
index 4d162cfe7..4cb96a3ff 100644
--- a/web/react/components/edit_channel_purpose_modal.jsx
+++ b/web/react/components/edit_channel_purpose_modal.jsx
@@ -15,6 +15,12 @@ export default class EditChannelPurposeModal extends React.Component {
this.state = {serverError: ''};
}
+ componentDidUpdate() {
+ if (this.props.show) {
+ $(ReactDOM.findDOMNode(this.refs.purpose)).focus();
+ }
+ }
+
handleHide() {
this.setState({serverError: ''});
@@ -77,6 +83,7 @@ export default class EditChannelPurposeModal extends React.Component {
return (
<Modal
className='modal-edit-channel-purpose'
+ ref='modal'
show={this.props.show}
onHide={this.handleHide}
>
diff --git a/web/react/components/member_list.jsx b/web/react/components/member_list.jsx
index 70eb0a500..9c0243291 100644
--- a/web/react/components/member_list.jsx
+++ b/web/react/components/member_list.jsx
@@ -17,26 +17,26 @@ export default class MemberList extends React.Component {
var message = '';
if (members.length === 0) {
- message = <span>No users to add.</span>;
+ message = <tr><td>No users to add.</td></tr>;
}
return (
<table className='table more-table member-list-holder'>
<tbody>
- {members.map(function mymembers(member) {
- return (
- <MemberListItem
- key={member.id}
- member={member}
- isAdmin={this.props.isAdmin}
- handleInvite={this.props.handleInvite}
- handleRemove={this.props.handleRemove}
- handleMakeAdmin={this.props.handleMakeAdmin}
- />
- );
- }, this)}
+ {members.map(function mymembers(member) {
+ return (
+ <MemberListItem
+ key={member.id}
+ member={member}
+ isAdmin={this.props.isAdmin}
+ handleInvite={this.props.handleInvite}
+ handleRemove={this.props.handleRemove}
+ handleMakeAdmin={this.props.handleMakeAdmin}
+ />
+ );
+ }, this)}
+ {message}
</tbody>
- {message}
</table>
);
}
diff --git a/web/react/components/rename_channel_modal.jsx b/web/react/components/rename_channel_modal.jsx
index 80f0956f2..9fb3af035 100644
--- a/web/react/components/rename_channel_modal.jsx
+++ b/web/react/components/rename_channel_modal.jsx
@@ -16,6 +16,7 @@ export default class RenameChannelModal extends React.Component {
this.displayNameKeyUp = this.displayNameKeyUp.bind(this);
this.handleClose = this.handleClose.bind(this);
this.handleShow = this.handleShow.bind(this);
+ this.handleShown = this.handleShown.bind(this);
this.handleSubmit = this.handleSubmit.bind(this);
this.state = {
@@ -118,9 +119,13 @@ export default class RenameChannelModal extends React.Component {
const button = $(e.relatedTarget);
this.setState({displayName: button.attr('data-display'), channelName: button.attr('data-name'), channelId: button.attr('data-channelid')});
}
+ handleShown() {
+ $('#rename_channel #display_name').focus();
+ }
componentDidMount() {
$(ReactDOM.findDOMNode(this.refs.modal)).on('show.bs.modal', this.handleShow);
$(ReactDOM.findDOMNode(this.refs.modal)).on('hidden.bs.modal', this.handleClose);
+ $(ReactDOM.findDOMNode(this.refs.modal)).on('shown.bs.modal', this.handleShown);
}
componentWillUnmount() {
$(ReactDOM.findDOMNode(this.refs.modal)).off('hidden.bs.modal', this.handleClose);
@@ -176,6 +181,7 @@ export default class RenameChannelModal extends React.Component {
onChange={this.onDisplayNameChange}
type='text'
ref='displayName'
+ id='display_name'
className='form-control'
placeholder='Enter display name'
value={this.state.displayName}
diff --git a/web/react/components/tutorial/tutorial_tip.jsx b/web/react/components/tutorial/tutorial_tip.jsx
index c85acb346..3094b2f4c 100644
--- a/web/react/components/tutorial/tutorial_tip.jsx
+++ b/web/react/components/tutorial/tutorial_tip.jsx
@@ -98,7 +98,7 @@ export default class TutorialTip extends React.Component {
<div className='tutorial__circles'>{dots}</div>
<div className='text-right'>
<button
- className='btn btn-default'
+ className='btn btn-primary'
onClick={this.handleNext}
>
{buttonText}
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index e8d34dccd..3eec1dd81 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -533,7 +533,7 @@ export function applyTheme(theme) {
changeCss('.dropdown-menu, .popover ', 'box-shadow:' + changeOpacity(theme.centerChannelColor, 0.1) + ' 0px 6px 12px', 3);
changeCss('.dropdown-menu, .popover ', '-webkit-box-shadow:' + changeOpacity(theme.centerChannelColor, 0.1) + ' 0px 6px 12px', 2);
changeCss('.dropdown-menu, .popover ', '-moz-box-shadow:' + changeOpacity(theme.centerChannelColor, 0.1) + ' 0px 6px 12px', 1);
- changeCss('.post-body hr, .loading-screen .loading__content .round, .tutorial__circles .circle, .tip-overlay .tutorial__circles .circle.active', 'background:' + theme.centerChannelColor, 1);
+ changeCss('.post-body hr, .loading-screen .loading__content .round, .tutorial__circles .circle', 'background:' + theme.centerChannelColor, 1);
changeCss('.channel-header .heading', 'color:' + theme.centerChannelColor, 1);
changeCss('.markdown__table tbody tr:nth-child(2n)', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
changeCss('.channel-header__info>div.dropdown .header-dropdown__icon', 'color:' + changeOpacity(theme.centerChannelColor, 0.8), 1);
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 2830026c9..ad4a65c00 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -31,7 +31,7 @@ body {
}
.container-fluid {
- @include clearfix;
+ @include legacy-pie-clearfix;
height: 100%;
position: relative;
}
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 0333e0c65..852d19a29 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -368,7 +368,7 @@
}
.modal-body {
- padding: 10px 0 0;
+ padding: 10px 0 20px;
@include clearfix;
}
diff --git a/web/sass-files/sass/partials/_tutorial.scss b/web/sass-files/sass/partials/_tutorial.scss
index 70216aa97..c1bf5fd59 100644
--- a/web/sass-files/sass/partials/_tutorial.scss
+++ b/web/sass-files/sass/partials/_tutorial.scss
@@ -107,11 +107,6 @@
width: 7px;
height: 7px;
margin: 0 4px;
- &.active {
- background: #000;
- @include opacity(0.4);
- }
-
}
}
@@ -153,10 +148,17 @@
padding-bottom: 100px;
padding: 20px 40px 40px;
.tutorial__steps {
+ position: relative;
max-width: 310px;
- min-height: 420px;
+ min-height: 350px;
+ margin-bottom: 50px;
text-align: left;
display: inline-block;
+ padding-bottom: 30px;
+ }
+ .btn-primary {
+ position: absolute;
+ bottom: 0;
}
}
h1 {
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-16 22:21:48 +0000