Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
editoria
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Yannis Barlas
editoria
Commits
c8c61da1
Commit
c8c61da1
authored
7 years ago
by
chris
Committed by
john
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
remove toc and rearange containers
parent
3e8314af
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/components/SimpleEditor/Editor.js
+19
-25
19 additions, 25 deletions
app/components/SimpleEditor/Editor.js
app/components/SimpleEditor/SimpleEditor.scss
+4
-4
4 additions, 4 deletions
app/components/SimpleEditor/SimpleEditor.scss
with
23 additions
and
29 deletions
app/components/SimpleEditor/Editor.js
+
19
−
25
View file @
c8c61da1
...
...
@@ -2,7 +2,7 @@ import { includes, some } from 'lodash'
import
{
ProseEditor
,
TOCProvider
,
//
TOCProvider,
Toolbar
}
from
'
substance
'
...
...
@@ -13,7 +13,7 @@ import ContainerEditor from './ContainerEditor'
import
Notes
from
'
./panes/Notes/Notes
'
import
NotesProvider
from
'
./panes/Notes/NotesProvider
'
import
TableOfContents
from
'
./panes/TableOfContents/TableOfContents
'
//
import TableOfContents from './panes/TableOfContents/TableOfContents'
import
TrackChangesProvider
from
'
./elements/track_change/TrackChangesProvider
'
import
ModalWarning
from
'
./elements/modal_warning/ModalWarning
'
...
...
@@ -71,15 +71,15 @@ class Editor extends ProseEditor {
let
ContextMenu
=
this
.
componentRegistry
.
get
(
'
context-menu
'
)
// new what does it do?
// let Dropzones = this.componentRegistry.get('dropzones') // new what does it do?
const
footerNotes
=
$
$
(
Notes
).
ref
(
'
footer-notes
'
)
//
const footerNotes = $$(Notes).ref('footer-notes')
const
props
=
{
book
:
this
.
props
.
book
,
fragment
:
this
.
props
.
fragment
,
history
:
this
.
props
.
history
}
//
const props = {
//
book: this.props.book,
//
fragment: this.props.fragment,
//
history: this.props.history
//
}
const
toc
=
$
$
(
TableOfContents
,
props
)
//
const toc = $$(TableOfContents, props)
var
commentsPane
=
this
.
state
.
editorReady
?
$
$
(
Comments
,
{
...
...
@@ -113,22 +113,17 @@ class Editor extends ProseEditor {
.
attr
(
'
id
'
,
'
content-panel
'
)
.
ref
(
'
contentPanel
'
)
const
contentPanelWithSplitPane
=
$
$
(
SplitPane
,
{
sizeA
:
'
75%
'
,
splitType
:
'
vertical
'
})
.
append
(
contentPanel
,
toc
)
const
ToolbarWithEditor
=
$
$
(
SplitPane
,
{
splitType
:
'
horizontal
'
})
.
append
(
toolbar
,
contentPanelWithSplitPane
)
// const contentPanelWithSplitPane = $$(SplitPane, { sizeA: '75%', splitType: 'vertical' })
// .append(
// contentPanel,
// toc
// )
el
.
append
(
$
$
(
SplitPane
,
{
splitType
:
'
horizontal
'
})
.
append
(
T
oolbar
WithEditor
,
footerNotes
t
oolbar
,
contentPanel
)
)
...
...
@@ -241,9 +236,9 @@ class Editor extends ProseEditor {
const
doc
=
this
.
doc
// toc provider
const
tocProvider
=
new
TOCProvider
(
doc
,
{
containerId
:
'
body
'
})
//
const tocProvider = new TOCProvider(doc, {
//
containerId:
this.props.containerId
//
})
// notes provider
const
notesProvider
=
new
NotesProvider
(
doc
,
{
...
...
@@ -277,7 +272,6 @@ class Editor extends ProseEditor {
// attach all to context
return
{
...
oldContext
,
tocProvider
,
notesProvider
,
commentsProvider
,
trackChangesProvider
...
...
This diff is collapsed.
Click to expand it.
app/components/SimpleEditor/SimpleEditor.scss
+
4
−
4
View file @
c8c61da1
...
...
@@ -212,7 +212,7 @@ $active-blue: #4a90e2;
}
// End sc-toolbar
.se-scrollable
{
background-color
:
$
primary
;
background-color
:
$
white
;
border-right
:
1px
solid
$light-gray
;
margin-top
:
1px
;
...
...
@@ -224,9 +224,9 @@ $active-blue: #4a90e2;
background-color
:
#e8e8e8
;
// box-shadow: 0 0 12px $dark-gray;
box-shadow
:
2px
0px
1px
-1px
#ccc
;
height
:
10
0%
;
left
:
0
;
margin-top
:
1
4
9px
;
height
:
5
0%
;
left
:
2%
;
margin-top
:
1
8
9px
;
overflow-x
:
hidden
;
position
:
fixed
;
top
:
0
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment