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>
This commit is contained in:
parent
048d576f83
commit
925d14d71d
|
@ -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;
|
||||
|
|
|
@ -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 %>
|
||||
|
|
|
@ -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}
|
||||
|
|
Loading…
Reference in New Issue