Merge b3cca7e into 2d4de01

cfpb · Jun 21, 2019 · 74d5659 · 74d5659
2 parents 2d4de01 + b3cca7e
commit 74d5659
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 71 deletions.
diff --git a/paying_for_college/templates/worksheet.html b/paying_for_college/templates/worksheet.html
@@ -152,7 +152,7 @@ <h2 class="verify_prompt">
                                         calculate your total debt after
                                         graduation.
                                     </p>
-                                    <div class="cf-select">
+                                    <div class="a-select">
                                         <select id="estimated-years-attending">
                                             <option value="0.5">
                                                 6 months
@@ -2565,7 +2565,7 @@ <h4 class="aid-form_title">
                                             be higher or lower.
                                         </p>
                                         <div class="estimated-expenses_region">
-                                            <div class="cf-select">
+                                            <div class="a-select">
                                               <select id="bls-region-select">
                                                 <option value="WE">West region</option>
                                                 <option value="SO">South region</option>

diff --git a/src/disclosures/css/cf-enhancements.less b/src/disclosures/css/cf-enhancements.less
@@ -302,72 +302,6 @@ a.btn__full-small.btn__link {
   }
 }
 
-/* ==========================================================================
-   Capital Framework <select>
-   from https://github.com/cfpb/cfgov-refresh/blob/3a3a42dc08d644c93016bcd789f719ce5807fb77/cfgov/unprocessed/css/forms.less
-   ========================================================================== */
-
-.cf-select {
-    position: relative;
-    margin-top: 0.5em;
-    border: 1px solid @gray-40;
-
-    select {
-        height: unit( 30px / @base-font-size-px, em );
-        width: 100%;
-        padding: unit( 4px / @base-font-size-px, em )
-                 unit( 6px / @base-font-size-px, em );
-        border: 0;
-        outline: 2px solid transparent;
-        font: @webfont-regular;
-        appearance: none;
-        background-color: @white;
-        color: @black;
-
-        &:hover,
-        &:active,
-        &:focus {
-            outline-color: @pacific;
-            outline-offset: 0;
-        }
-    }
-
-    select[disabled] {
-        color: @gray-60;
-        background-color: @gray-10;
-    }
-
-    select option:disabled {
-        color: @gray-60;
-    }
-
-    &:after {
-        width: unit( @select-height / @base-font-size-px, em );
-        box-sizing: border-box;
-        border-left: 1px solid @select-border;
-        position: absolute;
-        top: 0;
-        right: 0;
-        bottom: 0;
-        background-color: @select-icon-bg;
-        content: '';
-        pointer-events: none;
-        background-image: url( '../icons/down.svg' );
-        background-size: auto @cf-icon-height;
-        background-repeat: no-repeat;
-        background-position: center center;
-    }
-}
-
-.no-csspointerevents .cf-select {
-    &:after {
-        height: 0;
-        width: 0;
-        border: 0;
-        content: '';
-    }
-}
-
 /* ==========================================================================
    Accessible bleedbar
    ========================================================================== */

diff --git a/src/disclosures/css/cf-theme-overrides.less b/src/disclosures/css/cf-theme-overrides.less
@@ -164,9 +164,7 @@
 /* cf-icons
    ========================================================================== */
 
-@cf-icon-prefix:                cf-icon;
-@cf-icon-path:                  '../fonts';
-@cf-icon-ie7-support:           true;
+@cf-icon-path:                  '/static/icons';
 
 
 /* cf-layout