logo and favicon changes

# Conflicts: # resources/scripts/components/auth/LoginFormContainer.tsx # resources/scripts/components/elements/PageContentBlock.tsx # resources/views/layouts/admin.blade.php
pelican-dev · Apr 12, 2024 · 7c57520 · 7c57520
1 parent 01f63f7
commit 7c57520
Show file tree

Hide file tree

Showing 6 changed files with 189 additions and 17 deletions.
diff --git a/public/pelican.ico b/public/pelican.ico
diff --git a/public/pelican.svg b/public/pelican.svg
diff --git a/resources/scripts/components/auth/LoginFormContainer.tsx b/resources/scripts/components/auth/LoginFormContainer.tsx
@@ -34,12 +34,14 @@ export default forwardRef<HTMLFormElement, Props>(({ title, ...props }, ref) =>
         <FlashMessageRender css={tw`mb-2 px-1`} />
         <Form {...props} ref={ref}>
             <div css={tw`md:flex w-full bg-white shadow-lg rounded-lg p-6 md:pl-0 mx-1`}>
-                <div css={tw`flex-none select-none mb-6 md:mb-0 self-center`}>
-                    <img css={tw`block w-48 md:w-64 mx-auto`} />
+                <div css={tw`flex-none select-none mb-6 md:mb-0 self-center p-6`}>
+                    <img src={'/pelican.svg'} css={tw`block w-48 md:w-64 mx-auto`} />
                 </div>
                 <div css={tw`flex-1`}>{props.children}</div>
             </div>
         </Form>
-        <p css={tw`text-center text-neutral-500 text-xs mt-4`}>&copy; 2015 - {new Date().getFullYear()}&nbsp;</p>
+        <p css={tw`text-center text-neutral-500 text-xs mt-4`}>
+            Pelican &copy; 2024 - {new Date().getFullYear()}&nbsp;
+        </p>
     </Container>
 ));
diff --git a/resources/scripts/components/elements/PageContentBlock.tsx b/resources/scripts/components/elements/PageContentBlock.tsx
@@ -34,7 +34,7 @@ const PageContentBlock: React.FC<PageContentBlockProps> = ({ title, showFlashKey
                         >
                             Panel
                         </a>
-                        &nbsp;&copy; 2015 - {new Date().getFullYear()}
+                        &nbsp;Pelican&copy; 2024 - {new Date().getFullYear()}
                     </p>
                 </ContentContainer>
             </>

diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php
@@ -7,13 +7,7 @@
         <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
         <meta name="_token" content="{{ csrf_token() }}">
 
-        <link rel="apple-touch-icon" sizes="180x180" href="/favicons/apple-touch-icon.png">
-        <link rel="icon" type="image/png" href="/favicons/favicon-32x32.png" sizes="32x32">
-        <link rel="icon" type="image/png" href="/favicons/favicon-16x16.png" sizes="16x16">
-        <link rel="manifest" href="/favicons/manifest.json">
-        <link rel="mask-icon" href="/favicons/safari-pinned-tab.svg" color="#bc6e3c">
-        <link rel="shortcut icon" href="/favicons/favicon.ico">
-        <meta name="msapplication-config" content="/favicons/browserconfig.xml">
+        <link rel="icon" type="image/x-icon" href="/pelican.ico">
         <meta name="theme-color" content="#0e4688">
 
         @include('layouts.scripts')

diff --git a/resources/views/templates/wrapper.blade.php b/resources/views/templates/wrapper.blade.php
@@ -9,12 +9,7 @@
             <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
             <meta name="csrf-token" content="{{ csrf_token() }}">
             <meta name="robots" content="noindex">
-            <link rel="apple-touch-icon" sizes="180x180" href="/favicons/apple-touch-icon.png">
-            <link rel="icon" type="image/png" href="/favicons/favicon-32x32.png" sizes="32x32">
-            <link rel="icon" type="image/png" href="/favicons/favicon-16x16.png" sizes="16x16">
-            <link rel="manifest" href="/favicons/manifest.json">
-            <link rel="mask-icon" href="/favicons/safari-pinned-tab.svg" color="#bc6e3c">
-            <link rel="shortcut icon" href="/favicons/favicon.ico">
+            <link rel="shortcut icon" href="/pelican.ico">
             <meta name="msapplication-config" content="/favicons/browserconfig.xml">
             <meta name="theme-color" content="#0e4688">
         @show