Skip to content

GitLab

Unverified Commit 976ba2e4 authored by carlos1270's avatar carlos1270 Committed by GitHub
Browse files

Merge pull request #78 from carlos1270/master 

ajustes finos nos modais
parents ebe89efe d3da97ab
Show whitespace changes
Inline Side-by-side
composer.lock
View file @ 976ba2e4
...@@ -636,16 +636,16 @@ ...@@ -636,16 +636,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v6.20.26", "version": "v6.20.27",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "0117d797dc1ab64b1f88d4f6b966380ea7def091" "reference": "92c0417e60efc39bc556ba5dfc9b20a56f7848fb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/0117d797dc1ab64b1f88d4f6b966380ea7def091", "url": "https://api.github.com/repos/laravel/framework/zipball/92c0417e60efc39bc556ba5dfc9b20a56f7848fb",
"reference": "0117d797dc1ab64b1f88d4f6b966380ea7def091", "reference": "92c0417e60efc39bc556ba5dfc9b20a56f7848fb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -785,7 +785,7 @@ ...@@ -785,7 +785,7 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2021-04-28T14:38:32+00:00" "time": "2021-05-11T14:00:28+00:00"
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
...@@ -911,16 +911,16 @@ ...@@ -911,16 +911,16 @@
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",
"version": "1.6.0", "version": "1.6.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/commonmark.git", "url": "https://github.com/thephpleague/commonmark.git",
"reference": "19a9673b833cc37770439097b381d86cd125bfe8" "reference": "7d70d2f19c84bcc16275ea47edabee24747352eb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/19a9673b833cc37770439097b381d86cd125bfe8", "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/7d70d2f19c84bcc16275ea47edabee24747352eb",
"reference": "19a9673b833cc37770439097b381d86cd125bfe8", "reference": "7d70d2f19c84bcc16275ea47edabee24747352eb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1008,7 +1008,7 @@ ...@@ -1008,7 +1008,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-05-01T19:00:49+00:00" "time": "2021-05-12T11:39:41+00:00"
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
...@@ -1259,16 +1259,16 @@ ...@@ -1259,16 +1259,16 @@
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "2.47.0", "version": "2.48.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "606262fd8888b75317ba9461825a24fc34001e1e" "reference": "d3c447f21072766cddec3522f9468a5849a76147"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/606262fd8888b75317ba9461825a24fc34001e1e", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d3c447f21072766cddec3522f9468a5849a76147",
"reference": "606262fd8888b75317ba9461825a24fc34001e1e", "reference": "d3c447f21072766cddec3522f9468a5849a76147",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1348,7 +1348,7 @@ ...@@ -1348,7 +1348,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-04-13T21:54:02+00:00" "time": "2021-05-07T10:08:30+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
...@@ -2081,16 +2081,16 @@ ...@@ -2081,16 +2081,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v4.4.22", "version": "v4.4.23",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625" "reference": "1ab187ac21d41d7d34a4f529091a1f5d0bb2924f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625", "url": "https://api.github.com/repos/symfony/console/zipball/1ab187ac21d41d7d34a4f529091a1f5d0bb2924f",
"reference": "36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625", "reference": "1ab187ac21d41d7d34a4f529091a1f5d0bb2924f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2150,7 +2150,7 @@ ...@@ -2150,7 +2150,7 @@
"description": "Eases the creation of beautiful and testable command line interfaces", "description": "Eases the creation of beautiful and testable command line interfaces",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/console/tree/v4.4.22" "source": "https://github.com/symfony/console/tree/v4.4.23"
}, },
"funding": [ "funding": [
{ {
...@@ -2166,7 +2166,7 @@ ...@@ -2166,7 +2166,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-04-16T17:32:19+00:00" "time": "2021-05-10T12:53:15+00:00"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
...@@ -2371,16 +2371,16 @@ ...@@ -2371,16 +2371,16 @@
}, },
{ {
"name": "symfony/error-handler", "name": "symfony/error-handler",
"version": "v4.4.22", "version": "v4.4.23",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/error-handler.git", "url": "https://github.com/symfony/error-handler.git",
"reference": "76603a8df8e001436df80758eb03a8baa5324175" "reference": "21d75bfbdfdd3581a7f97080deb98926987f14a7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/76603a8df8e001436df80758eb03a8baa5324175", "url": "https://api.github.com/repos/symfony/error-handler/zipball/21d75bfbdfdd3581a7f97080deb98926987f14a7",
"reference": "76603a8df8e001436df80758eb03a8baa5324175", "reference": "21d75bfbdfdd3581a7f97080deb98926987f14a7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2420,7 +2420,7 @@ ...@@ -2420,7 +2420,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code", "description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/error-handler/tree/v4.4.22" "source": "https://github.com/symfony/error-handler/tree/v4.4.23"
}, },
"funding": [ "funding": [
{ {
...@@ -2436,7 +2436,7 @@ ...@@ -2436,7 +2436,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-04-02T07:50:12+00:00" "time": "2021-05-02T20:47:26+00:00"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
...@@ -2602,16 +2602,16 @@ ...@@ -2602,16 +2602,16 @@
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v4.4.20", "version": "v4.4.23",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
"reference": "2543795ab1570df588b9bbd31e1a2bd7037b94f6" "reference": "67b77716f517e3f864759232e1201e7aa2ab0e82"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/2543795ab1570df588b9bbd31e1a2bd7037b94f6", "url": "https://api.github.com/repos/symfony/finder/zipball/67b77716f517e3f864759232e1201e7aa2ab0e82",
"reference": "2543795ab1570df588b9bbd31e1a2bd7037b94f6", "reference": "67b77716f517e3f864759232e1201e7aa2ab0e82",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2643,7 +2643,7 @@ ...@@ -2643,7 +2643,7 @@
"description": "Finds files and directories via an intuitive fluent interface", "description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/finder/tree/v4.4.20" "source": "https://github.com/symfony/finder/tree/v4.4.23"
}, },
"funding": [ "funding": [
{ {
...@@ -2659,7 +2659,7 @@ ...@@ -2659,7 +2659,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-02-12T10:48:09+00:00" "time": "2021-05-09T09:13:09+00:00"
}, },
{ {
"name": "symfony/http-client-contracts", "name": "symfony/http-client-contracts",
...@@ -2741,16 +2741,16 @@ ...@@ -2741,16 +2741,16 @@
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v4.4.22", "version": "v4.4.23",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-foundation.git", "url": "https://github.com/symfony/http-foundation.git",
"reference": "1a6f87ef99d05b1bf5c865b4ef7992263e1cb081" "reference": "2ffb43bd6c589a274ee1e93a5fd6b7ef1577b9c5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/1a6f87ef99d05b1bf5c865b4ef7992263e1cb081", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/2ffb43bd6c589a274ee1e93a5fd6b7ef1577b9c5",
"reference": "1a6f87ef99d05b1bf5c865b4ef7992263e1cb081", "reference": "2ffb43bd6c589a274ee1e93a5fd6b7ef1577b9c5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2789,7 +2789,7 @@ ...@@ -2789,7 +2789,7 @@
"description": "Defines an object-oriented layer for the HTTP specification", "description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/http-foundation/tree/v4.4.22" "source": "https://github.com/symfony/http-foundation/tree/v4.4.23"
}, },
"funding": [ "funding": [
{ {
...@@ -2805,20 +2805,20 @@ ...@@ -2805,20 +2805,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-04-30T12:05:50+00:00" "time": "2021-05-05T07:40:41+00:00"
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v4.4.22", "version": "v4.4.23",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-kernel.git", "url": "https://github.com/symfony/http-kernel.git",
"reference": "cd2e325fc34a4a5bbec91eecf69dda8ee8c5ea4f" "reference": "95bb42312503a212f4467529bac8735f01226ff9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/cd2e325fc34a4a5bbec91eecf69dda8ee8c5ea4f", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/95bb42312503a212f4467529bac8735f01226ff9",
"reference": "cd2e325fc34a4a5bbec91eecf69dda8ee8c5ea4f", "reference": "95bb42312503a212f4467529bac8735f01226ff9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2893,7 +2893,7 @@ ...@@ -2893,7 +2893,7 @@
"description": "Provides a structured process for converting a Request into a Response", "description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/http-kernel/tree/v4.4.22" "source": "https://github.com/symfony/http-kernel/tree/v4.4.23"
}, },
"funding": [ "funding": [
{ {
...@@ -2909,7 +2909,7 @@ ...@@ -2909,7 +2909,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-05-01T14:38:48+00:00" "time": "2021-05-12T13:13:32+00:00"
}, },
{ {
"name": "symfony/mime", "name": "symfony/mime",
...@@ -3872,16 +3872,16 @@ ...@@ -3872,16 +3872,16 @@
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v4.4.21", "version": "v4.4.23",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
"reference": "eb8f5428cc3b40d6dffe303b195b084f1c5fbd14" "reference": "ff6e63c7b5de874464642969968f61f8dc649ac3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/eb8f5428cc3b40d6dffe303b195b084f1c5fbd14", "url": "https://api.github.com/repos/symfony/translation/zipball/ff6e63c7b5de874464642969968f61f8dc649ac3",
"reference": "eb8f5428cc3b40d6dffe303b195b084f1c5fbd14", "reference": "ff6e63c7b5de874464642969968f61f8dc649ac3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3940,7 +3940,7 @@ ...@@ -3940,7 +3940,7 @@
"description": "Provides tools to internationalize your application", "description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/translation/tree/v4.4.21" "source": "https://github.com/symfony/translation/tree/v4.4.23"
}, },
"funding": [ "funding": [
{ {
...@@ -3956,7 +3956,7 @@ ...@@ -3956,7 +3956,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-23T16:25:01+00:00" "time": "2021-04-28T06:59:52+00:00"
}, },
{ {
"name": "symfony/translation-contracts", "name": "symfony/translation-contracts",
......
public/css/layout.css
View file @ 976ba2e4
...@@ -441,11 +441,12 @@ section { ...@@ -441,11 +441,12 @@ section {
} }
.texto-info { .texto-info {
color: rgba(102, 102, 102, 0.555); color: rgba(102, 102, 102, 0.705);
text-align: justify; text-align: justify;
font-size: 12px; font-size: 12px;
padding-top: 0px; padding-top: 0px;
margin-bottom: 40px; margin-bottom: 40px;
font-weight: 500;
border-top: 1px solid rgba(102, 102, 102, 0.555) ; border-top: 1px solid rgba(102, 102, 102, 0.555) ;
} }
......
resources/views/administrador/selecionarProjetos.blade.php
View file @ 976ba2e4
...@@ -60,10 +60,10 @@ ...@@ -60,10 +60,10 @@
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="exampleModalCenter{{ $trabalho->id }}" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true"> <div class="modal fade" id="exampleModalCenter{{ $trabalho->id }}" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document"> <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content modal-submeta">
<div class="modal-header"> <div class="modal-header modal-header-submeta">
<h5 class="modal-title" id="exampleModalLongTitle">Selecione o avaliador(es)</h5> <h5 class="modal-title titulo-table" id="exampleModalLongTitle">Selecione o(s) avaliador(es)</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="color: rgb(182, 182, 182)">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<input type="hidden" name="trabalho_id" value="{{ $trabalho->id }}"> <input type="hidden" name="trabalho_id" value="{{ $trabalho->id }}">
<input type="hidden" name="evento_id" value="{{ $evento->id }}"> <input type="hidden" name="evento_id" value="{{ $evento->id }}">
<div class="form-group"> <div class="form-group">
<label for="exampleFormControlSelect2">Example multiple select</label> <label for="exampleFormControlSelect2">Selecione o(s) avaliador(es) para esse projeto</label>
<select name="avaliadores_id[]" multiple class="form-control" id="exampleFormControlSelect2"> <select name="avaliadores_id[]" multiple class="form-control" id="exampleFormControlSelect2">
@foreach ($trabalho->aval as $avaliador) @foreach ($trabalho->aval as $avaliador)
<option value="{{ $avaliador->id }}" > {{ $avaliador->user->name }} ({{$avaliador->area->nome ?? 'Indefinida'}}) </option> <option value="{{ $avaliador->id }}" > {{ $avaliador->user->name }} ({{$avaliador->area->nome ?? 'Indefinida'}}) </option>
...@@ -83,8 +83,8 @@ ...@@ -83,8 +83,8 @@
<small id="emailHelp" class="form-text text-muted">Segure SHIFT do teclado para selecionar mais de um.</small> <small id="emailHelp" class="form-text text-muted">Segure SHIFT do teclado para selecionar mais de um.</small>
</div> </div>
<div class="mx-auto" > <div>
<button type="submit" class="btn btn-success mx-auto">Atribuir</button> <button type="submit" class="btn btn-info" style="width: 100%">Atribuir</button>
</div> </div>
</form> </form>
......
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