Merge branch 'read-only-left-menu' into 'staging' (72fa9a3b) · 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

72fa9a3b

Commit 72fa9a3b authored 8 years ago by

Yannis Barlas

Downloads
- Plain Diff

Merge branch 'read-only-left-menu' into 'staging'

Read only left menu

See merge request !29

parents 5e93bbbc 8826d3c8

No related branches found

No related tags found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/components/SimpleEditor/Editor.js 15 additions, 14 deletions

app/components/SimpleEditor/Editor.js
app/components/SimpleEditor/SimpleEditor.scss 1 addition, 18 deletions

app/components/SimpleEditor/SimpleEditor.scss
app/components/SimpleEditor/elements/comment/comment.scss 2 additions, 1 deletion

app/components/SimpleEditor/elements/comment/comment.scss
app/components/SimpleEditor/elements/left_switch_text_type/LeftSwitchTextTypeTool.js 16 additions, 2 deletions

.../elements/left_switch_text_type/LeftSwitchTextTypeTool.js
app/components/SimpleEditor/elements/note/NoteTool.js 2 additions, 3 deletions

app/components/SimpleEditor/elements/note/NoteTool.js
app/components/SimpleEditor/panes/Comments/commentsPane.scss 2 additions, 1 deletion

app/components/SimpleEditor/panes/Comments/commentsPane.scss

with 38 additions and 39 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