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
8e5ca7c7
Commit
8e5ca7c7
authored
8 years ago
by
chris
Committed by
Yannis Barlas
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
toolbar left in progress
parent
e855b15d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/components/SimpleEditor/Editor.js
+15
-0
15 additions, 0 deletions
app/components/SimpleEditor/Editor.js
app/components/SimpleEditor/SimpleEditor.scss
+16
-1
16 additions, 1 deletion
app/components/SimpleEditor/SimpleEditor.scss
with
31 additions
and
1 deletion
app/components/SimpleEditor/Editor.js
+
15
−
0
View file @
8e5ca7c7
...
@@ -65,6 +65,7 @@ class Editor extends ProseEditor {
...
@@ -65,6 +65,7 @@ class Editor extends ProseEditor {
// left side: editor and toolbar
// left side: editor and toolbar
let
toolbar
=
this
.
_renderToolbar
(
$$
)
let
toolbar
=
this
.
_renderToolbar
(
$$
)
let
toolbarLeft
=
this
.
_renderToolbarLeft
(
$$
)
let
editor
=
this
.
_renderEditor
(
$$
)
let
editor
=
this
.
_renderEditor
(
$$
)
let
SplitPane
=
this
.
componentRegistry
.
get
(
'
split-pane
'
)
let
SplitPane
=
this
.
componentRegistry
.
get
(
'
split-pane
'
)
...
@@ -107,6 +108,8 @@ class Editor extends ProseEditor {
...
@@ -107,6 +108,8 @@ class Editor extends ProseEditor {
commentsPane
commentsPane
)
)
let
sideNav
=
$
$
(
'
div
'
).
addClass
(
'
sidenav
'
).
append
(
toolbarLeft
)
var
contentPanel
=
$
$
(
ScrollPane
,
{
var
contentPanel
=
$
$
(
ScrollPane
,
{
name
:
'
contentPanel
'
,
name
:
'
contentPanel
'
,
// contextMenu: 'custom',
// contextMenu: 'custom',
...
@@ -179,6 +182,18 @@ class Editor extends ProseEditor {
...
@@ -179,6 +182,18 @@ class Editor extends ProseEditor {
.
append
(
viewMode
)
.
append
(
viewMode
)
}
}
_renderToolbarLeft
(
$$
)
{
let
commandStates
=
this
.
commandManager
.
getCommandStates
()
return
$
$
(
'
div
'
).
addClass
(
'
se-toolbar-wrapper
'
).
append
(
$
$
(
Toolbar
,
{
commandStates
:
commandStates
,
trackChanges
:
this
.
props
.
trackChanges
,
trackChangesView
:
this
.
state
.
trackChangesView
,
toolGroups
:
[
'
text
'
]
}).
ref
(
'
toolbarLeft
'
)
)
}
_renderEditor
(
$$
)
{
_renderEditor
(
$$
)
{
const
configurator
=
this
.
props
.
configurator
const
configurator
=
this
.
props
.
configurator
const
editing
=
this
.
props
.
disabled
?
'
selection
'
:
'
full
'
const
editing
=
this
.
props
.
disabled
?
'
selection
'
:
'
full
'
...
...
This diff is collapsed.
Click to expand it.
app/components/SimpleEditor/SimpleEditor.scss
+
16
−
1
View file @
8e5ca7c7
...
@@ -109,10 +109,11 @@ $active-blue: #4a90e2;
...
@@ -109,10 +109,11 @@ $active-blue: #4a90e2;
.se-options
{
.se-options
{
top
:
36px
;
top
:
36px
;
background-color
:
#E8E8E8
;
}
}
.se-option
{
.se-option
{
background-color
:
$white
;
background-color
:
#E8E8E8
;
border
:
0
;
border
:
0
;
font-family
:
'Fira Sans'
;
font-family
:
'Fira Sans'
;
}
}
...
@@ -229,6 +230,20 @@ $active-blue: #4a90e2;
...
@@ -229,6 +230,20 @@ $active-blue: #4a90e2;
background-color
:
$primary
;
background-color
:
$primary
;
border-right
:
1px
solid
$light-gray
;
border-right
:
1px
solid
$light-gray
;
margin-top
:
1px
;
margin-top
:
1px
;
.sidenav
{
height
:
270px
;
width
:
150px
;
position
:
fixed
;
z-index
:
1
;
top
:
0
;
left
:
0
;
background-color
:
#e8e8e8
;
overflow-x
:
hidden
;
transition
:
0
.5s
;
margin-top
:
256px
;
box-shadow
:
0
0
12px
$dark-gray
;
}
}
}
...
...
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