Skip to content

Commit

Permalink
Merge pull request #6 from khasyah-fr/master
Browse files Browse the repository at this point in the history
Conflict
  • Loading branch information
danivideda authored Dec 1, 2020
2 parents da74ba3 + 8ab686b commit 106d899
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
10 changes: 5 additions & 5 deletions resources/views/auth/login-student.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<img class="w-5/6 lg:mr-0" src="{{ asset('img/student-illustration.png') }}">
</div>
<div class="flex flex-col w-full xl:w-5/12 justify-center overflow-y-hidden">
<div class="bg-blue-500 px-4 py-8">
<span class="text-black font-extrabold text-center text-3xl inline mx-9 text-underline-custom"> LOGIN </span>
<p class="text-black font-extrabold text-center text-3xl inline mx-9 "> | </p>
<a class="text-gray-600 hover:text-black font-extrabold text-center text-3xl inline mx-9" href="{{ route('register.student') }}"> SIGN UP </a>
<div class="bg-blue-500 px-4 py-8 flex gap-2">
<span class="text-black font-extrabold text-center text-3xl inline mx-auto text-underline-custom"> LOGIN </span>
<p class="text-black font-extrabold text-center text-3xl inline mx-auto"> | </p>
<a class="text-gray-600 font-extrabold text-center text-3xl inline mx-auto" href="{{ route('register.student') }}"> SIGN UP </a>
</div>
<div class="bg-white pb-16 pt-5 px-20">
<div>
<p class="pt-2 text-black">Currently loging in as <span class="font-bold text-black">Student</span>.</p>
<p class="pt-2 text-black">Currently logging in as <span class="font-bold text-black">Student</span>.</p>
<p class="pb-4 text-gray-500 text-sm"> or login as Teacher <a class="underline" href="{{route('login.teacher')}}">here</a></p>
@if (session('status'))
<div class="bg-red-400 p-4 rounded-lg mb-6 text-white text-center">
Expand Down
10 changes: 5 additions & 5 deletions resources/views/auth/login-teacher.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<img class="w-5/6 lg:mr-0" src="{{ asset('img/teacher-illustration.svg') }}">
</div>
<div class="flex flex-col w-full xl:w-5/12 justify-center overflow-y-hidden">
<div class="bg-blue-500 px-4 py-8">
<span class="text-black font-extrabold text-center text-3xl inline mx-9 text-underline-custom"> LOGIN </span>
<p class="text-black font-extrabold text-center text-3xl inline mx-9 "> | </p>
<a class="text-gray-600 hover:text-black font-extrabold text-center text-3xl inline mx-9" href="{{ route('register.teacher') }}"> SIGN UP </a>
<div class="bg-blue-500 px-4 py-8 flex gap-2">
<span class="text-black font-extrabold text-center text-3xl inline mx-auto text-underline-custom"> LOGIN </span>
<p class="text-black font-extrabold text-center text-3xl inline mx-auto"> | </p>
<a class="text-gray-600 font-extrabold text-center text-3xl inline mx-auto" href="{{ route('register.teacher') }}"> SIGN UP </a>
</div>
<div class="bg-white pb-16 pt-5 px-20">
<div>
<p class="pt-2 text-black">Currently loging in as <span class="font-bold text-black">Teacher</span>.</p>
<p class="pt-2 text-black">Currently logging in as <span class="font-bold text-black">Teacher</span>.</p>
<p class="pb-4 text-gray-500 text-sm"> or login as Student <a class="underline" href="{{route('login.student')}}">here</a></p>
@if (session('status'))
<div class="bg-red-400 p-4 rounded-lg mb-6 text-white text-center">
Expand Down
8 changes: 4 additions & 4 deletions resources/views/auth/register-student.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<img class="w-5/6 lg:mr-0" src="{{ asset('img/student-illustration.png') }}">
</div>
<div class="flex flex-col w-full xl:w-5/12 justify-center overflow-y-hidden">
<div class="bg-blue-500 px-4 py-8">
<a class="text-gray-600 hover:text-black font-extrabold text-center text-3xl inline mx-9" href="{{ route('login.student') }}"> LOGIN </a>
<p class="text-black font-extrabold text-center text-3xl inline mx-9 "> | </p>
<span class="text-black font-extrabold text-center text-3xl inline mx-9 text-underline-custom"> SIGN UP </span>
<div class="bg-blue-500 px-4 py-8 flex gap-2">
<a class="text-gray-600 font-extrabold text-center text-3xl inline mx-auto" href="{{ route('login.student') }}"> LOGIN </a>
<p class="text-black font-extrabold text-center text-3xl inline mx-auto"> | </p>
<span class="text-blck font-extrabold text-center text-3xl inline mx-auto text-underline-custom"> SIGN UP </span>
</div>
<div class="bg-white pt-2 pb-8 px-20">
<div>
Expand Down
8 changes: 4 additions & 4 deletions resources/views/auth/register-teacher.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<img class="w-5/6 lg:mr-0" src="{{ asset('img/teacher-illustration.svg') }}">
</div>
<div class="flex flex-col w-full xl:w-5/12 justify-center overflow-y-hidden">
<div class="bg-blue-500 px-4 py-8">
<a class="text-gray-600 hover:text-black font-extrabold text-center text-3xl inline mx-9" href="{{ route('login.teacher') }}"> LOGIN </a>
<p class="text-black font-extrabold text-center text-3xl inline mx-9 "> | </p>
<span class="text-black font-extrabold text-center text-3xl inline mx-9 text-underline-custom"> SIGN UP </span>
<div class="bg-blue-500 px-4 py-8 flex gap-2">
<a class="text-gray-600 font-extrabold text-center text-3xl inline mx-auto" href="{{ route('login.teacher') }}"> LOGIN </a>
<p class="text-black font-extrabold text-center text-3xl inline mx-auto"> | </p>
<span class="text-blck font-extrabold text-center text-3xl inline mx-auto text-underline-custom"> SIGN UP </span>
</div>
<div class="bg-white pt-2 pb-8 px-20">
<div>
Expand Down

0 comments on commit 106d899

Please sign in to comment.