deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-02 13:52:17 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2653 from thelounge/xpaw/motd

Browse source 
Use monospace font for MOTD, set an icon, fix new line trimming
This commit is contained in:
Pavel Djundik 2018-07-17 11:07:38 +03:00 committed by GitHub
parent 056a38caeb ee4c8d78d3
commit 91dcb7564b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
client/css/style.css
View file

@ -109,6 +109,7 @@ button {
code,
pre,
#chat .msg.motd .text,
.irc-monospace,
textarea#user-specified-css-input {
font-family: Consolas, Menlo, Monaco, "Lucida Console", "DejaVu Sans Mono", "Courier New", monospace;
@ -248,6 +249,7 @@ kbd {
#chat .quit .from::before,
#chat .topic .from::before,
#chat .mode .from::before,
#chat .motd .from::before,
#chat .ctcp .from::before,
#chat .ctcp_request .from::before,
#chat .whois .from::before,
@ -365,6 +367,10 @@ kbd {
color: #2ecc40;
}
#chat .motd .from::before {
content: "\f02e"; /* https://fontawesome.com/icons/bookmark?style=solid */
}
#chat .ctcp .from::before,
#chat .ctcp_request .from::before {
content: "\f15c"; /* https://fontawesome.com/icons/file-alt?style=solid */
@ -1335,6 +1341,13 @@ background on hover (unless active) */
display: none !important;
}
#chat .msg.motd .text {
background: #f6f6f6;
display: inline-block;
border-radius: 4px;
padding: 6px;
}
#chat .condensed .content,
#chat .away .content,
#chat .back .content,

5
client/js/render.js
View file

@ -112,7 +112,10 @@ function buildChatMessage(msg) {
}
// Remove empty lines around the MOTD (but not within it)
msg.text = lines.join("\n").trim();
msg.text = lines
.map((line) => line.trimEnd())
.join("\n")
.replace(/^[\r\n]+|[\r\n]+$/g, "");
}
const renderedMessage = $(templates[template](msg));

1
client/themes/morning.css
View file

@ -158,6 +158,7 @@
color: #b7c5d1;
}
#chat .msg.motd .text,
code,
.irc-monospace {
background: #28333d;