From c80e32975e253ab527ace236d9867f0230525dea Mon Sep 17 00:00:00 2001 From: nhertz <nhertz@nrao.edu> Date: Wed, 4 Aug 2021 10:20:02 -0600 Subject: [PATCH] Updated capability definition to be more in line with the design of the other components on the page and to reduce confusion --- .../capability-request.component.html | 5 ++++- .../capability-definition.component.html | 15 ++++++++++----- .../capability-definition.component.scss | 4 +--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/apps/web/src/app/workspaces/components/capability-request/capability-request.component.html b/apps/web/src/app/workspaces/components/capability-request/capability-request.component.html index 64bce7fcf..71c227ef8 100644 --- a/apps/web/src/app/workspaces/components/capability-request/capability-request.component.html +++ b/apps/web/src/app/workspaces/components/capability-request/capability-request.component.html @@ -5,7 +5,10 @@ <div id="definition-parameters-and-versions" class="container-fluid"> <div class="row"> <div id="capability-definition-container" class="col-5"> - <span id="capability-label">Capability</span> + <span id="capability-label" + >Capability: + <strong class="pl-1">{{ capabilityRequest.capability_name.toUpperCase() }}</strong></span + > <app-capability-definition *ngIf="capability !== undefined" id="capability-definition" diff --git a/apps/web/src/app/workspaces/components/capability-request/components/capability-definition/capability-definition.component.html b/apps/web/src/app/workspaces/components/capability-request/components/capability-definition/capability-definition.component.html index 23db6c981..f985ce547 100644 --- a/apps/web/src/app/workspaces/components/capability-request/components/capability-definition/capability-definition.component.html +++ b/apps/web/src/app/workspaces/components/capability-request/components/capability-definition/capability-definition.component.html @@ -1,12 +1,17 @@ -<div id="definition-container"> - <h5 id="capability-name"><strong>{{ capability.name.toUpperCase() }}</strong></h5> +<div id="definition-container" class="container-fluid rounded-top rounded-3 py-2"> + <!-- <h5 id="capability-name"><strong>{{ capability.name.toUpperCase() }}</strong></h5>--> - <div id="step-sequence" class="container-fluid"> + <div id="step-sequence"> <div - class="capability-step row rounded rounded-lg mb-1 py-2 align-items-center" + class="capability-step row rounded rounded-lg my-2 mx-1 py-2 align-items-center" *ngFor="let step of capabilityStepList" > - <span class="col text-left px-3">{{ step[0].toUpperCase() }} <strong *ngIf="step[1] !== undefined">{{ step[1].toUpperCase() }}</strong></span> + <span class="col text-left px-3" + >{{ step[0].toUpperCase() }} + <strong class="pl-2" *ngIf="step[1] !== undefined">{{ + step[1].toUpperCase() + }}</strong></span + > </div> </div> </div> diff --git a/apps/web/src/app/workspaces/components/capability-request/components/capability-definition/capability-definition.component.scss b/apps/web/src/app/workspaces/components/capability-request/components/capability-definition/capability-definition.component.scss index 690233c44..31f4c1ade 100644 --- a/apps/web/src/app/workspaces/components/capability-request/components/capability-definition/capability-definition.component.scss +++ b/apps/web/src/app/workspaces/components/capability-request/components/capability-definition/capability-definition.component.scss @@ -6,8 +6,6 @@ #definition-container { background-color: white; - border-radius: 10px; - border-top: 4px $container-shadow-color solid; - padding: 0.25rem 0.5rem; + //padding: 0.25rem 0.5rem; } -- GitLab