conflict resolved

config/app.php

@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'name' => env('APP_NAME', 'Laravel'),
+    'name' => env('APP_NAME', 'Submeta'),
 
     /*
     |--------------------------------------------------------------------------

public/css/layout.css

@@ -25,13 +25,9 @@ body{
   background-color: rgb(0, 140, 255);;
   border-color: rgb(0, 140, 255);;
 }
-.btn-primary:hover{
-  background-color: rgb(212, 216, 219);
-  border-color: rgb(212, 216, 219);
-}
+
 
 .card{
-  margin: 20px;
   box-shadow: 0 4px 4px 0 rgba(0, 0, 0, 0.2);
   transition: 0.2s;
 }
@@ -143,10 +139,7 @@ body{
   border-radius: 10px;
 }
 
-.btn:hover {
-  background-color: rgb(212, 216, 219);
-  color: black;
-}
+
 
 .negrito {
   font-weight: bolder;
@@ -493,4 +486,15 @@ button.close {
 
 .btn-cadastro:hover {
   color: black;
+}
+
+.bottomVoltar{
+  display: none;
+  margin-right:10px;
+}
+@media screen and (max-width: 767px){
+  .bottomVoltar{
+      display: block;
+      margin-right:10px;
+  }
 }
\ No newline at end of file

public/css/style.css

@@ -82,14 +82,7 @@ body{
     padding: 7px;
 }
 
-.card{
-    margin: 20px;
-    box-shadow: 0 4px 4px 0 rgba(0, 0, 0, 0.2);
-    transition: 0.2s;
-}
-.card:hover{
-    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-}
+
 .titulo{
     margin:7% 0 2% 0;
     border-bottom: 2px solid #ccc;

resources/views/auth/login.blade.php

@@ -3,22 +3,22 @@
 @section('content')
 <div class="container content">
     <div class="row justify-content-center">
-        <div class="col-md-5">
-            <div class="card card-login-cadastro">
-                <div class="card-header">{{ __('Login') }}</div>
+        <div class="col-md-5" style="margin-top: 5rem">
+            <div class="card shadow bg-white" style="border-radius: 12px">
+                <div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
+                    <div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:6px">
+                      <h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Entrar</h5>
+                    </div>
+                  </div>
 
-                <div class="card-body">
+                <div class="card-body" style="font-weight: bolder;">
                     <form method="POST" action="{{ route('login') }}">
                         @csrf
 
-                        <div class="row justify-content-center">
-                            <div class="titulo-login-cadastro">LOGIN</div>
-                        </div>
-
                         <div class="form-group row">
                             
                             <div class="col-md-12">
-                                <label for="email" class="col-form-label text-md-right">{{ __('Endereço de E-mail') }}</label>
+                                <label for="email" class="col-form-label text-md-right" style="color: rgb(0, 140, 255);">{{ __('Endereço de E-mail') }}</label>
                                 <input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
 
                                 @error('email')
@@ -32,7 +32,7 @@
                         <div class="form-group row">
                             
                             <div class="col-md-12">
-                                <label for="password" class="col-form-label text-md-right">{{ __('Senha') }}</label>
+                                <label for="password" class="col-form-label text-md-right" style="color: rgb(0, 140, 255);">{{ __('Senha') }}</label>
                                 <input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
 
                                 @error('password')
@@ -58,7 +58,7 @@
                         <div class="form-group row mb-0">
                             
                             <div class="col-md-12">
-                                <button type="submit" class="btn btn-primary" style="width:100%">
+                                <button type="submit" class="btn btn-primary" style="width:100%; font-weight: 700;">
                                     {{ __('Login') }}
                                 </button>
                                 <div class="row justify-content-center">

resources/views/auth/passwords/email.blade.php

 @extends('layouts.app')
 
 @section('content')
-<div class="container content">
+<div class="container content" style="margin-top: 3rem">
     <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">{{ __('Redefinir Senha') }}</div>
+        <div class="col-md-8" style="margin-bottom:20px">
+            <div class="card shadow bg-white" style="border-radius:12px; border-width:0px;">
+                <div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
+                    <div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:6px">
+                        <h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Redefinir Senha</h5>
+                    </div>    
+                </div>
 
                 <div class="card-body">
                     @if (session('status'))