Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Load modeling styles #3031

Merged
merged 2 commits into from Jul 18, 2022
Merged

Load modeling styles #3031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
694aa13
chore(client): remove monkey patch styles
Jul 15, 2022
025c341
style: load modeling styles globally
Jul 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 0 additions & 28 deletions client/src/app/App-patch.css
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions client/src/app/App.js
View file
Open in desktop
Expand Up @@ -62,9 +62,6 @@ import { PluginsRoot } from './plugins';

import css from './App.less';

// monkey-patch to fix styling issues ahead of release 5.1, tracked here https://github.com/camunda/camunda-modeler/issues/3025
import './App-patch.css';

import Notifications, { NOTIFICATION_TYPES } from './notifications';


Expand Down
2 changes: 0 additions & 2 deletions client/src/app/tabs/bpmn/modeler/BpmnModeler.js
View file
Open in desktop
Expand Up @@ -19,8 +19,6 @@ import propertiesPanelKeyboardBindingsModule from './features/properties-panel-k

import Flags, { DISABLE_ADJUST_ORIGIN } from '../../../../util/Flags';

import 'camunda-bpmn-js/dist/assets/camunda-platform-modeler.css';


export default class PlatformBpmnModeler extends BpmnModeler {

Expand Down
2 changes: 0 additions & 2 deletions client/src/app/tabs/cloud-bpmn/modeler/BpmnModeler.js
View file
Open in desktop
Expand Up @@ -21,8 +21,6 @@ import Flags, {
DISABLE_ADJUST_ORIGIN
} from '../../../../util/Flags';

import 'camunda-bpmn-js/dist/assets/camunda-cloud-modeler.css';


export default class CloudBpmnModeler extends BpmnModeler {

Expand Down
2 changes: 0 additions & 2 deletions client/src/app/tabs/cloud-dmn/modeler/DmnModeler.js
View file
Open in desktop
Expand Up @@ -26,8 +26,6 @@ import overviewRendererModule from '../../dmn/modeler/features/overview/overview
import executionPlatformModule from '@camunda/execution-platform';
import modelerModdle from 'modeler-moddle/resources/dmn-modeler.json';

import 'camunda-dmn-js/dist/assets/camunda-cloud-modeler.css';

const NOOP_MODULE = [ 'value', null ];

const poweredByModule = {
Expand Down
2 changes: 0 additions & 2 deletions client/src/app/tabs/dmn/modeler/DmnModeler.js
View file
Open in desktop
Expand Up @@ -26,8 +26,6 @@ import overviewRendererModule from './features/overview/overview-renderer';
import executionPlatformModule from '@camunda/execution-platform';
import modelerModdle from 'modeler-moddle/resources/dmn-modeler.json';

import 'camunda-dmn-js/dist/assets/camunda-platform-modeler.css';

const NOOP_MODULE = [ 'value', null ];

const poweredByModule = {
Expand Down
12 changes: 12 additions & 0 deletions client/src/styles/_modeling.less
View file
Open in desktop
@@ -0,0 +1,12 @@
@import '~camunda-bpmn-js/dist/assets/diagram-js.css';
@import '~camunda-bpmn-js/dist/assets/bpmn-js.css';
@import '~camunda-bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css';
@import '~camunda-bpmn-js/dist/assets/diagram-js-minimap.css';
@import '~camunda-bpmn-js/dist/assets/properties-panel.css';
@import '~camunda-bpmn-js/dist/assets/element-templates.css';
@import '~camunda-dmn-js/dist/assets/dmn-font/css/dmn-embedded.css';
@import '~camunda-dmn-js/dist/assets/dmn-js-decision-table-controls.css';
@import '~camunda-dmn-js/dist/assets/dmn-js-decision-table.css';
@import '~camunda-dmn-js/dist/assets/dmn-js-drd.css';
@import '~camunda-dmn-js/dist/assets/dmn-js-literal-expression.css';
@import '~camunda-dmn-js/dist/assets/dmn-js-shared.css';
1 change: 1 addition & 0 deletions client/src/styles/style.less
View file
Open in desktop
Expand Up @@ -7,3 +7,4 @@
@import "_buttons";
@import "_modal";
@import "_icons";
@import "_modeling.less";