Merge branch 'left-toolbar' into 'staging' (247bbd6c) · Commits · Yannis Barlas / editoria · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

editoria
- Activity
- Members
- Labels
- Releases
- Container Registry
- Environments
- Incidents

Snippets Groups Projects

247bbd6c

Commit 247bbd6c authored 8 years ago by

Yannis Barlas

Downloads
- Plain Diff

Merge branch 'left-toolbar' into 'staging'

Left toolbar

See merge request !26

parents 61bd50d1 adbf67ec

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/components/SimpleEditor/Editor.js 18 additions, 2 deletions

app/components/SimpleEditor/Editor.js
app/components/SimpleEditor/SimpleEditor.jsx 1 addition, 0 deletions

app/components/SimpleEditor/SimpleEditor.jsx
app/components/SimpleEditor/SimpleEditor.scss 58 additions, 13 deletions

app/components/SimpleEditor/SimpleEditor.scss
app/components/SimpleEditor/config.js 3 additions, 5 deletions

app/components/SimpleEditor/config.js
app/components/SimpleEditor/elements/left_switch_text_type/LeftSwitchTextTypePackage.js 11 additions, 0 deletions

...ements/left_switch_text_type/LeftSwitchTextTypePackage.js
app/components/SimpleEditor/elements/left_switch_text_type/LeftSwitchTextTypeTool.js 60 additions, 0 deletions

.../elements/left_switch_text_type/LeftSwitchTextTypeTool.js
app/components/SimpleEditor/elements/track_change/TrackChangeControlTool.js 5 additions, 0 deletions

...pleEditor/elements/track_change/TrackChangeControlTool.js
app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js 5 additions, 1 deletion

...ditor/elements/track_change/TrackChangeControlViewTool.js
app/components/SimpleEditor/elements/track_change/TrackChangesProvider.js 1 addition, 2 deletions

...impleEditor/elements/track_change/TrackChangesProvider.js

with 162 additions and 23 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment