Merge pull request #1980 from ONLYOFFICE/feature/fix-bugs
Feature/fix bugs
This commit is contained in:
commit
8b052cef5a
|
@ -116,7 +116,12 @@ class SearchView extends Component {
|
||||||
expandable: true,
|
expandable: true,
|
||||||
backdrop: false,
|
backdrop: false,
|
||||||
on: {
|
on: {
|
||||||
search: (bar, curval, prevval) => {
|
search: (sb, query, previousQuery) => {
|
||||||
|
const api = Common.EditorApi.get();
|
||||||
|
|
||||||
|
if(!query) {
|
||||||
|
api.asc_selectSearchingResults(false);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -1088,16 +1088,6 @@ input[type="number"]::-webkit-inner-spin-button {
|
||||||
border: 0.5px solid @background-menu-divider;
|
border: 0.5px solid @background-menu-divider;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Navigation list
|
|
||||||
|
|
||||||
.list.navigation-list {
|
|
||||||
overflow-y: auto;
|
|
||||||
height: 265px;
|
|
||||||
.item-title {
|
|
||||||
color: @text-normal;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sharing Settings
|
// Sharing Settings
|
||||||
.sharing-placeholder {
|
.sharing-placeholder {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
|
|
@ -219,18 +219,37 @@
|
||||||
|
|
||||||
.sheet-modal.navigation-sheet {
|
.sheet-modal.navigation-sheet {
|
||||||
box-shadow: 0px -2px 20px rgba(0, 0, 0, 0.2);
|
box-shadow: 0px -2px 20px rgba(0, 0, 0, 0.2);
|
||||||
overflow: hidden;
|
|
||||||
.sheet-modal-inner {
|
.sheet-modal-inner {
|
||||||
background: @background-tertiary;
|
background: @background-tertiary;
|
||||||
overflow: hidden;
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
.swipe-container {
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
width: 100%;
|
||||||
|
z-index: 1000;
|
||||||
}
|
}
|
||||||
&.sheet-modal-bottom:before, &.sheet-modal:not(.sheet-modal-top):before {
|
&.sheet-modal-bottom:before, &.sheet-modal:not(.sheet-modal-top):before {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.navigation-list {
|
.list.navigation-list {
|
||||||
margin: 0;
|
margin-top: 72px;
|
||||||
|
.item-title {
|
||||||
|
color: @text-normal;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.navigation-sheet {
|
||||||
|
&__title {
|
||||||
|
position: fixed;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
z-index: 100;
|
||||||
|
top: 40px;
|
||||||
|
z-index: 1000;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Picker
|
// Picker
|
||||||
|
|
|
@ -207,7 +207,7 @@ const EditParagraph = props => {
|
||||||
onStyleMenuDelete: props.onStyleMenuDelete
|
onStyleMenuDelete: props.onStyleMenuDelete
|
||||||
}}>
|
}}>
|
||||||
{curStyle &&
|
{curStyle &&
|
||||||
<div slot="inner" style={{backgroundImage: 'url(' + curStyle.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: 'contain', backgroundRepeat: 'no-repeat'}}></div>
|
<div slot="inner" style={{backgroundImage: 'url(' + curStyle.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: 'contain', backgroundRepeat: 'no-repeat', backgroundColor: '#fff'}}></div>
|
||||||
}
|
}
|
||||||
</ListItem>
|
</ListItem>
|
||||||
</List>
|
</List>
|
||||||
|
@ -278,7 +278,7 @@ const EditParagraphStyle = props => {
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<div slot="inner"
|
<div slot="inner"
|
||||||
style={{backgroundImage: 'url(' + style.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: 'contain', backgroundRepeat: 'no-repeat'}}
|
style={{backgroundImage: 'url(' + style.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: 'contain', backgroundRepeat: 'no-repeat', backgroundColor: '#fff'}}
|
||||||
></div>
|
></div>
|
||||||
{!api.asc_IsStyleDefault(style.name) && (
|
{!api.asc_IsStyleDefault(style.name) && (
|
||||||
<div slot="inner-end">
|
<div slot="inner-end">
|
||||||
|
@ -369,7 +369,7 @@ const ChangeNextParagraphStyle = props => {
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<div slot="inner"
|
<div slot="inner"
|
||||||
style={{backgroundImage: 'url(' + style.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: 'contain', backgroundRepeat: 'no-repeat'}}
|
style={{backgroundImage: 'url(' + style.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: 'contain', backgroundRepeat: 'no-repeat', backgroundColor: '#fff'}}
|
||||||
></div>
|
></div>
|
||||||
</ListItem>
|
</ListItem>
|
||||||
))}
|
))}
|
||||||
|
|
|
@ -29,7 +29,7 @@ const NavigationPopover = inject('storeNavigation')(observer(props => {
|
||||||
<p className="empty-screens__text">{t('Settings.textEmptyScreens')}</p>
|
<p className="empty-screens__text">{t('Settings.textEmptyScreens')}</p>
|
||||||
</div>
|
</div>
|
||||||
:
|
:
|
||||||
<List className="navigation-list">
|
<List className="navigation-list" style={!Device.phone ? { height: '352px', marginTop: 0 } : null}>
|
||||||
{arrHeaders.map((header, index) => {
|
{arrHeaders.map((header, index) => {
|
||||||
return (
|
return (
|
||||||
<ListItem radio key={index} title={header.isEmptyItem ? t('Settings.textBeginningDocument') : header.name} checked={header.index === currentPosition} style={{paddingLeft: header.level * 16}} onClick={() => {
|
<ListItem radio key={index} title={header.isEmptyItem ? t('Settings.textBeginningDocument') : header.name} checked={header.index === currentPosition} style={{paddingLeft: header.level * 16}} onClick={() => {
|
||||||
|
|
Loading…
Reference in a new issue