diff options
author | Naoki Kosaka <n.k@mail.yukimochi.net> | 2018-09-28 00:08:56 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-09-27 17:08:56 +0200 |
commit | 8bae14591bfb4fc9dd9d89d8082ac0123b03edaa (patch) | |
tree | 071a288aaf540a58961db25695f930f5afe40469 /app/javascript/styles | |
parent | 15fc2b76f95bc3c83ce3f5ee0a8142cde5fa6b0b (diff) |
Migrate to font-awesome 5.0. (#8799)
Diffstat (limited to 'app/javascript/styles')
-rw-r--r-- | app/javascript/styles/mastodon/about.scss | 2 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/accounts.scss | 4 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/admin.scss | 2 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/components.scss | 22 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/forms.scss | 2 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/rtl.scss | 6 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/tables.scss | 2 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/widgets.scss | 2 |
8 files changed, 21 insertions, 21 deletions
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss index dc456be3e..06a5f83d1 100644 --- a/app/javascript/styles/mastodon/about.scss +++ b/app/javascript/styles/mastodon/about.scss @@ -1113,7 +1113,7 @@ $small-breakpoint: 960px; align-items: center; margin-left: 15px; - .fa { + .fas { display: block; color: $darker-text-color; font-size: 48px; diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss index 06effbdb2..830c64d50 100644 --- a/app/javascript/styles/mastodon/accounts.scss +++ b/app/javascript/styles/mastodon/accounts.scss @@ -136,7 +136,7 @@ float: left; padding-left: 0; - .fa { + .fas { display: inline-block; margin-right: 5px; } @@ -146,7 +146,7 @@ float: right; padding-right: 0; - .fa { + .fas { display: inline-block; margin-left: 5px; } diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index b6c771abf..1ae4aa1fe 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -50,7 +50,7 @@ $no-columns-breakpoint: 600px; transition: all 200ms linear; border-radius: 4px 0 0 4px; - i.fa { + i.fas { margin-right: 5px; } diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index c57f99fea..dd440d16f 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -675,7 +675,7 @@ &:hover { text-decoration: underline; - .fa { + .fas { color: lighten($dark-text-color, 7%); } } @@ -690,7 +690,7 @@ } } - .fa { + .fas { color: $dark-text-color; } } @@ -1496,7 +1496,7 @@ a.account__display-name { font-size: 15px; position: relative; - .fa { + .fas { color: $highlight-text-color; } @@ -2044,7 +2044,7 @@ a.account__display-name { border-bottom: 2px solid lighten($ui-base-color, 8%); transition: all 50ms linear; - .fa { + .fas { font-weight: 400; font-size: 16px; } @@ -3274,7 +3274,7 @@ a.status-card { overflow: hidden; display: flex; - .fa { + .fas { font-size: 34px; margin-right: 10px; } @@ -3491,7 +3491,7 @@ a.status-card { outline: 0 !important; } - .fa { + .fas { position: absolute; top: 10px; right: 10px; @@ -3545,7 +3545,7 @@ a.status-card { font-size: 16px; cursor: default; - .fa { + .fas { display: inline-block; margin-right: 5px; } @@ -3564,7 +3564,7 @@ a.status-card { font-size: 16px; color: $dark-text-color; - .fa { + .fas { display: inline-block; margin-right: 5px; } @@ -4462,7 +4462,7 @@ a.status-card { justify-content: center; font-size: 26px; - .fa { + .fas { display: block; } } @@ -4500,7 +4500,7 @@ a.status-card { display: block; } - .fa { + .fas { color: $dark-text-color; } } @@ -5447,7 +5447,7 @@ noscript { font-size: 16px; cursor: default; - .fa { + .fas { display: inline-block; margin-right: 5px; } diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss index be2bf7cea..c829023ee 100644 --- a/app/javascript/styles/mastodon/forms.scss +++ b/app/javascript/styles/mastodon/forms.scss @@ -656,7 +656,7 @@ code { } } - .fa { + .fas { font-weight: 400; } } diff --git a/app/javascript/styles/mastodon/rtl.scss b/app/javascript/styles/mastodon/rtl.scss index 11588d47f..16d09fa41 100644 --- a/app/javascript/styles/mastodon/rtl.scss +++ b/app/javascript/styles/mastodon/rtl.scss @@ -38,7 +38,7 @@ body.rtl { padding-left: 30px; } - .search__icon .fa { + .search__icon .fas { right: auto; left: 10px; } @@ -197,7 +197,7 @@ body.rtl { } .admin-wrapper .sidebar ul a i.fa, - a.table-action-link i.fa { + a.table-action-link i.fas { margin-right: 0; margin-left: 5px; } @@ -264,7 +264,7 @@ body.rtl { left: 0; } - .landing-page .fa-external-link { + .landing-page .fa-external-link-alt { padding-right: 5px; padding-left: 0 !important; } diff --git a/app/javascript/styles/mastodon/tables.scss b/app/javascript/styles/mastodon/tables.scss index adb75afe5..73195ac0a 100644 --- a/app/javascript/styles/mastodon/tables.scss +++ b/app/javascript/styles/mastodon/tables.scss @@ -112,7 +112,7 @@ a.table-action-link { color: $primary-text-color; } - i.fa { + i.fas { font-weight: 400; margin-right: 5px; } diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss index f843f0b42..8267c3f4b 100644 --- a/app/javascript/styles/mastodon/widgets.scss +++ b/app/javascript/styles/mastodon/widgets.scss @@ -196,7 +196,7 @@ &__message { margin-bottom: 15px; - .fa { + .fas { margin-right: 5px; color: $darker-text-color; } |