Improving formatting for Channel Intro
Этот коммит содержится в:
@@ -348,8 +348,8 @@ module.exports = React.createClass({
|
|||||||
if (ChannelStore.isDefault(channel)) {
|
if (ChannelStore.isDefault(channel)) {
|
||||||
more_messages = (
|
more_messages = (
|
||||||
<div className="channel-intro">
|
<div className="channel-intro">
|
||||||
<h4 className="channel-intro-title">Welcome</h4>
|
<h4 className="channel-intro__title">Beginning of {ui_name}</h4>
|
||||||
<p>
|
<p className="channel-intro__content">
|
||||||
Welcome to {ui_name}!
|
Welcome to {ui_name}!
|
||||||
<br/><br/>
|
<br/><br/>
|
||||||
{"This is the first channel " + strings.Team + "mates see when they"}
|
{"This is the first channel " + strings.Team + "mates see when they"}
|
||||||
@@ -366,27 +366,27 @@ module.exports = React.createClass({
|
|||||||
} else if (channel.name === Constants.OFFTOPIC_CHANNEL) {
|
} else if (channel.name === Constants.OFFTOPIC_CHANNEL) {
|
||||||
more_messages = (
|
more_messages = (
|
||||||
<div className="channel-intro">
|
<div className="channel-intro">
|
||||||
<h4 className="channel-intro-title">Welcome</h4>
|
<h4 className="channel-intro__title">Beginning of {ui_name}</h4>
|
||||||
<p>
|
<p className="channel-intro__content">
|
||||||
{"This is the start of " + ui_name + ", a channel for conversations you’d prefer out of more focused channels."}
|
{"This is the start of " + ui_name + ", a channel for conversations you’d prefer out of more focused channels."}
|
||||||
<br/>
|
<br/>
|
||||||
<a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#edit_channel" data-desc={channel.description} data-title={ui_name} data-channelid={channel.id}><i className="fa fa-pencil"></i>Set a description</a>
|
|
||||||
</p>
|
</p>
|
||||||
|
<a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#edit_channel" data-desc={channel.description} data-title={ui_name} data-channelid={channel.id}><i className="fa fa-pencil"></i>Set a description</a>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
var ui_type = channel.type === 'P' ? "private group" : "channel";
|
var ui_type = channel.type === 'P' ? "private group" : "channel";
|
||||||
more_messages = (
|
more_messages = (
|
||||||
<div className="channel-intro">
|
<div className="channel-intro">
|
||||||
<h4 className="channel-intro-title">Welcome</h4>
|
<h4 className="channel-intro__title">Beginning of {ui_name}</h4>
|
||||||
<p>
|
<p className="channel-intro__content">
|
||||||
{ creator_name != "" ? "This is the start of the " + ui_name + " " + ui_type + ", created by " + creator_name + " on " + utils.displayDate(channel.create_at) + "."
|
{ creator_name != "" ? "This is the start of the " + ui_name + " " + ui_type + ", created by " + creator_name + " on " + utils.displayDate(channel.create_at) + "."
|
||||||
: "This is the start of the " + ui_name + " " + ui_type + ", created on "+ utils.displayDate(channel.create_at) + "." }
|
: "This is the start of the " + ui_name + " " + ui_type + ", created on "+ utils.displayDate(channel.create_at) + "." }
|
||||||
{ channel.type === 'P' ? " Only invited members can see this private group." : " Any member can join and read this channel." }
|
{ channel.type === 'P' ? " Only invited members can see this private group." : " Any member can join and read this channel." }
|
||||||
<br/>
|
<br/>
|
||||||
|
</p>
|
||||||
<a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#edit_channel" data-desc={channel.description} data-title={channel.display_name} data-channelid={channel.id}><i className="fa fa-pencil"></i>Set a description</a>
|
<a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#edit_channel" data-desc={channel.description} data-title={channel.display_name} data-channelid={channel.id}><i className="fa fa-pencil"></i>Set a description</a>
|
||||||
<a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#channel_invite"><i className="fa fa-user-plus"></i>Invite others to this {ui_type}</a>
|
<a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#channel_invite"><i className="fa fa-user-plus"></i>Invite others to this {ui_type}</a>
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,14 +44,16 @@
|
|||||||
white-space: normal;
|
white-space: normal;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.channel-intro {
|
.channel-intro {
|
||||||
padding-bottom:5px;
|
padding-bottom:5px;
|
||||||
margin: 0 1em 35px;
|
margin: 0 1em 35px;
|
||||||
|
max-width: 850px;
|
||||||
border-bottom: 1px solid lightgrey;
|
border-bottom: 1px solid lightgrey;
|
||||||
.intro-links {
|
.intro-links {
|
||||||
margin: 0.5em 1.5em 0 0;
|
margin: 0 1.5em 10px 0;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
.fa {
|
.fa {
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
@@ -64,8 +66,15 @@
|
|||||||
.channel-intro-img {
|
.channel-intro-img {
|
||||||
float:left;
|
float:left;
|
||||||
}
|
}
|
||||||
.channel-intro-title {
|
.channel-intro__title {
|
||||||
font-weight:600;
|
font-weight:600;
|
||||||
|
font-size: 20px;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
|
.channel-intro__content {
|
||||||
|
background: #f7f7f7;
|
||||||
|
padding: 10px 15px;
|
||||||
|
@include border-radius(3px);
|
||||||
}
|
}
|
||||||
.channel-intro-text {
|
.channel-intro-text {
|
||||||
margin-top:35px;
|
margin-top:35px;
|
||||||
|
|||||||
@@ -89,6 +89,9 @@
|
|||||||
max-width: 810px;
|
max-width: 810px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.channel-intro {
|
||||||
|
max-width: 810px;
|
||||||
|
}
|
||||||
.date-separator, .new-separator {
|
.date-separator, .new-separator {
|
||||||
&.hovered--comment {
|
&.hovered--comment {
|
||||||
&:before, &:after {
|
&:before, &:after {
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user