From d16f599db9ff7a6692fb958c72681f7a3cc5284d Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 11 Jun 2018 12:58:56 -0400
Subject: [PATCH] fixes for duo

---
 src/app/accounts/two-factor.component.html |  4 ++--
 src/scss/styles.scss                       | 11 +++++++++++
 webpack.config.js                          |  7 +++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/app/accounts/two-factor.component.html b/src/app/accounts/two-factor.component.html
index 94892bb37b..9b5d468472 100644
--- a/src/app/accounts/two-factor.component.html
+++ b/src/app/accounts/two-factor.component.html
@@ -1,6 +1,6 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container">
     <div class="row justify-content-md-center mt-5">
-        <div class="col-5">
+        <div class="col-5" [ngClass]="{'col-9': selectedProviderType === providerType.Duo || selectedProviderType === providerType.OrganizationDuo}">
             <p class="lead text-center mb-4">{{title}}</p>
             <div class="card">
                 <div class="card-body">
@@ -38,7 +38,7 @@
                     </ng-container>
                     <ng-container *ngIf="selectedProviderType === providerType.Duo ||
                         selectedProviderType === providerType.OrganizationDuo">
-                        <div id="duo-frame">
+                        <div id="duo-frame" class="mb-3">
                             <iframe id="duo_iframe"></iframe>
                         </div>
                     </ng-container>
diff --git a/src/scss/styles.scss b/src/scss/styles.scss
index 55f57d0229..3ce3ca6b9d 100644
--- a/src/scss/styles.scss
+++ b/src/scss/styles.scss
@@ -289,3 +289,14 @@ app-login {
         display: block;
     }
 }
+
+#duo-frame {
+    background: url('../images/loading.svg') 0 0 no-repeat;
+    height: 330px;
+
+    iframe {
+        width: 100%;
+        height: 100%;
+        border: none;
+    }
+}
diff --git a/webpack.config.js b/webpack.config.js
index b9257fe1be..190c06d90e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -38,15 +38,14 @@ const moduleRules = [
     },
     {
         test: /\.(jpe?g|png|gif|svg)$/i,
-        exclude: /.*(fontawesome-webfont|glyphicons-halflings-regular)\.svg/,
+        exclude: /.*(fontawesome-webfont)\.svg/,
         use: [{
             loader: 'file-loader',
             options: {
                 name: '[name].[ext]',
                 outputPath: 'images/',
-                publicPath: './images/',
-            },
-        }],
+            }
+        }]
     },
     {
         test: /\.scss$/,