Resolve conflcits
This commit is contained in:
@@ -24,10 +24,9 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel">
|
||||
<div class="block-list project-list-item">
|
||||
<header class="block-list__header">
|
||||
<h3 class="block-list__title">Project Environments</h3>
|
||||
<h2 class="block-list__title">Project Environments</h2>
|
||||
{{ Tooltip(
|
||||
"Each environment created within a project is an enclave of cloud resources that is logically separated from each other for increased security.",
|
||||
title="learn more"
|
||||
@@ -35,7 +34,7 @@
|
||||
</header>
|
||||
|
||||
<ul>
|
||||
<li v-for="(_, i) in environments" class="block-list__item">
|
||||
<li v-for="(_, i) in environments" class="block-list__item project-list-item__environment">
|
||||
<span class="project-list-item__environment">
|
||||
{{ TextInput(form.environment_name) }}
|
||||
<span v-on:click="removeEnvironment(i)">{{ Icon('x') }}</span>
|
||||
@@ -47,7 +46,7 @@
|
||||
</div>
|
||||
|
||||
<div class="action-group">
|
||||
<input type="submit" value="Create Project" class="action-group__action usa-button usa-button-big">
|
||||
<input type="submit" value="Create Project" class="usa-button usa-button-primary">
|
||||
<a href="{{ url_for('workspaces.workspace_projects', workspace_id=workspace.id) }}" class="action-group__action">Cancel</a>
|
||||
</div>
|
||||
</form>
|
||||
|
Reference in New Issue
Block a user