Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Revert Font Awesome 5 upgrade (#8810)

Browse source 
* Revert "Fix some icon names changed by the Font Awesome 5. (#8796)"

This reverts commit 3f9ec3de82.

* Revert "Migrate to font-awesome 5.0. (#8799)"

This reverts commit 8bae14591b.

* Revert "Fix some icons names, unavailable in fontawesome5 (free license). (#8792)"

This reverts commit b9c727a945.

* Revert "Update the icon name changed by the Font Awesome 5. (#8776)"

This reverts commit 17af4d27da.

* Revert "Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)"

This reverts commit 4b794e134d.
This commit is contained in:
Eugen Rochko 2018-09-28 02:11:14 +02:00 • committed by GitHub
parent 4b78546135
commit 3d7f68c273
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 121 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

42
app/javascript/styles/mastodon/components.scss
View file

@ -675,7 +675,7 @@
&:hover {
text-decoration: underline;
.fas {
.fa {
color: lighten($dark-text-color, 7%);
}
}
@ -690,7 +690,7 @@
}
}
.fas {
.fa {
color: $dark-text-color;
}
}
@ -1132,12 +1132,6 @@
vertical-align: middle;
margin-right: 5px;
}
.bot-icon {
position: absolute;
bottom: -.333em;
left: -.333em;
}
}
a .account__avatar {
@ -1355,22 +1349,10 @@ a .account__avatar {
.account__header__avatar {
background-size: 90px 90px;
display: block;
font-size: 1.5em;
height: 90px;
margin: 0 auto 10px;
position: relative;
overflow: hidden;
width: 90px;
.bot-icon {
color: $dark-text-color;
position: absolute;
bottom: 0;
left: 0;
.light & {
color: $inverted-text-color;
}
}
}
.account-authorize {
@ -1496,7 +1478,7 @@ a.account__display-name {
font-size: 15px;
position: relative;
.fas {
.fa {
color: $highlight-text-color;
}
@ -2044,7 +2026,7 @@ a.account__display-name {
border-bottom: 2px solid lighten($ui-base-color, 8%);
transition: all 50ms linear;
.fas {
.fa {
font-weight: 400;
font-size: 16px;
}
@ -3274,7 +3256,7 @@ a.status-card {
overflow: hidden;
display: flex;
.fas {
.fa {
font-size: 34px;
margin-right: 10px;
}
@ -3491,7 +3473,7 @@ a.status-card {
outline: 0 !important;
}
.fas {
.fa {
position: absolute;
top: 10px;
right: 10px;
@ -3545,7 +3527,7 @@ a.status-card {
font-size: 16px;
cursor: default;
.fas {
.fa {
display: inline-block;
margin-right: 5px;
}
@ -3564,7 +3546,7 @@ a.status-card {
font-size: 16px;
color: $dark-text-color;
.fas {
.fa {
display: inline-block;
margin-right: 5px;
}
@ -4462,7 +4444,7 @@ a.status-card {
justify-content: center;
font-size: 26px;
.fas {
.fa {
display: block;
}
}
@ -4500,7 +4482,7 @@ a.status-card {
display: block;
}
.fas {
.fa {
color: $dark-text-color;
}
}
@ -5447,7 +5429,7 @@ noscript {
font-size: 16px;
cursor: default;
.fas {
.fa {
display: inline-block;
margin-right: 5px;
}