Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

modify UI CSS and HTML code from Angular 13.3.0 clarity 2.4.11 #737

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

modify UI CSS and HTML code from Angular 13.3.0 clarity 2.4.11 #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
186 changes: 86 additions & 100 deletions h5c/vic/src/vic-webapp/src/app/create-vch-wizard/compute-capacity/compute-capacity.html
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 25 additions & 0 deletions h5c/vic/src/vic-webapp/src/app/create-vch-wizard/compute-capacity/compute-capacity.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,28 @@
.affinity-alerts .alert-item {
margin-bottom: 0px;
}

.advanced {
margin-left: -0.5rem;
}

#cpu-shares-selector {
width: 6.95rem;
}

#memory-shares-selector {
width: 6.95rem;
}

b {
color: #c92100;
}

.form .form-block>label, form .form-block>label {
font-size: .666667rem;
letter-spacing: .01em;
font-weight: 400;
color: #000;
margin-bottom: 0.25rem;
margin-top: 0.25rem;
}
92 changes: 46 additions & 46 deletions h5c/vic/src/vic-webapp/src/app/create-vch-wizard/general/general.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,17 @@
</clr-alert>
<p>Provide the name and log configuration for this new Virtual Container Host (VCH).</p>

<form [formGroup]="form" novalidate>
<form [formGroup]="form" novalidate class="clr-form clr-form-compact">
<section class="form-block">

<div class="form-group row">
<div class="col-xs-3">
<div class="clr-form-control clr-row">

<label for="nameInput" class="required">
<label for="nameInput" class="clr-control-label clr-col-12 clr-col-md-3 required">
VCH name
<b>*</b>
</label>

</div>
<div class="col-xs-7">
<div class="clr-control-container clr-col-12 clr-col-md-7">

<label for="nameInput"
aria-haspopup="true"
Expand All @@ -29,7 +28,7 @@
[class.invalid]="form.get('name').invalid">

<input id="nameInput"
class="form-control"
class="clr-input"
type="text"
placeholder="Enter virtual container host name"
formControlName="name">
Expand Down Expand Up @@ -63,50 +62,37 @@
</clr-signpost>

</div>
<div class="form-group row">
<div class="col-xs-3">
<div class="clr-form-control clr-row">

<label for="nameInput">
<label for="nameInput" class="clr-control-label clr-col-12 clr-col-md-3">
Container VM name template
</label>

</div>
<div class="col-xs-2">
<div class="clr-control-container clr-col-12 clr-col-md-2">

<input id="container-name-convention-prefix"
class="form-control"
class="clr-input"
type="text"
placeholder="Prefix"
formControlName="containerNameConventionPrefix">

<small class="text-muted text-nowrap" style="line-height: 1.5em">
Example container VM names generated by this VCH using this template:<br>
<span *ngIf="form.get('containerNameConvention').value === '{name}'" class="my-0">
{{ form.get('containerNameConventionPrefix').value }}spleepy_kowalevski{{ form.get('containerNameConventionPostfix').value }}<br>
{{ form.get('containerNameConventionPrefix').value }}jolly_nobel{{ form.get('containerNameConventionPostfix').value }}
</span>
<span *ngIf="form.get('containerNameConvention').value === '{id}'" class="my-0">
{{ form.get('containerNameConventionPrefix').value }}4c01db0b339c{{ form.get('containerNameConventionPostfix').value }}<br>
{{ form.get('containerNameConventionPrefix').value }}d7886598dbe2{{ form.get('containerNameConventionPostfix').value }}
</span>
</small>

</div>
<div class="col-xs-3">
<div class="clr-control-container clr-col-12 clr-col-md-3">

<div class="select form-control">
<div class="clr-select-wrapper">
<select id="container-name-convention-selector"
class="clr-select"
formControlName="containerNameConvention">
<option value="{name}">Docker name</option>
<option value="{id}">Container ID</option>
</select>
</div>

</div>
<div class="col-xs-2">
<div class="clr-control-container clr-col-12 clr-col-md-2">

