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
ba8bcdab
Commit
ba8bcdab
authored
Aug 02, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed monaco height
parent
f64b0059
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
app/assets/javascripts/repo/repo_editor.vue
app/assets/javascripts/repo/repo_editor.vue
+2
-1
app/assets/stylesheets/pages/repo.scss
app/assets/stylesheets/pages/repo.scss
+1
-1
No files found.
app/assets/javascripts/repo/repo_editor.vue
View file @
ba8bcdab
...
@@ -24,6 +24,7 @@ const RepoEditor = {
...
@@ -24,6 +24,7 @@ const RepoEditor = {
const
newModel
=
this
.
monaco
.
editor
.
createModel
(
this
.
blobRaw
,
languageID
);
const
newModel
=
this
.
monaco
.
editor
.
createModel
(
this
.
blobRaw
,
languageID
);
this
.
monacoInstance
.
setModel
(
newModel
);
this
.
monacoInstance
.
setModel
(
newModel
);
this
.
monacoInstance
.
layout
();
}).
catch
(
Helper
.
loadingError
);
}).
catch
(
Helper
.
loadingError
);
},
},
...
@@ -32,7 +33,7 @@ const RepoEditor = {
...
@@ -32,7 +33,7 @@ const RepoEditor = {
if
(
!
this
.
openedFiles
.
length
||
(
this
.
binary
&&
!
this
.
activeFile
.
raw
))
{
if
(
!
this
.
openedFiles
.
length
||
(
this
.
binary
&&
!
this
.
activeFile
.
raw
))
{
this
.
$el
.
style
.
display
=
'
none
'
;
this
.
$el
.
style
.
display
=
'
none
'
;
}
else
{
}
else
{
this
.
$el
.
style
.
display
=
'
inline-block
'
;
this
.
$el
.
style
.
display
=
''
;
}
}
},
},
...
...
app/assets/stylesheets/pages/repo.scss
View file @
ba8bcdab
...
@@ -147,6 +147,7 @@
...
@@ -147,6 +147,7 @@
#ide
{
#ide
{
flex
:
1
;
flex
:
1
;
min-height
:
0
;
}
}
#repo-file-buttons
{
#repo-file-buttons
{
...
@@ -155,7 +156,6 @@
...
@@ -155,7 +156,6 @@
padding
:
10px
5px
;
padding
:
10px
5px
;
position
:
relative
;
position
:
relative
;
border-top
:
1px
solid
$white-normal
;
border-top
:
1px
solid
$white-normal
;
margin-top
:
-5px
;
}
}
#binary-viewer
{
#binary-viewer
{
...
...
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