Merge pull request #1112 from dod-ccpo/app-settings-styling

App settings styling (part 1)

templates/components/sticky_cta.html

@@ -1,14 +1,7 @@
 {% from 'components/icon.html' import Icon %}
 
-{% macro StickyCTA(text, context=None, return_link_url=None, return_link_text=None) -%}
+{% macro StickyCTA(text, context=None) -%}
   <div class="sticky-cta" v-sticky='{ "stickyBitStickyOffset": 76 }'>
-    {% if return_link_url and return_link_text %}
-    <div class="sticky-cta-return-link">
-      <a href="{{ return_link_url }}">
-        {{ Icon('caret_left', classes="icon--tiny icon--blue") }} {{ return_link_text}}
-      </a>
-    </div>
-    {% endif %}
     <div class="sticky-cta-container">
       <div class="sticky-cta-text">
         <h3>{{ text }}</h3>

templates/components/text_input.html

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