<input id="container-name-convention-postfix"
class="form-control"
class="clr-input"
type="text"
placeholder="Suffix"
formControlName="containerNameConventionPostfix">
Expand All @@ -120,25 +106,40 @@
</span>
</clr-signpost-content>
</clr-signpost>

</div>
<div class="clr-form-control clr-row">
<div class="clr-control-container clr-col-12 clr-col-md-3">

</div>
<div class="clr-control-container clr-col-12 clr-col-md-7">
<small class="text-muted text-nowrap" style="line-height: 1.5em">
Example container VM names generated by this VCH using this template:<br>
<span *ngIf="form.get('containerNameConvention').value === '{name}'" class="my-0">
{{ form.get('containerNameConventionPrefix').value }}spleepy_kowalevski{{ form.get('containerNameConventionPostfix').value }}<br>
{{ form.get('containerNameConventionPrefix').value }}jolly_nobel{{ form.get('containerNameConventionPostfix').value }}
</span>
<span *ngIf="form.get('containerNameConvention').value === '{id}'" class="my-0">
{{ form.get('containerNameConventionPrefix').value }}4c01db0b339c{{ form.get('containerNameConventionPostfix').value }}<br>
{{ form.get('containerNameConventionPrefix').value }}d7886598dbe2{{ form.get('containerNameConventionPostfix').value }}
</span>
</small>
</div>
</div>
</section>

<p>Set level of logging and an endpoint for log aggregation.</p>

<section class="form-block">

<div class="form-group row">
<div class="col-xs-3">
<div class="clr-form-control clr-row">

<label for="debug-level-selector">Debug</label>
<label for="debug-level-selector" class="clr-control-label clr-col-12 clr-col-md-3">Debug</label>

</div>
<div class="col-xs-5">
<div class="clr-control-container clr-col-12 clr-col-md-5">

<div class="select form-control">
<div class="clr-select-wrapper">
<select id="debug-level-selector"
class="clr-select"
formControlName="debug">
<option value="0">0 - Verbose logging is disabled</option>
<option value="1">1 - Provides extra verbosity in the logs</option>
Expand All @@ -160,16 +161,15 @@

</div>

<div class="form-group row">
<div class="col-xs-3">
<div class="clr-form-control clr-row">

<label for="debug-level-selector">Syslog</label>
<label for="debug-level-selector" class="clr-control-label clr-col-12 clr-col-md-3">Syslog</label>

</div>
<div class="col-xs-2">
<div class="clr-control-container clr-col-12 clr-col-md-2">

<div class="select form-control">
<div class="clr-select-wrapper">
<select id="syslog-transport-selector"
class="clr-select"
formControlName="syslogTransport">
<option value="tcp">tcp</option>
<option value="udp">udp</option>
Expand All @@ -178,17 +178,17 @@

</div>
<span class="mx-0 px-0">://</span>
<div class="col-xs-3">
<div class="clr-control-container clr-col-12 clr-col-md-3">

<input id="syslog-host-selector"
class="form-control"
class="clr-input"
placeholder="IP or FQDN"
type="text"
formControlName="syslogHost">

</div>
<span class="mx-0 px-0">:</span>
<div class="col-xs-2">
<div class="clr-control-container clr-col-12 clr-col-md-2">

<label for="syslog-port-selector"
aria-haspopup="true"
Expand All @@ -197,7 +197,7 @@
[class.invalid]="form.get('syslogPort').invalid && (form.get('syslogPort').dirty || form.get('syslogPort').touched)">

<input id="syslog-port-selector"
class="form-control"
class="clr-input"
placeholder="Port"
type="text"
formControlName="syslogPort">
Expand Down
8 changes: 8 additions & 0 deletions h5c/vic/src/vic-webapp/src/app/create-vch-wizard/general/general.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,11 @@
margin-top: 0;
margin-bottom: 0;
}

.text-muted {
color: #818a91!important;
}

b {
color: #c92100;
}
Loading