Merge pull request #2848 from ONLYOFFICE/bugfix/fix-bugs

Bugfix/fix bugs
This commit is contained in:
Maxim Kadushkin
2024-02-16 17:29:11 +03:00
committed by GitHub
4 changed files with 32 additions and 19 deletions

View File

@ -476,7 +476,7 @@
line-height: 18px;
right: 26px;
color: @text-tertiary;
top: 5px;
top: 4.5px;
z-index: 100;
}
}

View File

@ -1,9 +1,16 @@
[dir="rtl"].device-android {
.app-layout {
.searchbar input {
padding-right: 24px;
padding-left: 36px;
background-position: right;
.searchbar {
input {
padding-right: 24px;
padding-left: 36px;
background-position: right;
}
.number-search-results {
right: auto;
left: 26px;
}
}
}
@ -47,6 +54,11 @@
}
}
.searchbar .number-search-results {
right: auto;
left: 26px;
}
.popover {
li:last-child, li:first-child {
.segmented a:first-child {

View File

@ -241,7 +241,6 @@ class MainController extends Component {
const { t } = this.props;
const appOptions = this.props.storeAppOptions;
const isForm = appOptions.isForm;
const isOForm = appOptions.isOForm;
const appSettings = this.props.storeApplicationSettings;
@ -276,7 +275,7 @@ class MainController extends Component {
value = LocalStorage.getBool('mobile-view', true);
if(value && !isForm) {
if(value) {
this.api.ChangeReaderMode();
} else {
appOptions.changeMobileView();

View File

@ -37,7 +37,7 @@ const PageApplicationSettings = props => {
<Page>
<Navbar title={_t.textApplicationSettings} backLink={_t.textBack} />
{_isEdit && !isViewer &&
<Fragment>
<>
<BlockTitle>{_t.textUnitOfMeasurement}</BlockTitle>
<List>
<ListItem radio radioIcon="end" title={_t.textCentimeter} name="unit-of-measurement" checked={unitMeasurement === 0}
@ -47,16 +47,6 @@ const PageApplicationSettings = props => {
<ListItem radio radioIcon="end" title={_t.textInch} name="unit-of-measurement" checked={unitMeasurement === 2}
onChange={() => changeMeasureSettings(2)}></ListItem>
</List>
<List>
<ListItem title={_t.textSpellcheck}>
<Toggle checked={isSpellChecking}
onToggleChange={() => {
storeApplicationSettings.changeSpellCheck(!isSpellChecking);
props.switchSpellCheck(!isSpellChecking);
}}
/>
</ListItem>
</List>
<List>
<ListItem title={_t.textNoCharacters} disabled={displayMode !== 'markup'}>{/*ToDo: if (DisplayMode == "final" || DisplayMode == "original") {disabled} */}
<Toggle checked={isNonprintingCharacters}
@ -75,7 +65,19 @@ const PageApplicationSettings = props => {
/>
</ListItem>
</List>
</Fragment>
</>
}
{_isEdit &&
<List>
<ListItem title={_t.textSpellcheck}>
<Toggle checked={isSpellChecking}
onToggleChange={() => {
storeApplicationSettings.changeSpellCheck(!isSpellChecking);
props.switchSpellCheck(!isSpellChecking);
}}
/>
</ListItem>
</List>
}
<BlockTitle>{_t.textCommentsDisplay}</BlockTitle>
<List>