forked from matrix/element-web
Split up CSS; use .catch instead of .then
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
parent
078ee54edf
commit
2d153a72c1
|
@ -135,7 +135,7 @@ module.exports = React.createClass({
|
||||||
|
|
||||||
onPinClick: function() {
|
onPinClick: function() {
|
||||||
MatrixClientPeg.get().getStateEvent(this.props.mxEvent.getRoomId(), 'm.room.pinned_events', '')
|
MatrixClientPeg.get().getStateEvent(this.props.mxEvent.getRoomId(), 'm.room.pinned_events', '')
|
||||||
.then(null, e => {
|
.catch(e => {
|
||||||
// Intercept the Event Not Found error and fall through the promise chain with no event.
|
// Intercept the Event Not Found error and fall through the promise chain with no event.
|
||||||
if (e.errcode === "M_NOT_FOUND") return null;
|
if (e.errcode === "M_NOT_FOUND") return null;
|
||||||
throw e;
|
throw e;
|
||||||
|
|
|
@ -65,6 +65,7 @@
|
||||||
@import "./matrix-react-sdk/views/voip/_IncomingCallbox.scss";
|
@import "./matrix-react-sdk/views/voip/_IncomingCallbox.scss";
|
||||||
@import "./matrix-react-sdk/views/voip/_VideoView.scss";
|
@import "./matrix-react-sdk/views/voip/_VideoView.scss";
|
||||||
@import "./matrix-react-sdk/views/rooms/_PinnedEventsPanel.scss";
|
@import "./matrix-react-sdk/views/rooms/_PinnedEventsPanel.scss";
|
||||||
|
@import "./matrix-react-sdk/views/rooms/_PinnedEventTile.scss";
|
||||||
@import "./vector-web/_fonts.scss";
|
@import "./vector-web/_fonts.scss";
|
||||||
@import "./vector-web/structures/_CompatibilityPage.scss";
|
@import "./vector-web/structures/_CompatibilityPage.scss";
|
||||||
@import "./vector-web/structures/_HomePage.scss";
|
@import "./vector-web/structures/_HomePage.scss";
|
||||||
|
|
|
@ -0,0 +1,67 @@
|
||||||
|
/*
|
||||||
|
Copyright 2017 Travis Ralston
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
.mx_PinnedEventTile {
|
||||||
|
min-height: 40px;
|
||||||
|
margin-bottom: 5px;
|
||||||
|
width: 100%;
|
||||||
|
border-radius: 5px; // for the hover
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_PinnedEventTile:hover {
|
||||||
|
background-color: $event-selected-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_PinnedEventTile .mx_PinnedEventTile_sender {
|
||||||
|
color: #868686;
|
||||||
|
font-size: 0.8em;
|
||||||
|
vertical-align: top;
|
||||||
|
display: block;
|
||||||
|
padding-bottom: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_PinnedEventTile .mx_EventTile_content {
|
||||||
|
margin-left: 50px;
|
||||||
|
position: relative;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_PinnedEventTile .mx_BaseAvatar {
|
||||||
|
float: left;
|
||||||
|
margin-right: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_PinnedEventTile:hover .mx_PinnedEventTile_actions {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_PinnedEventTile_actions {
|
||||||
|
float: right;
|
||||||
|
margin-right: 10px;
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_PinnedEventTile_unpinButton {
|
||||||
|
display: inline-block;
|
||||||
|
cursor: pointer;
|
||||||
|
margin-left: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_PinnedEventTile_gotoButton {
|
||||||
|
display: inline-block;
|
||||||
|
font-size: 0.8em;
|
||||||
|
}
|
|
@ -30,59 +30,8 @@ limitations under the License.
|
||||||
padding-bottom: 15px;
|
padding-bottom: 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_PinnedEventTile {
|
|
||||||
min-height: 40px;
|
|
||||||
margin-bottom: 5px;
|
|
||||||
width: 100%;
|
|
||||||
border-radius: 5px; // for the hover
|
|
||||||
}
|
|
||||||
|
|
||||||
.mx_PinnedEventTile:hover {
|
|
||||||
background-color: $event-selected-color;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mx_PinnedEventTile .mx_PinnedEventTile_sender {
|
|
||||||
color: #868686;
|
|
||||||
font-size: 0.8em;
|
|
||||||
vertical-align: top;
|
|
||||||
display: block;
|
|
||||||
padding-bottom: 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mx_PinnedEventTile .mx_EventTile_content {
|
|
||||||
margin-left: 50px;
|
|
||||||
position: relative;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mx_PinnedEventTile .mx_BaseAvatar {
|
|
||||||
float: left;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mx_PinnedEventsPanel_cancel {
|
.mx_PinnedEventsPanel_cancel {
|
||||||
margin: 12px;
|
margin: 12px;
|
||||||
float: right;
|
float: right;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_PinnedEventTile:hover .mx_PinnedEventTile_actions {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mx_PinnedEventTile_actions {
|
|
||||||
float: right;
|
|
||||||
margin-right: 10px;
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mx_PinnedEventTile_unpinButton {
|
|
||||||
cursor: pointer;
|
|
||||||
margin-left: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mx_PinnedEventTile_gotoButton {
|
|
||||||
display: inline-block;
|
|
||||||
font-size: 0.8em;
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue