Skip to content

S
sisage
Commit 002a729d authored by Marcos Albano's avatar Marcos Albano 💬
Browse files
Options

Merge

parents 75c41722 dc786b7e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3976 additions and 11 deletions
public/css/app.css
View file @ 002a729d
......@@ -1032,7 +1032,8 @@ pre code {
-webkit-box-flex: 0;
-ms-flex: 0 0 33.33333333%;
flex: 0 0 33.33333333%;
max-width: 33.33333333%
/* max-width: 33.33333333% */
max-width: 25.33333333%
}
.col-sm-5 {
-webkit-box-flex: 0;
......@@ -1233,7 +1234,8 @@ pre code {
-webkit-box-flex: 0;
-ms-flex: 0 0 33.33333333%;
flex: 0 0 33.33333333%;
max-width: 33.33333333%
/* max-width: 33.33333333% */
max-width: 25.33333333%
}
.col-md-5 {
-webkit-box-flex: 0;
......@@ -1259,6 +1261,12 @@ pre code {
flex: 0 0 66.66666667%;
max-width: 66.66666667%
}
.col-md-8_enter {
-webkit-box-flex: 0;
-ms-flex: 0 0 66.66666667%;
flex: 0 0 66.66666667%;
max-width: 66.66666667%
}
.col-md-9 {
-webkit-box-flex: 0;
-ms-flex: 0 0 75%;
......@@ -1370,8 +1378,14 @@ pre code {
.offset-md-3 {
margin-left: 25%
}
/* Modificado marcos.felix */
.offset-md-4 {
margin-left: 33.33333333%
/* margin-left: 33.33333333% */
margin-left: 25.333%;
}
/* Modificado marcos.sousa */
.offset-md-4_login {
margin-left: 27.733%;
}
.offset-md-5 {
margin-left: 41.66666667%
......@@ -2252,6 +2266,10 @@ select.form-control-lg:not([size]):not([multiple]) {
margin-top: .25rem
}
#password {
margin: .5ren auto 0;
}
.form-row {
display: -webkit-box;
display: -ms-flexbox;
......@@ -2686,6 +2704,18 @@ fieldset:disabled a.btn {
pointer-events: none
}
/* Madif marcos.felix */
/* .btn-primary_entar {
color: #fff;
background-color: #3490dc;
border-color: #3490dc
background: linear-gradient(174deg, rgb(206, 128, 93) 0%, rgb(165, 78, 7) 71%);
border-color: white;
} */
.btn-primary {
color: #fff;
/* background-color: #3490dc; */
......@@ -2694,6 +2724,13 @@ fieldset:disabled a.btn {
border-color: white;
}
.btn-primary:hover {
font-weight: 400;
color: white;
background: linear-gradient(174deg, rgb(98, 191, 103) 4%, rgb(16, 157, 23) 10%, rgb(4, 36, 7) 100%);
border-color: white;
}
.btn-primary:hover {
color: #fff;
background-color: #227dc7;
......@@ -3334,6 +3371,23 @@ fieldset:disabled a.btn {
background-color: transparent
}
/* Modif marcos.felix */
.btn-link_esqSenha {
font-weight: 400;
color: white;
background: linear-gradient(174deg, rgb(206, 128, 93) 0%, rgb(165, 78, 7) 71%);
border-color: white;
}
.btn-link_esqSenha:hover {
font-weight: 400;
color: white;
background: linear-gradient(174deg, rgb(98, 191, 103) 4%, rgb(16, 157, 23) 10%, rgb(4, 36, 7) 100%);
border-color: white;
}
.btn-link:hover {
color: #1d68a7;
background-color: transparent
......@@ -9790,3 +9844,7 @@ a.text-dark:hover {
-webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, .04);
box-shadow: 0 2px 4px rgba(0, 0, 0, .04);
}
.imaLogos {
margin: 5rem auto 0;
}
\ No newline at end of file
public/js/app.js
View file @ 002a729d
This diff is collapsed.
resources/views/auth/login.blade.php
View file @ 002a729d
......@@ -12,16 +12,18 @@
{{-- <div class="card-header">{{ __('Login') }}</div> --}}
<div class="card-body">
<form method="POST" action="{{ route('login') }}" aria-label="{{ __('agendamento.login') }}">
@csrf
<div class="form-group row">
<label for="email" class="col-sm-4 col-form-label text-md-right">{{ __('agendamento.email') }}</label>
<label for="email" class="col-sm-4 col-form-label text-md-right"></label>
<div class="col-md-6">
<input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required autofocus>
<input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required autofocus placeholder="{{ __('agendamento.email') }}">
@if ($errors->has('email'))
<span class="invalid-feedback" role="alert">
......@@ -31,10 +33,10 @@
</div>
</div>
<div class="form-group row">
<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('agendamento.password') }}</label>
<label for="password" class="col-md-4 col-form-label text-md-right"></label>
<div class="col-md-6">
<input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
<input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required placeholder="{{ __('agendamento.password') }}">
@if ($errors->has('password'))
<span class="invalid-feedback" role="alert">
......@@ -57,14 +59,14 @@
</div>
<div class="form-group row mb-0">
<div class="col-md-8 offset-md-4">
<div class="col-md-8_enter offset-md-4_login">
<button type="submit" class="btn btn-primary">
{{ __('agendamento.login') }}
</button>
<a class="btn btn-btn btn-primary" href="{{ route('users.create') }}">Cadastro</a>
<a class="btn btn-link" href="{{ route('password.request') }}">
<a class="btn btn-link_esqSenha" href="{{ route('password.request') }}">
{{ __('agendamento.forgot_your_password') }}
</a>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment