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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
aa01b239
Commit
aa01b239
authored
9 years ago
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix padding around editor path, input and select box.
parent
c95b64d1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
39 deletions
+29
-39
app/assets/stylesheets/pages/editor.scss
app/assets/stylesheets/pages/editor.scss
+18
-28
app/views/projects/blob/_editor.html.haml
app/views/projects/blob/_editor.html.haml
+11
-11
No files found.
app/assets/stylesheets/pages/editor.scss
View file @
aa01b239
...
...
@@ -19,48 +19,38 @@
color
:
#B94A48
;
}
}
.commit-button-annotation
{
display
:
inline-block
;
margin
:
0
;
padding
:
2px
;
>
*
{
float
:
left
;
}
.message
{
display
:
inline-block
;
margin
:
5px
8px
0
8px
;
}
}
.file-title
{
@extend
.monospace
;
line-height
:
42px
;
padding-top
:
7px
;
padding-bottom
:
7px
;
}
.editor-ref
{
background
:
$background-color
;
padding
:
11px
15px
;
padding
-right
:
$gl-padding
;
border-right
:
1px
solid
$border-color
;
display
:
inline-
block
;
margin
:
-5px
-5px
;
display
:
block
;
float
:
left
;
margin-right
:
10px
;
}
.editor-file-name
{
@extend
.monospace
;
float
:
left
;
margin-right
:
10px
;
}
.new-file-name
{
display
:
inline-block
;
width
:
450px
;
float
:
left
;
}
.form-control
{
margin-top
:
-3px
;
}
}
.form-actions
{
margin
:
-
$gl-padding
;
margin-top
:
0
;
padding
:
$gl-padding
.select2
{
float
:
right
;
}
}
This diff is collapsed.
Click to expand it.
app/views/projects/blob/_editor.html.haml
View file @
aa01b239
.file-holder.file
.file-title
.file-holder.file
.append-bottom-default
.file-title
.clearfix
.editor-ref
%i
.fa.fa-code-fork
=
icon
(
'code-fork'
)
=
ref
%span
.editor-file-name
-
if
@path
%span
.monospace
=
@path
-
if
current_action?
(
:new
)
||
current_action?
(
:create
)
%span
.editor-file-name
\/
=
text_field_tag
'file_name'
,
params
[
:file_name
],
placeholder:
"File name"
,
required:
true
,
class:
'form-control new-file-name js-quick-submit'
.pull-right
=
select_tag
:encoding
,
options_for_select
([
"base64"
,
"text"
],
"text"
),
class:
'form-control
'
=
select_tag
:encoding
,
options_for_select
([
"base64"
,
"text"
],
"text"
),
class:
'select2
'
.file-content.code
%pre
.js-edit-mode-pane
#editor
...
...
This diff is collapsed.
Click to expand it.
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