Skip to content

Commit 615879f

Browse files
ara4nara4n
committed
skin to match CSS (spacing will need to be fixed once matthew/ordered-roomlist lands)
1 parent 3a8c263 commit 615879f

3 files changed

Lines changed: 24 additions & 23 deletions

File tree

‎src/skins/vector/css/molecules/EventTile.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ limitations under the License.
7878
}
7979

8080
.mx_EventTile_notSent {
81-
color: #f11;
81+
color: #ddd;
8282
}
8383

8484
.mx_EventTile_highlight {

‎src/skins/vector/css/organisms/RoomView.css‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,14 @@ limitations under the License.
158158
order: 4;
159159

160160
width: 100%;
161-
-webkit-flex: 0 0 36px;
162-
flex: 0 0 36px;
161+
-webkit-flex: 0 0 auto;
162+
flex: 0 0 auto;
163163
}
164164

165165
.mx_RoomView_statusAreaBox {
166166
max-width: 960px;
167167
margin: auto;
168+
min-height: 36px;
168169
}
169170

170171
.mx_RoomView_statusAreaBox_line {
@@ -186,7 +187,8 @@ limitations under the License.
186187
}
187188

188189
.mx_RoomView_connectionLostBar {
189-
margin-top: 5px;
190+
margin-top: 19px;
191+
height: 58px;
190192
}
191193

192194
.mx_RoomView_connectionLostBar img {
@@ -196,20 +198,19 @@ limitations under the License.
196198
float: left;
197199
}
198200

199-
.mx_RoomView_connectionLostBar_textArea {
200-
float: left;
201-
}
202-
203201
.mx_RoomView_connectionLostBar_title {
204-
color: #f00;
202+
color: #ff0064;
205203
}
206204

207205
.mx_RoomView_connectionLostBar_desc {
208-
color: #ddd;
209-
font-size: 12px;
206+
color: #454545;
207+
font-size: 14px;
208+
opacity: 0.5;
210209
}
211210

212211
.mx_RoomView_resend_link {
212+
color: #454545 ! important;
213+
text-decoration: underline ! important;
213214
cursor: pointer;
214215
}
215216

‎src/skins/vector/views/organisms/RoomView.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,13 @@ module.exports = React.createClass({
204204
if (this.state.syncState === "ERROR") {
205205
statusBar = (
206206
<div className="mx_RoomView_connectionLostBar">
207-
<img src="img/cancel.png" width="10" height="12" alt=""/>
207+
<img src="img/warning2.png" width="30" height="30" alt="/!\"/>
208208
<div className="mx_RoomView_connectionLostBar_textArea">
209-
<span className="mx_RoomView_connectionLostBar_title">
210-
Internet connection has been lost.
211-
</span>
209+
<div className="mx_RoomView_connectionLostBar_title">
210+
Connectivity to the server has been lost.
211+
</div>
212212
<div className="mx_RoomView_connectionLostBar_desc">
213-
Sent messages will be stored until your connection has resumed.
213+
Sent messages will be stored until your connection has returned.
214214
</div>
215215
</div>
216216
</div>
@@ -219,16 +219,16 @@ module.exports = React.createClass({
219219
else if (this.state.hasUnsentMessages) {
220220
statusBar = (
221221
<div className="mx_RoomView_connectionLostBar">
222-
<img src="img/cancel.png" width="10" height="12" alt=""/>
222+
<img src="img/warning2.png" width="30" height="30" alt="/!\"/>
223223
<div className="mx_RoomView_connectionLostBar_textArea">
224-
<span className="mx_RoomView_connectionLostBar_title">
225-
Some of your messages have not been sent.
226-
</span>
224+
<div className="mx_RoomView_connectionLostBar_title">
225+
Some of your messages have not been sent.
226+
</div>
227227
<div className="mx_RoomView_connectionLostBar_desc">
228-
<span className="mx_RoomView_resend_link"
229-
onClick={ this.onResendAllClick } >
228+
<a className="mx_RoomView_resend_link"
229+
onClick={ this.onResendAllClick }>
230230
Resend all now
231-
</span> or select individual messages to re-send.
231+
</a> or select individual messages to re-send.
232232
</div>
233233
</div>
234234
</div>

0 commit comments

Comments
 (0)