From 925d14d71d99f396c68de5b92ecf49f853b633d1 Mon Sep 17 00:00:00 2001
From: Pam Hiett <pam@instructure.com>
Date: Thu, 30 Mar 2017 10:29:36 -0600
Subject: [PATCH] fix theming colors on logout button

Fixes: CNVS-35812

test plan:
- as a user that is logged into local canvas
- navigate to localcanvas address /logout and you will see a screen
  that asks if you "really want to logout" the logout button
  should now match the ghost version of the login button

Change-Id: Id7bbbebb08d458bc0542138ba1b8dfd896062bbf
Reviewed-on: https://gerrit.instructure.com/106976
Tested-by: Jenkins
Reviewed-by: Stephen Jensen <sejensen@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
---
 app/stylesheets/pages/login/_ic-login.scss | 12 ------------
 app/views/login/logout_confirm.html.erb    |  6 ++++--
 spec/selenium/auth_spec.rb                 |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/app/stylesheets/pages/login/_ic-login.scss b/app/stylesheets/pages/login/_ic-login.scss
index ff7c4b08c11..6ba9ae3f20e 100644
--- a/app/stylesheets/pages/login/_ic-login.scss
+++ b/app/stylesheets/pages/login/_ic-login.scss
@@ -290,18 +290,6 @@ body.ic-Login-Body #footer.ic-Login-footer {
     }
   }
 }
-////
-// Logout
-////
-.Button--logout-confirm {
-  @include canvas-button($ic-brand-Login-Content-password-text-color,  $ic-brand-Login-Content-password-text-color)
-}
-.Button--logout-link {
-  color: $ic-brand-Login-footer-link-color;
-  &:hover {
-    color: $ic-brand-Login-footer-link-color-hover;
-  }
-}
 
 .ic-Login-confirmation__headline {
   margin: 0 0 $ic-sp;
diff --git a/app/views/login/logout_confirm.html.erb b/app/views/login/logout_confirm.html.erb
index 094cf279cca..c17e6f8c15e 100644
--- a/app/views/login/logout_confirm.html.erb
+++ b/app/views/login/logout_confirm.html.erb
@@ -20,9 +20,11 @@
           </p>
           <%= form_tag logout_path, method: :delete do %>
             <div class="ic-Login__actions">
-              <%= link_to(t(:cancel, "Cancel"), '/', :class => "Button Button--link Button--logout-link") %>
+              <%= link_to(t(:cancel, "Cancel"), '/', :class => "ic-Login__link") %>
               <div class="ic-Login__actions--right">
-                <%= submit_tag(t("Log Out"), :class => "Button Button--primary Button--logout-confirm") %>
+                <button type="submit" class="Button Button--login" id="Button--logout-confirm">
+                  <%= t("Log Out") %>
+                </button>
               </div>
             </div>
           <% end %>
diff --git a/spec/selenium/auth_spec.rb b/spec/selenium/auth_spec.rb
index 1c2867c0da8..e80bb2068d8 100644
--- a/spec/selenium/auth_spec.rb
+++ b/spec/selenium/auth_spec.rb
@@ -9,7 +9,7 @@ describe "auth" do
       login_as
 
       get "/logout"
-      f('.Button--logout-confirm').click
+      f('#Button--logout-confirm').click
 
       keep_trying_until {
         expect(driver.current_url).to match %r{/login/canvas}