Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
L
luna
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
luna
Commits
81fbe1a7
Unverified
Commit
81fbe1a7
authored
6 years ago
by
liuzheng712
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: fix the control left bar bug, when there is no asset, ul UI error
parent
64694f59
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
11 deletions
+15
-11
cleftbar.component.scss
src/app/pages/control/cleftbar/cleftbar.component.scss
+2
-2
control.component.html
src/app/pages/control/control.component.html
+3
-4
control.component.css
src/app/pages/control/control/control.component.css
+1
-1
control.component.html
src/app/pages/control/control/control.component.html
+9
-4
No files found.
src/app/pages/control/cleftbar/cleftbar.component.scss
View file @
81fbe1a7
...
...
@@ -84,9 +84,9 @@ label {
}
.overflow
{
//height: 100%;
float
:
left
;
height
:
100%
;
width
:
100%
;
float
:
left
;
position
:
inherit
;
background
:
#2f2a2a
;
color
:
#d6cbcb
;
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/control/control.component.html
View file @
81fbe1a7
<div
class=
"container-fluid row"
fxLayout=
"row"
ngxSplit=
"row"
>
<div
class=
"left"
fxFlex=
"20%"
ngxSplitArea
>
<div
fxFlex=
"20%"
ngxSplitArea
>
<pages-control-cleftbar
*
ngIf=
"DataStore.leftbarshow"
></pages-control-cleftbar>
</div>
<div
fxFlex=
"15px"
ngxSplitHandle
></div>
<div
fxFlex=
"80%"
ngxSplitArea
>
<pages-control-control
[
ngClass
]="{'
col-md-10
'
:DataStore
.
leftbarshow
,'
col-md-12
'
:
!
DataStore
.
leftbarshow
}"
></pages-control-control>
<div
fxFlex
>
<pages-control-control></pages-control-control>
</div>
</div>
This diff is collapsed.
Click to expand it.
src/app/pages/control/control/control.component.css
View file @
81fbe1a7
...
...
@@ -3,7 +3,7 @@ div, elements-term, elements-iframe {
padding-bottom
:
30px
;
}
div
{
.window
{
display
:
none
;
}
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/control/control/control.component.html
View file @
81fbe1a7
<pages-control-nav></pages-control-nav>
<div
*
ngFor=
"let m of NavList.List;let i=index"
[
ngClass
]="{'
active
'
:i=
=NavList.Active}"
>
<div
fxLayout=
"column"
ngxSplit=
"column"
style=
"width: 100%;height: 100%;"
>
<div
fxflex=
"0 0 50px"
class=
"search"
>
<pages-control-nav></pages-control-nav>
</div>
<div
fxFlex
>
<div
class=
"window"
*
ngFor=
"let m of NavList.List;let i=index"
[
ngClass
]="{'
active
'
:i=
=NavList.Active}"
>
<elements-term
[
index
]="
i
"
[
host
]="
m
.
host
"
[
userid
]="
m
.
user
.
id
"
...
...
@@ -15,4 +18,6 @@
<elements-settings
[
index
]="
i
"
*
ngIf=
"m.type=='settings'"
>
</elements-settings>
</div>
</div>
</div>
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