aheathershaw/blue-twilight
1
0
Fork 0
Code Issues 32 Pull Requests Releases 15 Wiki Activity

Merge user settings page #101

Merged
aheathershaw merged 8 commits from feature/99-user-settings-page into master 2018-09-12 21:25:02 +01:00
Conversation 1 Commits 8 Files Changed 15 +2 -4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e4863af668 - Show all commits

3
resources/views/themes/base/partials/login.blade.php
View File

@ -2,9 +2,8 @@
@if (UserConfig::isSocialMediaLoginEnabled()) @if (UserConfig::isSocialMediaLoginEnabled())
<p>@lang('auth.social_login')</p> <p>@lang('auth.social_login')</p>
@include(Theme::viewName('partials.social_login_providers')) @include(Theme::viewName('partials.social_login_providers'))
@endif
<p class="mt-5 mb-4">@lang('auth.email_password_login')</p> <p class="mt-5 mb-4">@lang('auth.email_password_login')</p>
@endif
@else @else
<p>@lang('auth.email_password_login_sso')</p> <p>@lang('auth.email_password_login_sso')</p>
<p class="mb-5">@lang('auth.email_password_login_sso_2')</p> <p class="mb-5">@lang('auth.email_password_login_sso_2')</p>

3
resources/views/themes/base/partials/register.blade.php
View File

@ -2,9 +2,8 @@
@if (UserConfig::isSocialMediaLoginEnabled()) @if (UserConfig::isSocialMediaLoginEnabled())
<p>@lang('auth.social_register')</p> <p>@lang('auth.social_register')</p>
@include(Theme::viewName('partials.social_login_providers')) @include(Theme::viewName('partials.social_login_providers'))
@endif
<p class="mt-5 mb-4">@lang('auth.email_password_register')</p> <p class="mt-5 mb-4">@lang('auth.email_password_register')</p>
@endif
@else @else
<p class="mb-4">@lang('auth.email_password_register_sso')</p> <p class="mb-4">@lang('auth.email_password_register_sso')</p>
@endif @endif