Skip to content

GitLab

Unverified Commit 811b569c authored by Gabriel Antônio da Silva's avatar Gabriel Antônio da Silva Committed by GitHub
Browse files

Merge pull request #22 from lmts-ufape/carlos 

atualizando layout
parents 873445f4 44de0ba1
Hide whitespace changes
Inline Side-by-side
composer.lock
View file @ 811b569c
......@@ -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",
......
public/css/layout.css 0 → 100644
View file @ 811b569c
/* 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;
}
public/css/style.css
View file @ 811b569c
/*
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{
......
public/css/styleIndex.css
View file @ 811b569c
/*
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;
}
......
public/favicon.ico 100644 → 100755
View file @ 811b569c
File mode changed from 100644 to 100755
public/index.php 100644 → 100755
View file @ 811b569c
File mode changed from 100644 to 100755
public/mix-manifest.json 100644 → 100755
View file @ 811b569c
File mode changed from 100644 to 100755
public/robots.txt 100644 → 100755
View file @ 811b569c
File mode changed from 100644 to 100755
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