mirror of
https://github.com/kikobar/mastodon.git
synced 2024-11-18 13:17:35 +00:00
Fix various regressions (#2466)
This commit is contained in:
parent
d97a0525aa
commit
fdcb55a0a6
|
@ -47,6 +47,7 @@ import en from 'react-intl/locale-data/en';
|
|||
import de from 'react-intl/locale-data/de';
|
||||
import eo from 'react-intl/locale-data/eo';
|
||||
import es from 'react-intl/locale-data/es';
|
||||
import fa from 'react-intl/locale-data/fa';
|
||||
import fi from 'react-intl/locale-data/fi';
|
||||
import fr from 'react-intl/locale-data/fr';
|
||||
import hu from 'react-intl/locale-data/hu';
|
||||
|
@ -81,6 +82,7 @@ addLocaleData([
|
|||
...de,
|
||||
...eo,
|
||||
...es,
|
||||
...fa,
|
||||
...fi,
|
||||
...fr,
|
||||
...hu,
|
||||
|
|
|
@ -1,13 +1,3 @@
|
|||
/**
|
||||
* Note for Contributors:
|
||||
* This file (en.jsx) serve as a template for other languages.
|
||||
* To make other contributors' life easier, please REMEMBER:
|
||||
* 1. to add your new string here; and
|
||||
* 2. to remove old strings that are no longer needed; and
|
||||
* 3. to sort the strings by the key.
|
||||
* 4. To rename the `en` const name and export default name to match your locale.
|
||||
* Thanks!
|
||||
*/
|
||||
const fa = {
|
||||
"account.block": "@{name} را مسدود کن",
|
||||
"account.disclaimer": "این کاربر عضو سرور متفاوتی است. شاید عدد واقعی بیشتر از این باشد.",
|
||||
|
|
|
@ -1,6 +1,3 @@
|
|||
/**
|
||||
hrvatski jezik
|
||||
*/
|
||||
const hr = {
|
||||
"account.block": "Blokiraj @{name}",
|
||||
"account.disclaimer": "Ovaj korisnik je sa druge instance. Ovaj broj bi mogao biti veći.",
|
||||
|
|
|
@ -1202,6 +1202,13 @@ a.status__content__spoiler-link {
|
|||
padding-right: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.columns-area > div {
|
||||
.column, .drawer {
|
||||
padding-left: 5px;
|
||||
padding-right: 5px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (min-width: 2560px) {
|
||||
|
@ -1537,9 +1544,13 @@ a.status__content__spoiler-link {
|
|||
}
|
||||
|
||||
.column-subheading {
|
||||
background: lighten($color1, 20%);
|
||||
background: $color1;
|
||||
color: lighten($color1, 26%);
|
||||
padding: 8px 20px;
|
||||
font-size: 16px;
|
||||
font-size: 12px;
|
||||
font-weight: 500;
|
||||
text-transform: uppercase;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
.autosuggest-textarea,
|
||||
|
|
|
@ -33,7 +33,7 @@ body.rtl {
|
|||
|
||||
.column-icon {
|
||||
right: auto;
|
||||
left: 0;
|
||||
left: 5px;
|
||||
}
|
||||
|
||||
.setting-toggle {
|
||||
|
@ -125,5 +125,12 @@ body.rtl {
|
|||
padding-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.columns-area > div {
|
||||
.column, .drawer {
|
||||
padding-left: 5px;
|
||||
padding-right: 5px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue