Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated X formerly know as Twitter's icon #864

Merged
merged 1 commit into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/running.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ These developer docker instances are quite different from [kanka.io](https://kan
* No security, no automatic backups.
* No support for premium campaigns and subscriber bonuses.
* No advanced caching, meaning that as the data grows, the app will become much slower.
* No third-party setup like discord, google/meta/twitter logins, stripe, or analytics.
* No third-party setup like discord, google/meta/x (formerly twitter) logins, stripe, or analytics.
* No emails and no campaign exports are generated.
* No access to the third party tools Kanka pays for like FontAwesome PRO, meaning some icons in the app won't work.
* And lastly, **limited support from the Kanka team to debug your local setup**.
Expand Down
5 changes: 3 additions & 2 deletions lang/en/auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
],
'login_with_facebook' => 'Login with Facebook',
'login_with_google' => 'Login with Google',
'login_with_twitter' => 'Login with Twitter',
'login_with_x' => 'Login with X (formerly Twitter)',
'new_account' => 'Register a new account',
'or' => 'OR',
'password_forgotten' => 'Forgot your password?',
Expand All @@ -58,7 +58,7 @@
'log-in' => 'Log in',
'register_with_facebook' => 'Register with Facebook',
'register_with_google' => 'Register with Google',
'register_with_twitter' => 'Register with Twitter',
'register_with_x' => 'Register with X (formerly Twitter)',
'submit' => 'Register',
'title' => 'Register',
'tos' => 'By registering an account, you agree to our :terms and :privacy.',
Expand All @@ -78,4 +78,5 @@
'title' => 'Two-Factor Authentication',
],
'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
'x-twitter' => 'X formerly known as Twitter',
];
6 changes: 3 additions & 3 deletions resources/views/auth/login.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@
@endif

@if(config('services.twitter.client_id'))
<a href="{{ route('auth.provider', ['provider' => 'twitter']) }}" class="rounded border border-blue-300 text-blue-300 hover:text-white hover:bg-blue-300 px-6 py-2 uppercase transition-all duration-150" title="{{ __('auth.login.login_with_twitter') }}">
<x-icon class="fa-brands fa-twitter" />
Twitter
<a href="{{ route('auth.provider', ['provider' => 'twitter']) }}" class="rounded border border-blue-300 text-blue-300 hover:text-white hover:bg-blue-300 px-6 py-2 uppercase transition-all duration-150" title="{{ __('auth.login.login_with_x') }}">
<x-icon class="fa-brands fa-x-twitter" />
X
</a>
@endif
</div>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/auth/register.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@
@endif

@if(config('services.twitter.client_id'))
<a href="{{ route('auth.provider', ['provider' => 'twitter']) }}" class="rounded border border-blue-300 text-blue-300 hover:text-white hover:bg-blue-300 px-6 py-2 uppercase transition-all duration-150" title="{{ __('auth.register.register_with_twitter') }}">
<x-icon class="fa-brands fa-twitter" />
Twitter
<a href="{{ route('auth.provider', ['provider' => 'twitter']) }}" class="rounded border border-blue-300 text-blue-300 hover:text-white hover:bg-blue-300 px-6 py-2 uppercase transition-all duration-150" title="{{ __('auth.register.register_with_x') }}">
<x-icon class="fa-brands fa-x-twitter" />
X
</a>
@endif
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/layouts/_socials.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</svg>
</a>
<a href="https://kanka.io/go/twitter">
<svg aria-label="X formerly known as Twitter" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" fill="currentcolor" class="w-7 h-7"><path d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"></path></svg>
<svg aria-label="{{ __('auth.x-twitter') }}" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" fill="currentcolor" class="w-7 h-7"><path d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"></path></svg>
</a>
<a href="https://kanka.io/go/github">
<svg aria-label="Github" viewBox="0 0 98 96" xmlns="http://www.w3.org/2000/svg" class="w-7 h-7"><path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="currentcolor"></path></svg>
Expand Down
Loading