Styling for name and description section:

As part of this, the empty placeholder span was removed from the text input macro and the span will now be conditionall rendered if there is an error message
This commit is contained in:
leigh-mil
2019-10-10 11:11:53 -04:00
parent c3db3322df
commit 5a98e6966e
5 changed files with 19 additions and 33 deletions

View File

@@ -136,7 +136,7 @@
} }
.portfolio-content { .portfolio-content {
margin: 1 * $gap $gap 0 $gap; margin: (4 * $gap) $gap 0 $gap;
.panel { .panel {
@include shadow-panel; @include shadow-panel;
@@ -148,11 +148,6 @@
padding-bottom: 0; padding-bottom: 0;
} }
.subheading {
font-size: 1.4rem;
color: $color-gray;
}
.responsive-table-wrapper { .responsive-table-wrapper {
padding-bottom: $gap * 3; padding-bottom: $gap * 3;
margin-bottom: 0; margin-bottom: 0;

View File

@@ -44,4 +44,8 @@
flex-grow: 1; flex-grow: 1;
padding-right: $spacing-small; padding-right: $spacing-small;
} }
&.col--half {
width: 50%;
}
} }

View File

@@ -19,27 +19,17 @@
{% block application_content %} {% block application_content %}
<div class='subheading'>{{ 'portfolios.applications.settings.name_description' | translate }}</div> <h3>{{ 'portfolios.applications.settings.name_description' | translate }}</h3>
{% if user_can(permissions.EDIT_APPLICATION) %} {% if user_can(permissions.EDIT_APPLICATION) %}
<base-form inline-template> <base-form inline-template>
<form method="POST" action="{{ url_for('applications.update', application_id=application.id) }}"> <form method="POST" action="{{ url_for('applications.update', application_id=application.id) }}" class="col col--half">
<div class="panel">
<div class="panel__content">
{{ application_form.csrf_token }} {{ application_form.csrf_token }}
<div class="form-row">
<div class="form-col form-col--two-thirds">
{{ TextInput(application_form.name, optional=False) }} {{ TextInput(application_form.name, optional=False) }}
{{ TextInput(application_form.description, paragraph=True, optional=True) }} {{ TextInput(application_form.description, paragraph=True, optional=True, showOptional=False) }}
</div> <div class="action-group action-group--tight">
</div>
</div>
<div class="panel__footer">
<div class="action-group">
{{ SaveButton('common.save_changes'|translate) }} {{ SaveButton('common.save_changes'|translate) }}
</div> </div>
</div>
</div>
</form> </form>
</base-form> </base-form>
{% else %} {% else %}
@@ -71,6 +61,7 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
<hr>
{{ MemberManagementTemplate( {{ MemberManagementTemplate(
application, application,

View File

@@ -15,6 +15,7 @@
classes='', classes='',
noMaxWidth=False, noMaxWidth=False,
optional=True, optional=True,
showOptional=True,
showLabel=True, showLabel=True,
watch=False, watch=False,
show_validation=True) -%} show_validation=True) -%}
@@ -40,7 +41,7 @@
<label for={{field.name}}> <label for={{field.name}}>
<div class="usa-input__title"> <div class="usa-input__title">
{{ label }} {{ label }}
{% if optional %} {% if optional and showOptional %}
<span class="usa-input-label-helper">(optional)</span> <span class="usa-input-label-helper">(optional)</span>
{% endif %} {% endif %}
{% if tooltip and not disabled %} {% if tooltip and not disabled %}
@@ -108,12 +109,7 @@
/> />
{% if show_validation %} {% if show_validation %}
<template v-if='showError'> <span v-if='showError' class='usa-input__message' v-html='validationError'></span>
<span class='usa-input__message' v-html='validationError'></span>
</template>
<template v-else>
<span class='usa-input__message'></span>
</template>
{% endif %} {% endif %}
</div> </div>

View File

@@ -127,11 +127,11 @@ footer:
login: 'Last login:' login: 'Last login:'
forms: forms:
application: application:
description_label: Description description_label: Application Description
environment_names_label: Environment Name environment_names_label: Environment Name
environment_names_required_validation_message: Provide at least one environment name. environment_names_required_validation_message: Provide at least one environment name.
environment_names_unique_validation_message: Environment names must be unique. environment_names_unique_validation_message: Environment names must be unique.
name_label: Name name_label: Application Name
assign_ppoc: assign_ppoc:
dod_id: 'Select new primary point of contact:' dod_id: 'Select new primary point of contact:'
environments: environments:
@@ -371,7 +371,7 @@ portfolios:
new_application_title: New Application new_application_title: New Application
settings_heading: Application Settings settings_heading: Application Settings
settings: settings:
name_description: Name and Description name_description: Application name and description
team_members: Team Members team_members: Team Members
team_settings: team_settings:
blank_slate: blank_slate: