From ba7a18133c2ade5ce6af23fa21aebacd61b15e34 Mon Sep 17 00:00:00 2001 From: Eric Guo Date: Sun, 27 Sep 2015 09:22:42 +0800 Subject: [PATCH] login original match with current spree master (3.1.0.beta) --- app/overrides/auth_shared_login_bar.rb | 4 ++-- .../_header/auth_admin_login_navigation_bar.html.erb.deface | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/overrides/auth_shared_login_bar.rb b/app/overrides/auth_shared_login_bar.rb index 54a539a20..86a5ce49d 100644 --- a/app/overrides/auth_shared_login_bar.rb +++ b/app/overrides/auth_shared_login_bar.rb @@ -2,6 +2,6 @@ :name => "auth_shared_login_bar", :insert_before => "li#search-bar", :partial => "spree/shared/login_bar", - :disabled => false, - :original => 'eb3fa668cd98b6a1c75c36420ef1b238a1fc55ac') + :disabled => false, + :original => 'c00d67dfc0496d21a351b48c41a728412cb5ed2c') diff --git a/app/overrides/spree/admin/shared/_header/auth_admin_login_navigation_bar.html.erb.deface b/app/overrides/spree/admin/shared/_header/auth_admin_login_navigation_bar.html.erb.deface index d253880b3..16bbfa0df 100644 --- a/app/overrides/spree/admin/shared/_header/auth_admin_login_navigation_bar.html.erb.deface +++ b/app/overrides/spree/admin/shared/_header/auth_admin_login_navigation_bar.html.erb.deface @@ -1,4 +1,4 @@ + original '71d12ae155143c6ea8090942955299485f534153' --> <%= render partial: "spree/layouts/admin/login_nav" %>