Skip to content

GitLab

Commit c73baf28 authored by Gabriel-31415's avatar Gabriel-31415
Browse files

conflict resolved

parents 77659f80 625e77a5
Show whitespace changes
Inline Side-by-side
composer.lock
View file @ c73baf28
......@@ -1259,16 +1259,16 @@
},
{
"name": "nesbot/carbon",
"version": "2.48.0",
"version": "2.48.1",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "d3c447f21072766cddec3522f9468a5849a76147"
"reference": "8d1f50f1436fb4b05e7127360483dd9c6e73da16"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d3c447f21072766cddec3522f9468a5849a76147",
"reference": "d3c447f21072766cddec3522f9468a5849a76147",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8d1f50f1436fb4b05e7127360483dd9c6e73da16",
"reference": "8d1f50f1436fb4b05e7127360483dd9c6e73da16",
"shasum": ""
},
"require": {
......@@ -1348,7 +1348,7 @@
"type": "tidelift"
}
],
"time": "2021-05-07T10:08:30+00:00"
"time": "2021-05-26T22:08:38+00:00"
},
{
"name": "nikic/php-parser",
......@@ -2081,16 +2081,16 @@
},
{
"name": "symfony/console",
"version": "v4.4.23",
"version": "v4.4.24",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "1ab187ac21d41d7d34a4f529091a1f5d0bb2924f"
"reference": "1b15ca1b1bedda86f98064da9ff5d800560d4c6d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/1ab187ac21d41d7d34a4f529091a1f5d0bb2924f",
"reference": "1ab187ac21d41d7d34a4f529091a1f5d0bb2924f",
"url": "https://api.github.com/repos/symfony/console/zipball/1b15ca1b1bedda86f98064da9ff5d800560d4c6d",
"reference": "1b15ca1b1bedda86f98064da9ff5d800560d4c6d",
"shasum": ""
},
"require": {
......@@ -2150,7 +2150,7 @@
"description": "Eases the creation of beautiful and testable command line interfaces",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/console/tree/v4.4.23"
"source": "https://github.com/symfony/console/tree/v4.4.24"
},
"funding": [
{
......@@ -2166,20 +2166,20 @@
"type": "tidelift"
}
],
"time": "2021-05-10T12:53:15+00:00"
"time": "2021-05-13T06:28:07+00:00"
},
{
"name": "symfony/css-selector",
"version": "v5.2.7",
"version": "v5.2.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "59a684f5ac454f066ecbe6daecce6719aed283fb"
"reference": "5d5f97809015102116208b976eb2edb44b689560"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/59a684f5ac454f066ecbe6daecce6719aed283fb",
"reference": "59a684f5ac454f066ecbe6daecce6719aed283fb",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/5d5f97809015102116208b976eb2edb44b689560",
"reference": "5d5f97809015102116208b976eb2edb44b689560",
"shasum": ""
},
"require": {
......@@ -2215,7 +2215,7 @@
"description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/css-selector/tree/v5.3.0-BETA1"
"source": "https://github.com/symfony/css-selector/tree/v5.2.9"
},
"funding": [
{
......@@ -2231,7 +2231,7 @@
"type": "tidelift"
}
],
"time": "2021-04-07T16:07:52+00:00"
"time": "2021-05-16T13:07:46+00:00"
},
{
"name": "symfony/debug",
......@@ -2602,16 +2602,16 @@
},
{
"name": "symfony/finder",
"version": "v4.4.23",
"version": "v4.4.24",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "67b77716f517e3f864759232e1201e7aa2ab0e82"
"reference": "a96bc19ed87c88eec78e1a4c803bdc1446952983"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/67b77716f517e3f864759232e1201e7aa2ab0e82",
"reference": "67b77716f517e3f864759232e1201e7aa2ab0e82",
"url": "https://api.github.com/repos/symfony/finder/zipball/a96bc19ed87c88eec78e1a4c803bdc1446952983",
"reference": "a96bc19ed87c88eec78e1a4c803bdc1446952983",
"shasum": ""
},
"require": {
......@@ -2643,7 +2643,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/finder/tree/v4.4.23"
"source": "https://github.com/symfony/finder/tree/v4.4.24"
},
"funding": [
{
......@@ -2659,7 +2659,7 @@
"type": "tidelift"
}
],
"time": "2021-05-09T09:13:09+00:00"
"time": "2021-05-16T12:27:45+00:00"
},
{
"name": "symfony/http-client-contracts",
......@@ -2809,16 +2809,16 @@
},
{
"name": "symfony/http-kernel",
"version": "v4.4.23",
"version": "v4.4.24",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "95bb42312503a212f4467529bac8735f01226ff9"
"reference": "59925ee79f2541b4c6e990843e1a42768e898254"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/95bb42312503a212f4467529bac8735f01226ff9",
"reference": "95bb42312503a212f4467529bac8735f01226ff9",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/59925ee79f2541b4c6e990843e1a42768e898254",
"reference": "59925ee79f2541b4c6e990843e1a42768e898254",
"shasum": ""
},
"require": {
......@@ -2893,7 +2893,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-kernel/tree/v4.4.23"
"source": "https://github.com/symfony/http-kernel/tree/v4.4.24"
},
"funding": [
{
......@@ -2909,20 +2909,20 @@
"type": "tidelift"
}
],
"time": "2021-05-12T13:13:32+00:00"
"time": "2021-05-19T12:12:19+00:00"
},
{
"name": "symfony/mime",
"version": "v5.2.7",
"version": "v5.2.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "7af452bf51c46f18da00feb32e1ad36db9426515"
"reference": "64258e870f8cc75c3dae986201ea2df58c210b52"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/7af452bf51c46f18da00feb32e1ad36db9426515",
"reference": "7af452bf51c46f18da00feb32e1ad36db9426515",
"url": "https://api.github.com/repos/symfony/mime/zipball/64258e870f8cc75c3dae986201ea2df58c210b52",
"reference": "64258e870f8cc75c3dae986201ea2df58c210b52",
"shasum": ""
},
"require": {
......@@ -2976,7 +2976,7 @@
"mime-type"
],
"support": {
"source": "https://github.com/symfony/mime/tree/v5.2.7"
"source": "https://github.com/symfony/mime/tree/v5.2.9"
},
"funding": [
{
......@@ -2992,20 +2992,20 @@
"type": "tidelift"
}
],
"time": "2021-04-29T20:47:09+00:00"
"time": "2021-05-16T13:07:46+00:00"
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.22.1",
"version": "v1.23.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
"reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
"reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
"reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
"shasum": ""
},
"require": {
......@@ -3017,7 +3017,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.22-dev"
"dev-main": "1.23-dev"
},
"thanks": {
"name": "symfony/polyfill",
......@@ -3055,7 +3055,7 @@
"portable"
],
"support": {
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
},
"funding": [
{
......@@ -3071,20 +3071,20 @@
"type": "tidelift"
}
],
"time": "2021-01-07T16:49:33+00:00"
"time": "2021-02-19T12:13:01+00:00"
},
{
"name": "symfony/polyfill-iconv",
"version": "v1.22.1",
"version": "v1.23.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git",
"reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342"
"reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342",
"reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933",
"reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933",
"shasum": ""
},
"require": {
......@@ -3096,7 +3096,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.22-dev"
"dev-main": "1.23-dev"
},
"thanks": {
"name": "symfony/polyfill",
......@@ -3135,7 +3135,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-iconv/tree/v1.22.1"
"source": "https://github.com/symfony/polyfill-iconv/tree/v1.23.0"
},
"funding": [
{
......@@ -3151,20 +3151,20 @@
"type": "tidelift"
}
],
"time": "2021-01-22T09:19:47+00:00"
"time": "2021-05-27T09:27:20+00:00"
},
{
"name": "symfony/polyfill-intl-idn",
"version": "v1.22.1",
"version": "v1.23.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
"reference": "2d63434d922daf7da8dd863e7907e67ee3031483"
"reference": "65bd267525e82759e7d8c4e8ceea44f398838e65"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483",
"reference": "2d63434d922daf7da8dd863e7907e67ee3031483",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65",
"reference": "65bd267525e82759e7d8c4e8ceea44f398838e65",
"shasum": ""
},
"require": {
......@@ -3178,7 +3178,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.22-dev"
"dev-main": "1.23-dev"
},
"thanks": {
"name": "symfony/polyfill",
......@@ -3222,7 +3222,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.1"
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0"
},
"funding": [
{
......@@ -3238,20 +3238,20 @@
"type": "tidelift"
}
],
"time": "2021-01-22T09:19:47+00:00"
"time": "2021-05-27T09:27:20+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
"version": "v1.22.1",
"version": "v1.23.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
"reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248"
"reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248",
"reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
"reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
"shasum": ""
},
"require": {
......@@ -3263,7 +3263,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.22-dev"
"dev-main": "1.23-dev"
},
"thanks": {
"name": "symfony/polyfill",
......@@ -3306,7 +3306,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1"
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0"
},
"funding": [
{
......@@ -3322,20 +3322,20 @@
"type": "tidelift"
}
],
"time": "2021-01-22T09:19:47+00:00"
"time": "2021-02-19T12:13:01+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.22.1",
"version": "v1.23.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "5232de97ee3b75b0360528dae24e73db49566ab1"
"reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1",
"reference": "5232de97ee3b75b0360528dae24e73db49566ab1",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
"reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
"shasum": ""
},
"require": {
......@@ -3347,7 +3347,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.22-dev"
"dev-main": "1.23-dev"
},
"thanks": {
"name": "symfony/polyfill",
......@@ -3386,7 +3386,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1"
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0"
},
"funding": [
{
......@@ -3402,20 +3402,20 @@
"type": "tidelift"
}
],
"time": "2021-01-22T09:19:47+00:00"
"time": "2021-05-27T09:27:20+00:00"
},
{
"name": "symfony/polyfill-php72",
"version": "v1.22.1",
"version": "v1.23.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
"reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9"
"reference": "9a142215a36a3888e30d0a9eeea9766764e96976"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
"reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976",
"reference": "9a142215a36a3888e30d0a9eeea9766764e96976",
"shasum": ""
},
"require": {
......@@ -3424,7 +3424,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.22-dev"
"dev-main": "1.23-dev"
},
"thanks": {
"name": "symfony/polyfill",
......@@ -3462,7 +3462,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1"
"source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0"
},
"funding": [
{
......@@ -3478,20 +3478,20 @@
"type": "tidelift"
}
],
"time": "2021-01-07T16:49:33+00:00"
"time": "2021-05-27T09:17:38+00:00"
},
{
"name": "symfony/polyfill-php73",
"version": "v1.22.1",
"version": "v1.23.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
"reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2"
"reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2",
"reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010",
"reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010",
"shasum": ""
},
"require": {
......@@ -3500,7 +3500,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.22-dev"
"dev-main": "1.23-dev"
},
"thanks": {
"name": "symfony/polyfill",
......@@ -3541,7 +3541,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1"
"source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0"
},
"funding": [
{
......@@ -3557,20 +3557,20 @@
"type": "tidelift"
}
],
"time": "2021-01-07T16:49:33+00:00"
"time": "2021-02-19T12:13:01+00:00"
},
{
"name": "symfony/polyfill-php80",
"version": "v1.22.1",
"version": "v1.23.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
"reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91"
"reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91",
"reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0",
"reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0",
"shasum": ""
},
"require": {
......@@ -3579,7 +3579,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.22-dev"
"dev-main": "1.23-dev"
},
"thanks": {
"name": "symfony/polyfill",
......@@ -3624,7 +3624,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1"
"source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0"
},
"funding": [
{
......@@ -3640,7 +3640,7 @@
"type": "tidelift"
}
],
"time": "2021-01-07T16:49:33+00:00"
"time": "2021-02-19T12:13:01+00:00"
},
{
"name": "symfony/process",
......@@ -3705,16 +3705,16 @@
},
{
"name": "symfony/routing",
"version": "v4.4.22",
"version": "v4.4.24",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "049e7c5c41f98511959668791b4adc0898a821b3"
"reference": "b42c3631fd9e3511610afb2ba081ea7e38d9fa38"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/049e7c5c41f98511959668791b4adc0898a821b3",
"reference": "049e7c5c41f98511959668791b4adc0898a821b3",
"url": "https://api.github.com/repos/symfony/routing/zipball/b42c3631fd9e3511610afb2ba081ea7e38d9fa38",
"reference": "b42c3631fd9e3511610afb2ba081ea7e38d9fa38",
"shasum": ""
},
"require": {
......@@ -3773,7 +3773,7 @@
"url"
],
"support": {
"source": "https://github.com/symfony/routing/tree/v4.4.22"
"source": "https://github.com/symfony/routing/tree/v4.4.24"
},
"funding": [
{
......@@ -3789,7 +3789,7 @@
"type": "tidelift"
}
],
"time": "2021-04-11T12:59:39+00:00"
"time": "2021-05-16T09:52:47+00:00"
},
{
"name": "symfony/service-contracts",
......@@ -3872,16 +3872,16 @@
},
{
"name": "symfony/translation",
"version": "v4.4.23",
"version": "v4.4.24",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "ff6e63c7b5de874464642969968f61f8dc649ac3"
"reference": "424d29dfcc15575af05196de0100d7b52f650602"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/ff6e63c7b5de874464642969968f61f8dc649ac3",
"reference": "ff6e63c7b5de874464642969968f61f8dc649ac3",
"url": "https://api.github.com/repos/symfony/translation/zipball/424d29dfcc15575af05196de0100d7b52f650602",
"reference": "424d29dfcc15575af05196de0100d7b52f650602",
"shasum": ""
},
"require": {
......@@ -3940,7 +3940,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/translation/tree/v4.4.23"
"source": "https://github.com/symfony/translation/tree/v4.4.24"
},
"funding": [
{
......@@ -3956,7 +3956,7 @@
"type": "tidelift"
}
],
"time": "2021-04-28T06:59:52+00:00"
"time": "2021-05-16T09:52:47+00:00"
},
{
"name": "symfony/translation-contracts",
......@@ -4438,16 +4438,16 @@
},
{
"name": "facade/ignition",
"version": "1.16.15",
"version": "1.17.0",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition.git",
"reference": "b6aea4a99303d9d32afd486a285162a89af8a8a3"
"reference": "dc49305538aeb77e4c89eba57cee4ceff9e42f33"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/facade/ignition/zipball/b6aea4a99303d9d32afd486a285162a89af8a8a3",
"reference": "b6aea4a99303d9d32afd486a285162a89af8a8a3",
"url": "https://api.github.com/repos/facade/ignition/zipball/dc49305538aeb77e4c89eba57cee4ceff9e42f33",
"reference": "dc49305538aeb77e4c89eba57cee4ceff9e42f33",
"shasum": ""
},
"require": {
......@@ -4510,7 +4510,7 @@
"issues": "https://github.com/facade/ignition/issues",
"source": "https://github.com/facade/ignition"
},
"time": "2021-02-15T10:21:49+00:00"
"time": "2021-05-25T07:15:52+00:00"
},
{
"name": "facade/ignition-contracts",
......
config/app.php
View file @ c73baf28
......@@ -13,7 +13,7 @@ return [
|
*/
'name' => env('APP_NAME', 'Laravel'),
'name' => env('APP_NAME', 'Submeta'),
/*
|--------------------------------------------------------------------------
......
public/css/layout.css
View file @ c73baf28
......@@ -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;
......@@ -494,3 +487,14 @@ 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
View file @ c73baf28
......@@ -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
View file @ c73baf28
......@@ -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
View file @ c73baf28
@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'))
......
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