diff --git a/composer.lock b/composer.lock index 321d82aba5f4a905480e52b555d28dbbb59f500f..e1996fe8adc447136dde612900cfdaf41f1b9b67 100644 --- a/composer.lock +++ b/composer.lock @@ -586,16 +586,16 @@ }, { "name": "laravel/framework", - "version": "v6.18.18", + "version": "v6.18.19", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "9e5226ecc28f960cba1bd38b6d1d82a52e072dc3" + "reference": "69321afec31f4a908112e5dc8995fc91024fd971" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/9e5226ecc28f960cba1bd38b6d1d82a52e072dc3", - "reference": "9e5226ecc28f960cba1bd38b6d1d82a52e072dc3", + "url": "https://api.github.com/repos/laravel/framework/zipball/69321afec31f4a908112e5dc8995fc91024fd971", + "reference": "69321afec31f4a908112e5dc8995fc91024fd971", "shasum": "" }, "require": { @@ -729,7 +729,7 @@ "framework", "laravel" ], - "time": "2020-06-02T22:32:07+00:00" + "time": "2020-06-09T13:59:34+00:00" }, { "name": "laravel/tinker", diff --git a/public/css/layout.css b/public/css/layout.css new file mode 100644 index 0000000000000000000000000000000000000000..1713c94cca8bf116ae2f4721c42b8142ec63615f --- /dev/null +++ b/public/css/layout.css @@ -0,0 +1,288 @@ +/* Layout antigo */ +.icon-card{ + width:15px; + margin-right: 15px; +} +.emailCoautor{ +margin-bottom:10px; +} + +.visualizarEvento{ + color:rgb(12, 45, 136); +} +.visualizarEvento:hover{ + color:rgb(12, 45, 136); +} + +body{ + margin: 0; + padding: 0; + background-color: white; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; +} + +.btn-primary{ + 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; +} +.card:hover{ + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); +} + +#options::after{ + display:none; +} +/* #options:hover{ + background-image: url('/img/icons/ellipsis-v-solid-hover.svg'); + transition: 0.2s; +} */ +.dropdown-options{ + float:right; + margin-right:-5px; +} + +.dropdown-item:hover{ + background-color: #ccc; +} + +.margin{ + margin-bottom:20px; +} + +.info-evento img{ + width: 20px; +} + +.info-evento p{ + font-size: 15px; +} + +/* Detalhes do Evento */ +.main_content{ + + /* height: 100vh; */ + width: 100% - 200px; + margin-top: 50px; + margin-left: 200px; + padding: 20px; + /* background-color: rgba(0, 0, 0, 0.19); */ +} +.titulo{ + margin:7% 0 2% 0; + border-bottom: 2px solid #ccc; +} +.titulo h1{ + font-size: 35px; +} +.subtitulo{ + font-size:25px +} + +.titulo-detalhes{ + + border-bottom: 2px solid #ccc; +} +.subtitulo-detalhes{ + font-size: 25px; +} +.card-footer button{ + float: right; +} + +/* EVENTO */ + +.front-image-evento{ + margin-top: 25px; + margin-left: 8%; + margin-right: 8%; + height: 200px; + width: 100%; + z-index: 15; + /* position: relative; */ + box-shadow: 0 4px 4px 0 rgba(0, 0, 0, 0.2); + top: 0; + float: left; + border-radius: 10px; + + /* width: 500px; */ + +} + +/* novo layout */ + +#logo-menu { + height: 40px; + width: auto; +} + +.links-menu { + position: relative; +} + +.btn-azul-destaque { + border: 2px solid rgb(0, 140, 255); + border-radius: 10px; + box-shadow: black; +} + +.navbar img{ + width:20px; + margin-right: 10px; +} +.btn { + border-radius: 10px; +} + +.btn:hover { + background-color: rgb(212, 216, 219); + color: black; +} + +.negrito { + font-weight: bolder; +} + +.botao-entrar { + background-color: rgb(0, 140, 255); + text-align: center; + border-radius: 3px; + padding-left: 42%; + padding-right: 42%; +} + +.position-image { + display: block; + margin-left: auto; + margin-right: auto; + position: relative; + top: 30px; + height: auto; + max-width: 100%; +} + +.position-text { + position: relative; + top: 50px; + text-align: justify; +} + +.list-editais { + border-radius: 5px; + box-shadow: black; + margin: 2px; + padding: 10px; +} + +.img-arquivo { + width: 20px; + height: auto; + padding-top: 10px; +} + +.color-subtitle-edital { + color: rgb(150, 151, 151); +} + +.btn-opcoes-edital { + font-weight: bolder; + color: white; + background-color: rgb(0, 140, 255); + margin-top: 8px; + margin-bottom: 8px; +} + +.li-editais { + border: 1px solid rgb(172, 172, 172); + border-radius: 5px; + box-shadow: black; + padding: 5px; + margin-bottom: 5px; +} + +#editais { + border: 1px solid rgb(172, 172, 172); + border-radius: 5px; +} + +.flexcroll{ width:500px; + height:400px; + overflow:scroll; + } + +.flexcroll{ + scrollbar-face-color: rgb(0, 140, 255); + scrollbar-shadow-color: #FFFFFF; + scrollbar-highlight-color: #FFFFFF; + scrollbar-3dlight-color: #FFFFFF; + scrollbar-darkshadow-color: #FFFFFF; + scrollbar-track-color: #FFFFFF; + scrollbar-arrow-color: #FFFFFF; +} + +/* Let's get this party started */ +.flexcroll::-webkit-scrollbar { + width: 12px; +} + +/* Track */ +.flexcroll::-webkit-scrollbar-track { + box-shadow: inset 0 0 6px rgba(0,0,0,0.3); + -webkit-border-radius: 10px; + border-radius: 10px; +} + +/* Handle */ +.flexcroll::-webkit-scrollbar-thumb { + -webkit-border-radius: 10px; + border-radius: 10px; + background: rgb(0, 140, 255); + box-shadow: currentColor 0 0 6px rgba(0,0,0,0.5); +} + + +section { + margin-bottom: 150px; +} + +.rodape { + background-color: rgb(0, 140, 255); + position: relative; + width: 100%; + height: 25%; + top: 90%; + bottom: 0px; + padding: 20px; + margin-top: 75px; +} + +.logo-lmts { + display: block; + position: relative; + height: auto; + width: 150px; + top: 35px; +} + +.logo-ufape { + display: block; + position: relative; + height: 100px; + width: auto; +} + +.format-text { + font-size: 20px; + font-weight: bolder; + position: relative; + margin: 10px; +} diff --git a/public/css/style.css b/public/css/style.css index fac2c07426c056ab1d32df307d12bc2d38a300f1..c0a4db27cfbe1f2742b6e1eb9ab15174dcca375e 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -1,7 +1,7 @@ /* -color primary: #114048ff -color secondary: #196572ff -color dark: #071b1eff +color primary: rgb(0, 140, 255); +color secondary: rgb(12, 45, 136); +color dark: rgb(172, 172, 172); */ .content{ @@ -41,14 +41,15 @@ color dark: #071b1eff float:right; margin-right:-5px; } + .dropdown-item:hover{ background-color: #ccc; } .visualizarEvento{ - color:#196572ff; + color:rgb(12, 45, 136); } .visualizarEvento:hover{ - color:#196572ff; + color:rgb(12, 45, 136); } body{ margin: 0; @@ -57,21 +58,14 @@ body{ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; } -.navbar{ - background-color: #114048ff; - color: white; -} -.navbar img{ - width:20px; - margin-right: 10px; -} + .btn-primary{ - background-color: #114048ff; - border-color: #114048ff; + background-color: rgb(0, 140, 255);; + border-color: rgb(0, 140, 255);; } .btn-primary:hover{ - background-color: #196572ff; - border-color: #196572ff; + background-color: rgb(212, 216, 219); + border-color: rgb(212, 216, 219); } .rounded{ @@ -137,7 +131,7 @@ body{ position: fixed; width: 200px; height: 100%; - background-color: #071b1eff; + background-color: rgb(172, 172, 172); color: #fff; transition: 0.2s; overflow-y:scroll; @@ -147,7 +141,7 @@ body{ color: #fff; margin-top: 50px; padding: 0 15px 20px 15px; - border-bottom: 2px solid #114048ff; + border-bottom: 2px solid rgb(0, 140, 255); /* text-align: center; */ /* margin-bottom: 10px; */ transition: 0.2s; @@ -168,7 +162,7 @@ body{ } .wrapper .sidebar ul li:hover{ cursor:pointer; - background-color: #114048ff; + background-color: rgb(0, 140, 255); transition: 0.2s; } .wrapper .sidebar ul a li img{ @@ -243,7 +237,7 @@ body{ } .card-header{ - background-color:#114048ff; + background-color:rgb(0, 140, 255); color: white; } @@ -258,7 +252,7 @@ body{ overflow: hidden; float: left; padding: 0; - background-color:#071b1eff ; + background-color:rgb(0, 10, 63); } .banner-evento img{ diff --git a/public/css/styleIndex.css b/public/css/styleIndex.css index 90737edcf6a686307e471a3a4e31a08fbad404be..363c2f53bdcc667683bdea6a4e25e6bfebd8d763 100644 --- a/public/css/styleIndex.css +++ b/public/css/styleIndex.css @@ -1,7 +1,7 @@ /* -color primary: #114048ff -color secondary: #196572ff -color dark: #071b1eff +color primary: rgb(0, 140, 255); +color secondary: rgb(12, 45, 136); +color dark: rgb(172, 172, 172); */ @@ -12,7 +12,7 @@ body{ } .curved{ - background-color: #114048ff; + background-color: rgb(0, 140, 255); color: #fff; /* text-align: center; */ height: 45vh; @@ -81,7 +81,7 @@ body{ height: 70px; } .info-modulo:hover{ - box-shadow: 10px 10px #114048ff; + box-shadow: 10px 10px rgb(0, 140, 255); margin-top: -10px; transition: 0.5s; } diff --git a/public/favicon.ico b/public/favicon.ico old mode 100644 new mode 100755 diff --git a/public/img/icons/logo_arquivo.png b/public/img/icons/logo_arquivo.png new file mode 100644 index 0000000000000000000000000000000000000000..4fd1c55fc4c63b094ad5ad8a3063482ca60501e1 Binary files /dev/null and b/public/img/icons/logo_arquivo.png differ diff --git a/public/img/icons/logo_email.png b/public/img/icons/logo_email.png new file mode 100644 index 0000000000000000000000000000000000000000..6538ae2bbce370cfec1e1b5e3d5b846611b92eb1 Binary files /dev/null and b/public/img/icons/logo_email.png differ diff --git a/public/img/icons/logo_fechar.png b/public/img/icons/logo_fechar.png new file mode 100644 index 0000000000000000000000000000000000000000..62cd6a71eea9e84255e0274980725a7740e52713 Binary files /dev/null and b/public/img/icons/logo_fechar.png differ diff --git a/public/img/icons/logo_fechar2.png b/public/img/icons/logo_fechar2.png new file mode 100644 index 0000000000000000000000000000000000000000..6f952c3e226c54fddf62d8a155c4bfea6d011cba Binary files /dev/null and b/public/img/icons/logo_fechar2.png differ diff --git a/public/img/icons/logo_lixeira.png b/public/img/icons/logo_lixeira.png new file mode 100644 index 0000000000000000000000000000000000000000..ee03a7b1347e8400b99bdd5ac3cb4844f9662cca Binary files /dev/null and b/public/img/icons/logo_lixeira.png differ diff --git a/public/img/icons/logo_lmts.png b/public/img/icons/logo_lmts.png new file mode 100644 index 0000000000000000000000000000000000000000..b52c5e893419623c2e8f86c1c44b7cfe8b34200d Binary files /dev/null and b/public/img/icons/logo_lmts.png differ diff --git a/public/img/icons/logo_lupa.png b/public/img/icons/logo_lupa.png new file mode 100644 index 0000000000000000000000000000000000000000..7497d05dc685b2eeaf74ddc8fe4f1aafed9f9d0b Binary files /dev/null and b/public/img/icons/logo_lupa.png differ diff --git a/public/img/icons/logo_mapa.png b/public/img/icons/logo_mapa.png new file mode 100644 index 0000000000000000000000000000000000000000..b06e36c963d050b2fdec544e93263ee2ec7791be Binary files /dev/null and b/public/img/icons/logo_mapa.png differ diff --git a/public/img/icons/logo_submeta_cinza.png b/public/img/icons/logo_submeta_cinza.png new file mode 100644 index 0000000000000000000000000000000000000000..367553fd4486d0ec8efcaa83eca84c66601cbbd1 Binary files /dev/null and b/public/img/icons/logo_submeta_cinza.png differ diff --git a/public/img/icons/logo_submeta_grande.png b/public/img/icons/logo_submeta_grande.png new file mode 100644 index 0000000000000000000000000000000000000000..b57cbfce8ca52ab8f460cd2b141613b1eb391dc9 Binary files /dev/null and b/public/img/icons/logo_submeta_grande.png differ diff --git a/public/img/icons/logo_submeta_pemenor.png b/public/img/icons/logo_submeta_pemenor.png new file mode 100644 index 0000000000000000000000000000000000000000..4e0cdb63873b313a8ac25fb6797835e8ad139783 Binary files /dev/null and b/public/img/icons/logo_submeta_pemenor.png differ diff --git a/public/img/icons/logo_ufape.png b/public/img/icons/logo_ufape.png new file mode 100644 index 0000000000000000000000000000000000000000..34e5dec98e7944a542fd79081e3b2232822c8834 Binary files /dev/null and b/public/img/icons/logo_ufape.png differ diff --git a/public/index.php b/public/index.php old mode 100644 new mode 100755 diff --git a/public/mix-manifest.json b/public/mix-manifest.json old mode 100644 new mode 100755 diff --git a/public/robots.txt b/public/robots.txt old mode 100644 new mode 100755 diff --git a/public/web.config b/public/web.config old mode 100644 new mode 100755 diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 997d8164741038da2b47a5ba7f49e7fc75ebd75a..f66fdfd9cf370af6e37554d5a5c5e53d2a0a9130 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -5,7 +5,7 @@
diff --git a/resources/views/naturezas/grandeArea/editar_grande_area.blade.php b/resources/views/naturezas/grandeArea/editar_grande_area.blade.php index 33509858af5df10f31b4b41c3584be5839200f06..d29319b559d159e93175cd1b183ee606cc06aa8c 100644 --- a/resources/views/naturezas/grandeArea/editar_grande_area.blade.php +++ b/resources/views/naturezas/grandeArea/editar_grande_area.blade.php @@ -21,7 +21,7 @@ @enderror - +
diff --git a/resources/views/naturezas/grandeArea/nova_grande_area.blade.php b/resources/views/naturezas/grandeArea/nova_grande_area.blade.php index 6a830519f83f89cdf27d62e898e5eca5f4dbdcc6..388b291a56afa65729490f204b1c91643335428a 100644 --- a/resources/views/naturezas/grandeArea/nova_grande_area.blade.php +++ b/resources/views/naturezas/grandeArea/nova_grande_area.blade.php @@ -21,7 +21,7 @@ @enderror - + diff --git a/resources/views/naturezas/subArea/editar_subarea.blade.php b/resources/views/naturezas/subArea/editar_subarea.blade.php index 3973e576d97dc05cd6284d33b52a9df7e192dc65..53abe9977de9c29e678962c513d8f3987a93fa88 100644 --- a/resources/views/naturezas/subArea/editar_subarea.blade.php +++ b/resources/views/naturezas/subArea/editar_subarea.blade.php @@ -21,7 +21,7 @@ @enderror - + diff --git a/resources/views/naturezas/subArea/nova_subarea.blade.php b/resources/views/naturezas/subArea/nova_subarea.blade.php index cb6268e0d6df91c6a04531784a08ca99b79032dd..a2530403f12cd5d5ba9a4eeb6c0ac09933a19948 100644 --- a/resources/views/naturezas/subArea/nova_subarea.blade.php +++ b/resources/views/naturezas/subArea/nova_subarea.blade.php @@ -21,7 +21,7 @@ @enderror - +