Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
d5b0c0cea6e8
Commit
49df4118
authored
Aug 16, 2017
by
Eric Eastwood
Committed by
Jacob Schatz
Aug 16, 2017
Browse files
Repo editor with flex layout
parent
ce12bfac880b
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/assets/javascripts/repo/components/repo.vue
View file @
d5b0c0ce
...
...
@@ -43,15 +43,18 @@ export default {
</
script
>
<
template
>
<div
class=
"repository-view tree-content-holder"
>
<repo-sidebar/><div
v-if=
"isMini"
class=
"panel-right"
:class=
"
{'edit-mode': editMode}">
<repo-tabs/>
<component
:is=
"currentBlobView"
class=
"blob-viewer-container"
/>
<repo-file-buttons/>
<div
class=
"repository-view"
>
<div
class=
"tree-content-holder"
:class=
"
{'tree-content-holder-mini' : isMini}">
<repo-sidebar/>
<div
v-if=
"isMini"
class=
"panel-right"
:class=
"
{'edit-mode': editMode}">
<repo-tabs/>
<component
:is=
"currentBlobView"
class=
"blob-viewer-container"
/>
<repo-file-buttons/>
</div>
</div>
<repo-commit-section/>
<popup-dialog
...
...
app/assets/stylesheets/pages/repo.scss
View file @
d5b0c0ce
...
...
@@ -47,14 +47,26 @@
margin
:
20px
;
}
.repository-view
.tree-content-holder
{
.repository-view
{
border
:
1px
solid
$border-color
;
border-radius
:
$border-radius-default
;
color
:
$almost-black
;
.tree-content-holder
{
display
:
flex
;
max-height
:
100vh
;
min-height
:
300px
;
}
.tree-content-holder-mini
{
height
:
100vh
;
}
.panel-right
{
display
:
inline-block
;
display
:
flex
;
flex-direction
:
column
;
width
:
80%
;
height
:
100%
;
.monaco-editor.vs
{
.line-numbers
{
...
...
@@ -85,16 +97,17 @@
}
.blob-viewer-container
{
height
:
calc
(
100vh
-
62px
)
;
flex
:
1
;
overflow
:
auto
;
}
#tabs
{
flex-shrink
:
0
;
display
:
flex
;
width
:
100%
;
padding-left
:
0
;
margin-bottom
:
0
;
display
:
flex
;
white-space
:
nowrap
;
width
:
100%
;
overflow-y
:
hidden
;
overflow-x
:
auto
;
...
...
@@ -222,14 +235,12 @@
}
#sidebar
{
flex
:
1
;
height
:
100%
;
&
.sidebar-mini
{
display
:
inline-block
;
vertical-align
:
top
;
width
:
20%
;
border-right
:
1px
solid
$white-normal
;
min-height
:
475px
;
height
:
calc
(
100vh
+
20px
);
overflow
:
auto
;
}
...
...
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