Merge branch 'development' of http://alphasoftz.net/Franklin/apps.acj into development

admin/application/views/auth/login.php

@@ -20,14 +20,19 @@
 
 	<style>
 		.login-image {
-			height: 440px !important;
-			width: 362px;
-			margin-left: -65px;
+			height: 400px !important;
+			width: 409px;
+			margin-left: 65px;
+		}
+		.college-heading{
+			margin-top: -75px !important;
+    margin-right: -473px;
 		}
 
 		.tab-content {
 
-			margin-left: -82px !important;
+			margin-left: -202px !important;
+			margin-top: -300px !important;
 		}
 	</style>
 
@@ -38,13 +43,16 @@
 	<div class="authincation d-flex flex-column flex-lg-row flex-column-fluid">
 		<div class="login-aside text-center  d-flex flex-column flex-row-auto">
 			<div class="d-flex flex-column-auto flex-column pt-lg-40 pt-15">
-				<div class="text-center mb-lg-4 mb-2 pt-5 logo">
-					<img src="<?= base_url('') ?>assets/images/logo-white.png" alt="">
-				</div>
-				<h3 class="mb-2 text-white">Welcome back!</h3>
-				<p class="mb-4">User Experience & Interface Design <br>Strategy SaaS Solutions</p>
+				
+				<!-- <h3 class="mb-2 text-white">Welcome back!</h3> -->
+				<h1 class="mb-4">Asian College </h1>
+				<h1 class="mb-4 college-heading">of Journalism </h1>
 			</div>
+
+			<img src="<?php echo base_url(); ?>assets/images/asian_logo.jpg" alt="" width="330px" class="login-image">
+			
 			<div class="aside-image position-relative" style="background-image:url(<?= base_url('') ?>assets/images/background/pic-2.png);">
+			
 				<img class="img1 move-1" src="<?= base_url('') ?>assets/images/background/pic3.png" alt="">
 				<img class="img2 move-2" src="<?= base_url('') ?>assets/images/background/pic4.png" alt="">
 				<img class="img3 move-3" src="<?= base_url('') ?>assets/images/background/pic5.png" alt="">
@@ -57,7 +65,6 @@
 					<div class="row no-gutters">
 						<div class="col-xl-12 d-flex tab-content">
 							<div class="col-md-8" >
-								<img src="<?php echo base_url(); ?>assets/images/asian_logo.jpg" alt="" width="300px" class="login-image">
 							</div>
 							<div style=" border:1px solid grey;" id="sign-up" class="auth-form tab-pane fade show active  form-validation col-md-11 ">
 								<form action="<?= base_url("login") ?> " method="post">

admin/assets/css/style.css

@@ -27713,10 +27713,10 @@ body > * {
     .authincation .login-aside:after {
       content: "";
       clip-path: polygon(0% 100%, 100% 0%, 0% 0%);
-      width: 8.75rem;
+      width: 33.75rem;
       height: 100%;
       position: absolute;
-      right: -8.75rem;
+      right: -33.75rem;
       z-index: -1;
       top: 0;
       background-color: var(--primary);
@@ -27890,7 +27890,9 @@ body > * {
     width: 100%; }
     @media only screen and (max-width: 35.9375rem) {
       .authincation-content.style-2 .auth-form {
-        padding: 1.875rem 0rem; } }
+        padding: 1.875rem 0rem; 
+        
+      } }
 
 .welcome-content {
   background: url("../images/1.jpg");
@@ -27941,10 +27943,13 @@ body > * {
           padding: 0rem 0.4375rem; }
 
 .auth-form {
-  padding: 3.125rem 3.125rem; }
+  padding: 3.125rem 3.125rem;
+  margin-left: 56px;
+  margin-top: 42px; }
   @media only screen and (max-width: 35.9375rem) {
     .auth-form {
-      padding: 1.875rem; } }
+      padding: 1.875rem; 
+      } }
   .auth-form .page-back {
     display: inline-block;
     margin-bottom: 0.9375rem; }