Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
dacff8f0
Commit
dacff8f0
authored
Sep 15, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix UI for web editor
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
a635e1a3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
4 deletions
+20
-4
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+4
-0
app/assets/stylesheets/pages/editor.scss
app/assets/stylesheets/pages/editor.scss
+15
-3
app/views/projects/blob/edit.html.haml
app/views/projects/blob/edit.html.haml
+1
-1
No files found.
app/assets/stylesheets/generic/common.scss
View file @
dacff8f0
...
...
@@ -377,4 +377,8 @@ table {
height
:
56px
;
margin-top
:
-
$gl-padding
;
padding-top
:
$gl-padding
;
&
.no-bottom
{
margin-bottom
:
0
;
}
}
app/assets/stylesheets/pages/editor.scss
View file @
dacff8f0
...
...
@@ -9,6 +9,10 @@
width
:
100%
;
}
.ace_gutter-cell
{
background-color
:
$background-color
;
}
.cancel-btn
{
color
:
#B94A48
;
&
:hover
{
...
...
@@ -32,14 +36,12 @@
.file-title
{
@extend
.monospace
;
font-size
:
14px
;
padding
:
5px
;
}
.editor-ref
{
background
:
$background-color
;
padding
:
11px
15px
;
border-right
:
1px
solid
#CCC
;
border-right
:
1px
solid
$border-color
;
display
:
inline-block
;
margin
:
-5px
-5px
;
margin-right
:
10px
;
...
...
@@ -50,5 +52,15 @@
display
:
inline-block
;
width
:
200px
;
}
.form-control
{
margin-top
:
-3px
;
}
}
.form-actions
{
margin
:
-
$gl-padding
;
margin-top
:
0
;
padding
:
$gl-padding
}
}
app/views/projects/blob/edit.html.haml
View file @
dacff8f0
-
page_title
"Edit"
,
@blob
.
path
,
@ref
.file-editor
%ul
.
nav.nav-tabs
.js-edit-mode
%ul
.
center-top-menu.no-bottom
.js-edit-mode
%li
.active
=
link_to
'#editor'
do
%i
.fa.fa-edit
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment