Fixed merge errors
This commit is contained in:
parent
3d1ba5cfce
commit
0066c9f343
2 changed files with 2 additions and 1 deletions
|
@ -68,7 +68,7 @@ const people = [
|
||||||
>
|
>
|
||||||
<a
|
<a
|
||||||
href="https://git.gra.phite.ro/BlahajTeam/next-app"
|
href="https://git.gra.phite.ro/BlahajTeam/next-app"
|
||||||
className="mt-10 block rounded-md bg-blue-500 text-base text-center text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
|
className="rounded-md text-sm font-semibold text-gray-200 shadow-sm hover:text-gray-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-white"
|
||||||
style={{maxWidth: '250px', paddingLeft: '50px', paddingRight: '50px', paddingTop: '20px', paddingBottom: '20px', alignSelf: 'center'}}
|
style={{maxWidth: '250px', paddingLeft: '50px', paddingRight: '50px', paddingTop: '20px', paddingBottom: '20px', alignSelf: 'center'}}
|
||||||
>
|
>
|
||||||
<DocumentTextIcon></DocumentTextIcon>
|
<DocumentTextIcon></DocumentTextIcon>
|
||||||
|
|
|
@ -30,6 +30,7 @@ const TopicCard = ({ title, children, link }: { title: string, children: any, li
|
||||||
className="mt-10 block w-full rounded-md bg-blue-500 text-center text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
|
className="mt-10 block w-full rounded-md bg-blue-500 text-center text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
|
||||||
style={{ paddingLeft: '50px', paddingRight: '50px', paddingTop: '20px', paddingBottom: '20px'}}
|
style={{ paddingLeft: '50px', paddingRight: '50px', paddingTop: '20px', paddingBottom: '20px'}}
|
||||||
>
|
>
|
||||||
|
|
||||||
Begin
|
Begin
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue