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
49df4118
Commit
49df4118
authored
Aug 16, 2017
by
Eric Eastwood
Committed by
Jacob Schatz
Aug 16, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Repo editor with flex layout
parent
22f452d0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
18 deletions
+32
-18
app/assets/javascripts/repo/components/repo.vue
app/assets/javascripts/repo/components/repo.vue
+12
-9
app/assets/stylesheets/pages/repo.scss
app/assets/stylesheets/pages/repo.scss
+20
-9
No files found.
app/assets/javascripts/repo/components/repo.vue
View file @
49df4118
...
@@ -43,15 +43,18 @@ export default {
...
@@ -43,15 +43,18 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<div
class=
"repository-view tree-content-holder"
>
<div
class=
"repository-view"
>
<repo-sidebar/><div
v-if=
"isMini"
<div
class=
"tree-content-holder"
:class=
"
{'tree-content-holder-mini' : isMini}">
class=
"panel-right"
<repo-sidebar/>
:class=
"
{'edit-mode': editMode}">
<div
v-if=
"isMini"
<repo-tabs/>
class=
"panel-right"
<component
:class=
"
{'edit-mode': editMode}">
:is=
"currentBlobView"
<repo-tabs/>
class=
"blob-viewer-container"
/>
<component
<repo-file-buttons/>
:is=
"currentBlobView"
class=
"blob-viewer-container"
/>
<repo-file-buttons/>
</div>
</div>
</div>
<repo-commit-section/>
<repo-commit-section/>
<popup-dialog
<popup-dialog
...
...
app/assets/stylesheets/pages/repo.scss
View file @
49df4118
...
@@ -47,14 +47,26 @@
...
@@ -47,14 +47,26 @@
margin
:
20px
;
margin
:
20px
;
}
}
.repository-view
.tree-content-holder
{
.repository-view
{
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
border-radius
:
$border-radius-default
;
border-radius
:
$border-radius-default
;
color
:
$almost-black
;
color
:
$almost-black
;
.tree-content-holder
{
display
:
flex
;
max-height
:
100vh
;
min-height
:
300px
;
}
.tree-content-holder-mini
{
height
:
100vh
;
}
.panel-right
{
.panel-right
{
display
:
inline-block
;
display
:
flex
;
flex-direction
:
column
;
width
:
80%
;
width
:
80%
;
height
:
100%
;
.monaco-editor.vs
{
.monaco-editor.vs
{
.line-numbers
{
.line-numbers
{
...
@@ -85,16 +97,17 @@
...
@@ -85,16 +97,17 @@
}
}
.blob-viewer-container
{
.blob-viewer-container
{
height
:
calc
(
100vh
-
62px
)
;
flex
:
1
;
overflow
:
auto
;
overflow
:
auto
;
}
}
#tabs
{
#tabs
{
flex-shrink
:
0
;
display
:
flex
;
width
:
100%
;
padding-left
:
0
;
padding-left
:
0
;
margin-bottom
:
0
;
margin-bottom
:
0
;
display
:
flex
;
white-space
:
nowrap
;
white-space
:
nowrap
;
width
:
100%
;
overflow-y
:
hidden
;
overflow-y
:
hidden
;
overflow-x
:
auto
;
overflow-x
:
auto
;
...
@@ -222,14 +235,12 @@
...
@@ -222,14 +235,12 @@
}
}
#sidebar
{
#sidebar
{
flex
:
1
;
height
:
100%
;
&
.sidebar-mini
{
&
.sidebar-mini
{
display
:
inline-block
;
vertical-align
:
top
;
width
:
20%
;
width
:
20%
;
border-right
:
1px
solid
$white-normal
;
border-right
:
1px
solid
$white-normal
;
min-height
:
475px
;
height
:
calc
(
100vh
+
20px
);
overflow
:
auto
;
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