浏览代码

Fix layout for RTL (#6014)

master
Eugen Rochko 6 年前
committed by GitHub
父节点
当前提交
cc75d47926
找不到此签名对应的密钥 GPG 密钥 ID: 4AEE18F83AFDEB23
共有 2 个文件被更改,包括 23 次插入8 次删除
  1. +4
    -1
      app/javascript/mastodon/features/ui/components/columns_area.js
  2. +19
    -7
      app/javascript/styles/mastodon/rtl.scss

+ 4
- 1
app/javascript/mastodon/features/ui/components/columns_area.js 查看文件

@@ -27,6 +27,8 @@ const componentMap = {
'LIST': ListTimeline,
};

const isRtlLayout = document.getElementsByTagName('body')[0].classList.contains('rtl');

@component => injectIntl(component, { withRef: true })
export default class ColumnsArea extends ImmutablePureComponent {

@@ -79,7 +81,8 @@ export default class ColumnsArea extends ImmutablePureComponent {

handleChildrenContentChange() {
if (!this.props.singleColumn) {
this._interruptScrollAnimation = scrollRight(this.node, this.node.scrollWidth - window.innerWidth);
const modifier = isRtlLayout ? -1 : 1;
this._interruptScrollAnimation = scrollRight(this.node, (this.node.scrollWidth - window.innerWidth) * modifier);
}
}



+ 19
- 7
app/javascript/styles/mastodon/rtl.scss 查看文件

@@ -7,9 +7,9 @@ body.rtl {
margin-left: 5px;
}

.character-counter__wrapper {
margin-right: 8px;
margin-left: 16px;
.compose-form .compose-form__buttons-wrapper .character-counter__wrapper {
margin-right: 0;
margin-left: 4px;
}

.navigation-bar__profile {
@@ -30,6 +30,22 @@ body.rtl {
.column-header__buttons {
left: 0;
right: auto;
margin-left: -15px;
margin-right: 0;
}

.column-inline-form .icon-button {
margin-left: 0;
margin-right: 5px;
}

.column-header__links .text-btn {
margin-left: 10px;
margin-right: 0;
}

.account__avatar-wrapper {
float: right;
}

.column-header__back-button {
@@ -41,10 +57,6 @@ body.rtl {
float: left;
}

.compose-form__modifiers {
border-radius: 0 0 0 4px;
}

.setting-toggle {
margin-left: 0;
margin-right: 8px;


正在加载...
取消
保存