deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-01 14:12:54 +02:00
Code Issues Projects Releases Wiki Activity

Switch to Font Awesome 5

Browse source
This commit is contained in:
Jérémie Astori 2017-12-07 23:01:58 -05:00
parent 35e5ff2fc7
commit c28fda6b28
No known key found for this signature in database
GPG key ID: B9A4F245CD67BDE8
5 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
client/css/style.css
View file

@ -1,10 +1,11 @@
@font-face {
/* We use free solid icons - https://fontawesome.com/icons?s=solid&m=free */
font-family: "FontAwesome";
font-weight: normal;
font-style: normal;
src:
url("../fonts/fontawesome-webfont.woff2?v=4.7.0") format("woff2"),
url("../fonts/fontawesome-webfont.woff?v=4.7.0") format("woff");
url("../fonts/fa-solid-900.woff2") format("woff2"),
url("../fonts/fa-solid-900.woff") format("woff");
}
html,
@ -262,7 +263,7 @@ kbd {
#viewport .lt::before { content: "\f0c9"; /* http://fontawesome.io/icon/bars/ */ }
#viewport .rt::before {
content: "\f0c0"; /* http://fontawesome.io/icon/users/ */
content: "\f0c0"; /* https://fontawesome.com/icons/users?style=solid */
line-height: 36px; /* fix alignment in Microsoft Edge */
}
@ -279,20 +280,20 @@ kbd {
.context-menu-action-kick::before { content: "\f05e"; /* http://fontawesome.io/icon/ban/ */ }
.context-menu-network::before,
#chat .lobby .title::before { content: "\f0a0"; /* http://fontawesome.io/icon/hdd-o/ */ }
#chat .lobby .title::before { content: "\f233"; /* https://fontawesome.com/icons/server?style=solid */ }
#sidebar .not-secure-icon::before {
content: "\f09c"; /* https://fontawesome.com/v4.7.0/icon/unlock/ */
}
#sidebar .not-connected-icon::before {
content: "\f127"; /* https://fontawesome.com/v4.7.0/icon/chain-broken/ TODO v5: unlink */
content: "\f127"; /* https://fontawesome.com/icons/unlink?style=solid */
}
.context-menu-query::before,
.context-menu-action-query::before,
#sidebar .chan.query::before,
#chat .query .title::before { content: "\f0e5"; /* http://fontawesome.io/icon/comment-o/ */ }
#chat .query .title::before { content: "\f075"; /* https://fontawesome.com/icons/comment?style=solid */ }
.context-menu-chan::before,
#sidebar .chan.channel::before,
@ -311,7 +312,7 @@ kbd {
#chat .away .from::before,
#chat .back .from::before {
content: "\f017"; /* http://fontawesome.io/icon/clock-o/ */
content: "\f017"; /* https://fontawesome.com/icons/clock?style=solid */
color: #7f8c8d;
}
@ -340,7 +341,7 @@ kbd {
}
#chat .invite .from::before {
content: "\f003"; /* http://fontawesome.io/icon/envelope-o/ */
content: "\f0e0"; /* https://fontawesome.com/icons/envelope?style=solid */
color: #2ecc40;
}
@ -365,7 +366,7 @@ kbd {
#chat .ctcp .from::before,
#chat .ctcp_request .from::before {
content: "\f0f6"; /* http://fontawesome.io/icon/file-text-o/ */
content: "\f15c"; /* https://fontawesome.com/icons/file-alt?style=solid */
}
#chat .whois .from::before {
@ -428,7 +429,7 @@ kbd {
}
#set-nick::before {
content: "\f040"; /* http://fontawesome.io/icon/pencil/ */
content: "\f303"; /* https://fontawesome.com/icons/pencil-alt?style=solid */
}
#submit-nick::before {
@ -1785,7 +1786,7 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
}
#version-checker.loading::before {
content: "\f250"; /* http://fontawesome.io/icon/hourglass-o/ */
content: "\f253"; /* https://fontawesome.com/icons/hourglass-end?style=solid */
}
#version-checker.new-version {
@ -1794,7 +1795,7 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
}
#version-checker.new-version::before {
content: "\f087"; /* http://fontawesome.io/icon/thumbs-o-up/ */
content: "\f164"; /* https://fontawesome.com/icons/thumbs-up?style=solid */
}
#version-checker.error {

2
package.json
View file

@ -65,6 +65,7 @@
"yarn": "1.5.1"
},
"devDependencies": {
"@fortawesome/fontawesome-free-webfonts": "1.0.4",
"babel-core": "6.26.0",
"babel-loader": "7.1.2",
"babel-preset-env": "1.6.1",
@ -73,7 +74,6 @@
"css.escape": "1.5.1",
"emoji-regex": "6.5.1",
"eslint": "4.18.2",
"font-awesome": "4.7.0",
"fuzzy": "0.1.3",
"graphql-request": "1.5.1",
"handlebars": "4.0.11",

4
test/tests/build.js
View file

@ -8,8 +8,8 @@ describe("public folder", function() {
const publicFolder = path.join(__dirname, "..", "..", "public");
it("font awesome files are copied", function() {
expect(fs.existsSync(path.join(publicFolder, "fonts", "fontawesome-webfont.woff"))).to.be.true;
expect(fs.existsSync(path.join(publicFolder, "fonts", "fontawesome-webfont.woff2"))).to.be.true;
expect(fs.existsSync(path.join(publicFolder, "fonts", "fa-solid-900.woff"))).to.be.true;
expect(fs.existsSync(path.join(publicFolder, "fonts", "fa-solid-900.woff2"))).to.be.true;
});
it("index HTML file is not copied", function() {

2
webpack.config.js
View file

@ -63,7 +63,7 @@ const config = {
plugins: [
new CopyPlugin([
{
from: "./node_modules/font-awesome/fonts/fontawesome-webfont.woff*",
from: "./node_modules/@fortawesome/fontawesome-free-webfonts/webfonts/fa-solid-900.woff*",
to: "fonts/[name].[ext]",
},
{

8
yarn.lock
View file

@ -2,6 +2,10 @@
# yarn lockfile v1
"@fortawesome/fontawesome-free-webfonts@1.0.4":
version "1.0.4"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-webfonts/-/fontawesome-free-webfonts-1.0.4.tgz#bac5d89755bf3bc2d2b4deee47d92febf641bb1f"
abbrev@1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@ -2665,10 +2669,6 @@ flush-write-stream@^1.0.0:
inherits "^2.0.1"
readable-stream "^2.0.4"
font-awesome@4.7.0:
version "4.7.0"
resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
for-in@^1.0.1, for-in@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"