diff options
Diffstat (limited to 'cds-ui/designer-client/src/app/modules/feature-modules/packages/designer')
3 files changed, 44 insertions, 29 deletions
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.css b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.css index 22eeeeb32..f7cff5072 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.css +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.css @@ -116,7 +116,7 @@ header{ .btn-topology-action, .btn-topology-action:hover{ margin: 0 6px; - padding: 4px 8px; + padding: 3px 8px; color: #fff; border-radius: 50%; border: solid .5px #fff; @@ -125,9 +125,10 @@ header{ margin-right: 0; } .btn-topology-action .fa{ - width: 16px; - height: 16px; + /* width: 16px; + height: 16px; */ text-align: center; + font-size: 14px; } .topology-actions .dropdown-text, .dropdown-toggle:hover ~ .dropdown-text, @@ -177,7 +178,7 @@ header{ padding: 0 !important; } .package-info h3{ - font-size: 15px; + font-size: 13px; font-weight: bold; } .package-info h3 span{ @@ -385,9 +386,9 @@ p.compType-4{ } .new-action, .new-action:hover{ - margin: 9px 0 4px 18px; + margin: 9px 0 4px 3px; padding: 6px; - font-size: 13px; + font-size: 12px; font-weight: bold; color: #1B3E6F; } @@ -486,7 +487,7 @@ p.compType-4{ /*CANVAS*/ .source-button.editBar{ position: absolute; - z-index: 9999999; + z-index: 1000 /*9999999*/; top: 60px; /* left: 50%; */ } @@ -527,6 +528,7 @@ p.compType-4{ } .editBar .toggoleBtn.active, .editBar2 .toggoleBtn.active{ + padding: 0 10px !important; background-color: #1B3E6F !important; color: #fff; } @@ -791,7 +793,7 @@ p.compType-4{ margin-top: 14px; padding-left: 30px!important; border: 0; - font-size: 12px; + font-size: 11px; color: #1B3E6F !important; background-color: #fff !important; background-repeat: no-repeat; @@ -826,13 +828,14 @@ ul.templateLegend{ color: #0ABDE3; } ul.editor{ - margin-right: -40px; + /* margin-right: -40px; */ margin-top: 16px; } .editor li{ list-style: none; } .editor .btn { + padding: 0 8px !important; box-shadow: none; } .ace_editor{ @@ -848,3 +851,6 @@ ul.editor{ margin-left: 12px; margin-right: 12px; } +.zoom-percent{ + font-size: 12px; +} diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html index 7f49d3cf3..6a432fec8 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html @@ -31,19 +31,23 @@ <img src="assets/img/icon-close.svg" /> </button> </div> - <div class="modal-body"> - <div class="row package-info"> + <div class="modal-body package-info"> + <div class="row"> <div class="col"> <h3>Test Package <span class="package-version">Version 1.0.2</span></h3> </div> + </div> + <div class="row"> <div class="col mb-3"> <span class="badge badge-primary">test</span> <span class="badge badge-primary">vDNS-CDS</span> <span class="badge badge-primary">SCALE-OUT</span> <span class="badge badge-primary">MARCO</span> </div> - <div class="col-2"> + </div> + <div class="row"> + <div class="col-2 pr-0"> <img src="/assets/img/img-user3.jpg" class="creator-pic"> </div> <div class="col-10 pl-0"> @@ -126,7 +130,7 @@ <li class="capability"><i class="icon-rectangle" aria-hidden="true"></i> Capability</li> </ul> - <ul class="editor navbar ml-auto"> + <ul class="editor navbar"> <li> <button type="button" class="btn tooltip-bottom" data-tooltip="Undo"> <img src="/assets/img/icon-undoActive.svg"> @@ -141,14 +145,14 @@ <li><button type="button" class="btn tooltip-bottom" data-tooltip="Zoom Out"> <img src="/assets/img/icon-zoomOut.svg"> </button></li> - <li>100%</li> + <li class="zoom-percent">100%</li> <li> <button type="button" class="btn tooltip-bottom" data-tooltip="Zoom In"> <img src="/assets/img/icon-zoomIn.svg"> </button> </li> </ul> - <ul class="navbar ml-auto" style="list-style: none"> + <ul class="navbar ml-2" style="list-style: none"> <li class="nav-item"> <div class="btn-group viewBtns" role="group"> <button type="button" class="btn btn-secondary topologySource active">Designer</button> diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html index 270482f12..eedbe9f85 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/source-view/source-view.component.html @@ -4,11 +4,11 @@ <p class="logo mb-0"></p> <nav aria-label="breadcrumb"> <ol class="breadcrumb designer-breadcrumb mb-0"> - <li class="breadcrumb-item"> + <li class="breadcrumb-item"> <a href="#">CBA Packages</a> </li> - <i class="fa fa-angle-right ml-2 mr-2"></i> - <li class="breadcrumb-item"> + <i class="fa fa-angle-right ml-2 mr-2"></i> + <li class="breadcrumb-item"> <a href="/package/{{viewedPackage.id}}">{{viewedPackage.artifactName}}</a> <button type="button" class="btn package-info-btn" data-toggle="modal" data-target="#exampleModalLong"> @@ -30,19 +30,23 @@ <img src="assets/img/icon-close.svg" /> </button> </div> - <div class="modal-body"> - <div class="row package-info"> + <div class="modal-body package-info"> + <div class="row"> <div class="col"> <h3>Test Package <span class="package-version">Version 1.0.2</span></h3> </div> + </div> + <div class="row"> <div class="col mb-3"> <span class="badge badge-primary">test</span> <span class="badge badge-primary">vDNS-CDS</span> <span class="badge badge-primary">SCALE-OUT</span> <span class="badge badge-primary">MARCO</span> </div> - <div class="col-2"> + </div> + <div class="row"> + <div class="col-2 pr-0"> <img src="/assets/img/img-user3.jpg" class="creator-pic"> </div> <div class="col-10 pl-0"> @@ -120,11 +124,11 @@ </li> </ul> </li> - + <li class="nav-item"> <div class="btn-group viewBtns" role="group"> - <button (click)="convertAndOpenInDesingerView(viewedPackage.id)" - type="button" class="btn btn-secondary topologySource">Designer</button> + <button (click)="convertAndOpenInDesingerView(viewedPackage.id)" type="button" + class="btn btn-secondary topologySource">Designer</button> <button type="button" class="btn btn-secondary topologyView active">Scripting</button> </div> </li> @@ -148,9 +152,10 @@ </div> </ng-sidebar> -<div ng-sidebar-content id="board-paper"> - <ace-editor [(text)]="content" [mode]="'json'" [autoUpdateContent]="true" [durationBeforeCallback]="1000" - [theme]="'tomorrow_night_bright'" #editor style="height:500px"> - </ace-editor> + <div ng-sidebar-content id="board-paper"> + <ace-editor [(text)]="content" [mode]="'json'" [autoUpdateContent]="true" [durationBeforeCallback]="1000" + [theme]="'tomorrow_night_bright'" #editor style="height:500px"> + </ace-editor> - </div> + </div> +
\ No newline at end of file |