pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve conflcits

Browse Source
This commit is contained in:
luis cielak 2018-08-21 16:09:22 -04:00 committed by richard-dds
parent be47b2dea0
commit c5013f9028
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
styles/sections/_projects_list.scss
View File

@ -4,6 +4,10 @@
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
.usa-input {
margin: 0;
}
.project-list-item__environment__link { .project-list-item__environment__link {
@include icon-link; @include icon-link;
@include icon-link-large; @include icon-link-large;

7
templates/workspace_project_new.html
View File

@ -24,10 +24,9 @@
</div> </div>
</div> </div>
<div class="panel">
<div class="block-list project-list-item"> <div class="block-list project-list-item">
<header class="block-list__header"> <header class="block-list__header">
<h3 class="block-list__title">Project Environments</h3> <h2 class="block-list__title">Project Environments</h2>
{{ Tooltip( {{ Tooltip(
"Each environment created within a project is an enclave of cloud resources that is logically separated from each other for increased security.", "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" title="learn more"
@ -35,7 +34,7 @@
</header> </header>
<ul> <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"> <span class="project-list-item__environment">
{{ TextInput(form.environment_name) }} {{ TextInput(form.environment_name) }}
<span v-on:click="removeEnvironment(i)">{{ Icon('x') }}</span> <span v-on:click="removeEnvironment(i)">{{ Icon('x') }}</span>
@ -47,7 +46,7 @@
</div> </div>
<div class="action-group"> <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> <a href="{{ url_for('workspaces.workspace_projects', workspace_id=workspace.id) }}" class="action-group__action">Cancel</a>
</div> </div>
</form> </form>