mirror of
https://bitbucket.org/wisemapping/wisemapping-frontend.git
synced 2024-11-11 01:43:23 +01:00
Revert "Resolve bootstrap CSS conflict."
This reverts commit 477a58628d
.
This commit is contained in:
parent
091a80449d
commit
e0770ef809
16
packages/editor/src/bootstrap-fixes.css
vendored
16
packages/editor/src/bootstrap-fixes.css
vendored
@ -1,16 +0,0 @@
|
|||||||
/*
|
|
||||||
These are patches or hacks to avoid boostrap interfering with Mui styles
|
|
||||||
This file is meant to be removed when removing bootstrap
|
|
||||||
*/
|
|
||||||
/*
|
|
||||||
/* bootstrap modal */
|
|
||||||
|
|
||||||
.modal-backdrop {
|
|
||||||
position: fixed;
|
|
||||||
left: 0;
|
|
||||||
top: 0;
|
|
||||||
width: 100vw;
|
|
||||||
height: 100vh;
|
|
||||||
background: rgba(0,0,0,0.5);
|
|
||||||
z-index: 1000;
|
|
||||||
}
|
|
10
packages/editor/src/bootstrap-prefix.min.css
vendored
10
packages/editor/src/bootstrap-prefix.min.css
vendored
File diff suppressed because one or more lines are too long
7
packages/editor/src/bootstrap.min.css
vendored
Normal file
7
packages/editor/src/bootstrap.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -42,7 +42,7 @@ export default function Toolbar({
|
|||||||
}: ToolbarPropsType): React.ReactElement {
|
}: ToolbarPropsType): React.ReactElement {
|
||||||
const intl = useIntl();
|
const intl = useIntl();
|
||||||
return (
|
return (
|
||||||
<HeaderContainer className="wise-editor">
|
<HeaderContainer>
|
||||||
<div id="toolbar">
|
<div id="toolbar">
|
||||||
<div id="backToList">
|
<div id="backToList">
|
||||||
<img src={BackIconSvg} />
|
<img src={BackIconSvg} />
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
/********************************************************************************/
|
/********************************************************************************/
|
||||||
/* Header & Toolbar Styles */
|
/* Header & Toolbar Styles */
|
||||||
/********************************************************************************/
|
/********************************************************************************/
|
||||||
@import "bootstrap-prefix.min.css";
|
@import "bootstrap.min.css";
|
||||||
@import "bootstrap-fixes.css";
|
|
||||||
|
|
||||||
html {
|
html {
|
||||||
/* avoid bootstrap overriding font-size and breaking Mui */
|
/* avoid bootstrap overriding font-size and breaking Mui */
|
||||||
@ -130,7 +129,7 @@ div.shareModalDialog {
|
|||||||
background-color: #efefef;
|
background-color: #efefef;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wise-editor .popover {
|
.popover {
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
max-width: none;
|
max-width: none;
|
||||||
}
|
}
|
||||||
|
@ -108,7 +108,7 @@ const Editor = ({
|
|||||||
isTryMode={options.mode === 'showcase'}
|
isTryMode={options.mode === 'showcase'}
|
||||||
onAction={onAction}
|
onAction={onAction}
|
||||||
/>
|
/>
|
||||||
<div id="mindplot" className="wise-editor"></div>
|
<div id="mindplot"></div>
|
||||||
<Footer showTryPanel={options.mode === 'showcase'} />
|
<Footer showTryPanel={options.mode === 'showcase'} />
|
||||||
</IntlProvider>
|
</IntlProvider>
|
||||||
);
|
);
|
||||||
|
@ -55,6 +55,7 @@ class NoteIcon extends Icon {
|
|||||||
}
|
}
|
||||||
this._tip = new FloatingTip($(me.getImage().peer._native), {
|
this._tip = new FloatingTip($(me.getImage().peer._native), {
|
||||||
title: $msg('NOTE'),
|
title: $msg('NOTE'),
|
||||||
|
container: 'body',
|
||||||
// Content can also be a function of the target element!
|
// Content can also be a function of the target element!
|
||||||
content() {
|
content() {
|
||||||
return me._buildTooltipContent();
|
return me._buildTooltipContent();
|
||||||
|
@ -59,8 +59,6 @@ class BootstrapDialog extends Options {
|
|||||||
$(this).remove();
|
$(this).remove();
|
||||||
});
|
});
|
||||||
this._native.on('shown.bs.modal', this.onDialogShown);
|
this._native.on('shown.bs.modal', this.onDialogShown);
|
||||||
|
|
||||||
this._native.appendTo('#mindplot');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_buildFooter() {
|
_buildFooter() {
|
||||||
|
@ -27,7 +27,7 @@ const defaultOptions = {
|
|||||||
title: '',
|
title: '',
|
||||||
content: '',
|
content: '',
|
||||||
delay: 0,
|
delay: 0,
|
||||||
container: '#mindplot',
|
container: false,
|
||||||
destroyOnExit: false,
|
destroyOnExit: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -31,6 +31,7 @@ class LinkIconTooltip extends FloatingTip {
|
|||||||
},
|
},
|
||||||
html: true,
|
html: true,
|
||||||
placement: 'bottom',
|
placement: 'bottom',
|
||||||
|
container: 'body',
|
||||||
title: $msg('LINK'),
|
title: $msg('LINK'),
|
||||||
trigger: 'manual',
|
trigger: 'manual',
|
||||||
template: '<div id="linkPopover" class="popover" onmouseover="jQuery(this).mouseleave(function() {jQuery(this).fadeOut(200); });" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>',
|
template: '<div id="linkPopover" class="popover" onmouseover="jQuery(this).mouseleave(function() {jQuery(this).fadeOut(200); });" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>',
|
||||||
|
Loading…
Reference in New Issue
Block a user