From 615879ffddde97b3d3aa4343ebffaa8686f4f8fd Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 9 Nov 2015 00:13:25 +0000
Subject: [PATCH] skin to match CSS (spacing will need to be fixed once
matthew/ordered-roomlist lands)
---
src/skins/vector/css/molecules/EventTile.css | 2 +-
src/skins/vector/css/organisms/RoomView.css | 21 +++++++++--------
src/skins/vector/views/organisms/RoomView.js | 24 ++++++++++----------
3 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/src/skins/vector/css/molecules/EventTile.css b/src/skins/vector/css/molecules/EventTile.css
index eb59711e..f9c8551b 100644
--- a/src/skins/vector/css/molecules/EventTile.css
+++ b/src/skins/vector/css/molecules/EventTile.css
@@ -78,7 +78,7 @@ limitations under the License.
}
.mx_EventTile_notSent {
- color: #f11;
+ color: #ddd;
}
.mx_EventTile_highlight {
diff --git a/src/skins/vector/css/organisms/RoomView.css b/src/skins/vector/css/organisms/RoomView.css
index 0379a2aa..508e3457 100644
--- a/src/skins/vector/css/organisms/RoomView.css
+++ b/src/skins/vector/css/organisms/RoomView.css
@@ -158,13 +158,14 @@ limitations under the License.
order: 4;
width: 100%;
- -webkit-flex: 0 0 36px;
- flex: 0 0 36px;
+ -webkit-flex: 0 0 auto;
+ flex: 0 0 auto;
}
.mx_RoomView_statusAreaBox {
max-width: 960px;
margin: auto;
+ min-height: 36px;
}
.mx_RoomView_statusAreaBox_line {
@@ -186,7 +187,8 @@ limitations under the License.
}
.mx_RoomView_connectionLostBar {
- margin-top: 5px;
+ margin-top: 19px;
+ height: 58px;
}
.mx_RoomView_connectionLostBar img {
@@ -196,20 +198,19 @@ limitations under the License.
float: left;
}
-.mx_RoomView_connectionLostBar_textArea {
- float: left;
-}
-
.mx_RoomView_connectionLostBar_title {
- color: #f00;
+ color: #ff0064;
}
.mx_RoomView_connectionLostBar_desc {
- color: #ddd;
- font-size: 12px;
+ color: #454545;
+ font-size: 14px;
+ opacity: 0.5;
}
.mx_RoomView_resend_link {
+ color: #454545 ! important;
+ text-decoration: underline ! important;
cursor: pointer;
}
diff --git a/src/skins/vector/views/organisms/RoomView.js b/src/skins/vector/views/organisms/RoomView.js
index 1eda7b7f..c07a890c 100644
--- a/src/skins/vector/views/organisms/RoomView.js
+++ b/src/skins/vector/views/organisms/RoomView.js
@@ -204,13 +204,13 @@ module.exports = React.createClass({
if (this.state.syncState === "ERROR") {
statusBar = (
<div className="mx_RoomView_connectionLostBar">
- <img src="img/cancel.png" width="10" height="12" alt=""/>
+ <img src="img/warning2.png" width="30" height="30" alt="/!\"/>
<div className="mx_RoomView_connectionLostBar_textArea">
- <span className="mx_RoomView_connectionLostBar_title">
- Internet connection has been lost.
- </span>
+ <div className="mx_RoomView_connectionLostBar_title">
+ Connectivity to the server has been lost.
+ </div>
<div className="mx_RoomView_connectionLostBar_desc">
- Sent messages will be stored until your connection has resumed.
+ Sent messages will be stored until your connection has returned.
</div>
</div>
</div>
@@ -219,16 +219,16 @@ module.exports = React.createClass({
else if (this.state.hasUnsentMessages) {
statusBar = (
<div className="mx_RoomView_connectionLostBar">
- <img src="img/cancel.png" width="10" height="12" alt=""/>
+ <img src="img/warning2.png" width="30" height="30" alt="/!\"/>
<div className="mx_RoomView_connectionLostBar_textArea">
- <span className="mx_RoomView_connectionLostBar_title">
- Some of your messages have not been sent.
- </span>
+ <div className="mx_RoomView_connectionLostBar_title">
+ Some of your messages have not been sent.
+ </div>
<div className="mx_RoomView_connectionLostBar_desc">
- <span className="mx_RoomView_resend_link"
- onClick={ this.onResendAllClick } >
+ <a className="mx_RoomView_resend_link"
+ onClick={ this.onResendAllClick }>
Resend all now
- </span> or select individual messages to re-send.
+ </a> or select individual messages to re-send.
</div>
</div>
</div>