This commit is contained in:
sunny 2018-04-12 18:06:29 +09:00
parent b061609317
commit 0e13f47073
7 changed files with 60 additions and 27 deletions

View File

@ -1,8 +1,16 @@
<p>home works</p>
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<h1>Home works</h1>
<p-dialog header="Discovery" [style]="{width: '700px'}" [(visible)]="display">
<of-discovery-setting></of-discovery-setting>
</p-dialog>
<button type="text" (click)="showDialog()" pButton icon="fa-external-link-square" label="Show"></button>
<p-dialog header="Discovery" [style]="{width: '700px'}" [(visible)]="display">
<of-discovery-setting></of-discovery-setting>
</p-dialog>
<button pButton type="button" class="ui-button-large" icon="ui-icon-play-arrow" label="Discovery" style="width:auto" (click)="showDialog()"></button>
</div>
</div>
</div>
</div>

View File

@ -1 +1,9 @@
<of-infra-map></of-infra-map>
<div class="ui-fluid">
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<of-infra-map></of-infra-map>
</div>
</div>
</div>
</div>

View File

@ -537,8 +537,9 @@
@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
.login-body {
background: url("../images/login/login2x.png") top left no-repeat #f7f7f7;
background-size: 100% auto; } }
/*background: url("../images/login/login2x.png") top left no-repeat #f7f7f7;*/
background: url("../images/login11.jpg") top left no-repeat;
background-size: 100% 100%; } }
@media (max-width: 1024px) {
.login-panel {
text-align: center;
@ -631,7 +632,8 @@
vertical-align: middle;
width: 200px;
height: 30px;
background: url("../images/logo.png") top left no-repeat; }
/*background: url("../images/logo.png") top left no-repeat; }*/
background: url("../images/overFlow_CI_white_200_30.png") top left no-repeat; }
.landing-wrapper #header .header-top #menu {
float: right;
list-style: none;
@ -899,7 +901,8 @@
padding: 0; } }
@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
.landing-wrapper .header .header-top .logo {
background: url("../images/logo2x.png") top left no-repeat;
/*background: url("../images/logo2x.png") top left no-repeat;*/
background: url("../images/overFlow_CI_white_200_30.png") top left no-repeat;
background-size: 200px 30px; } }
html {
height: 100%; }
@ -942,7 +945,8 @@ body {
vertical-align: middle;
width: 200px;
height: 30px;
background: url("../images/logo2x.png") top left no-repeat;
/*background: url("../images/logo2x.png") top left no-repeat;*/
background: url("../images/overFlow_CI_white_200_30.png") top left no-repeat;
background-size: 200px 30px; }
.layout-container .topbar .topbar-left {
box-sizing: border-box;

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -1,20 +1,25 @@
<p-dialog header="Discovery" [width]="700" [(visible)]="display">
<of-discovery-setting></of-discovery-setting>
</p-dialog>
<button type="text" (click)="showDialog()" pButton icon="fa-external-link-square" label="Discovery"></button>
<div style="margin-top: 8px">
<button pButton type="button" label="Expand all" (click)="expandAll()"></button>
<button pButton type="button" label="Collapse all" (click)="collapseAll()"></button>
<div class="ui-g">
<h1>Map</h1>
<p-dialog header="Discovery" [width]="700" [(visible)]="display">
<of-discovery-setting></of-discovery-setting>
</p-dialog>
<div class="ui-g-12 ui-g-nopad">
<div class="ui-g">
<div class="ui-g-6 ui-g-nopad" style="padding-bottom:10px;">
<button pButton type="button" class="ui-button-large" icon="ui-icon-play-arrow" label="Discovery" style="width:auto" (click)="showDialog()"></button>
</div>
<div class="ui-g-6 ui-g-nopad ui-rtl" dir="rtl">
<button pButton type="button" class="ui-button-secondary" label="Expand all" style="width:auto; margin-top: 16px;" (click)="expandAll()"></button>
<button pButton type="button" class="ui-button-secondary" label="Collapse all" style="width:auto;" (click)="collapseAll()"></button>
</div>
</div>
</div>
<div class="ui-g-12 ui-g-nopad">
<p-tree [value]="infraTree" selectionMode="single" [(selection)]="selectedTree" ></p-tree>
</div>
</div>
<p-tree [value]="infraTree" [style]="{width: '360px'}" selectionMode="single" [(selection)]="selectedTree" ></p-tree>

View File

@ -17,4 +17,12 @@
//background: url("../images/login/login2x.png") top left no-repeat #f7f7f7;
background: url("/assets/layout/images/login11.jpg") top left no-repeat #f7f7f7 !important;
}
}
.ui-button-secondary:hover{
color : white !important;
}
.ui-button-large {
font-size: 1.6em !important;
}