Skip to content

GitLab

Unverified Commit 480e15e8 authored by carlos1270's avatar carlos1270 Committed by GitHub
Browse files

Merge pull request #91 from lmts-ufape/modificacoes_layout_7 

Modificacoes layout 7
parents 8431d5eb f5efa296
master carl-branch dependabot/composer/dompdf/dompdf-1.2.2 dependabot/composer/guzzlehttp/guzzle-6.5.8 dependabot/composer/guzzlehttp/psr7-1.8.5 dependabot/composer/symfony/http-kernel-4.4.50 dependabot/npm_and_yarn/axios-0.21.2 dependabot/npm_and_yarn/decode-uri-component-0.2.2 dependabot/npm_and_yarn/express-4.18.2 dependabot/npm_and_yarn/json5-and-json5-2.2.3 dependabot/npm_and_yarn/loader-utils-and-webpack-cli-1.4.2 dependabot/npm_and_yarn/minimist-and-mkdirp-1.2.8 dependabot/npm_and_yarn/qs-and-express-6.11.0 excluir_projeto_submetido minha_conta modificacoes_aviso modificacoes_layout_9 modificacoes_layout_minha_conta modificacoes_perfil_avaliador updates_mar
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 159 additions and 187 deletions
+159 -187
public/img/icons/icon_email.svg 0 → 100644
View file @ 480e15e8
<svg xmlns="http://www.w3.org/2000/svg" width="182.869" height="123.441" viewBox="0 0 182.869 123.441">
<path id="Icon_zocial-email" data-name="Icon zocial-email" d="M.072,116.576V15q0-.176.529-3.351l59.781,51.14L.777,120.1a14.945,14.945,0,0,1-.705-3.527ZM8.008,4.6a7.6,7.6,0,0,1,3-.529h161a9.985,9.985,0,0,1,3.174.529L115.225,55.913l-7.936,6.348L91.595,75.135,75.9,62.262l-7.936-6.348ZM8.184,126.98,68.317,69.316,91.595,88.184l23.277-18.869,60.134,57.665a8.467,8.467,0,0,1-3,.529h-161a7.986,7.986,0,0,1-2.822-.529ZM122.808,62.791l59.6-51.14A10.525,10.525,0,0,1,182.941,15V116.576a13.516,13.516,0,0,1-.529,3.527Z" transform="translate(-0.072 -4.068)" fill="#008cff"/>
</svg>
public/img/icons/icon_facebook.svg 0 → 100644
View file @ 480e15e8
<svg xmlns="http://www.w3.org/2000/svg" width="149.32" height="148.417" viewBox="0 0 149.32 148.417">
<path id="Icon_awesome-facebook" data-name="Icon awesome-facebook" d="M149.883,75.223A74.66,74.66,0,1,0,63.557,148.98V96.805H44.591V75.223H63.557V58.773c0-18.71,11.139-29.045,28.2-29.045a114.9,114.9,0,0,1,16.714,1.457V49.549H99.054c-9.272,0-12.165,5.756-12.165,11.66V75.223h20.706l-3.312,21.582H86.888V148.98A74.687,74.687,0,0,0,149.883,75.223Z" transform="translate(-0.563 -0.563)" fill="#008cff"/>
</svg>
public/img/icons/icon_instagram.svg 0 → 100644
View file @ 480e15e8
<svg xmlns="http://www.w3.org/2000/svg" width="148.451" height="148.417" viewBox="0 0 148.451 148.417">
<path id="Icon_awesome-instagram" data-name="Icon awesome-instagram" d="M74.237,38.394a38.052,38.052,0,1,0,38.052,38.052A37.992,37.992,0,0,0,74.237,38.394Zm0,62.791A24.739,24.739,0,1,1,98.976,76.446a24.784,24.784,0,0,1-24.739,24.739Zm48.485-64.348a8.876,8.876,0,1,1-8.876-8.876A8.855,8.855,0,0,1,122.721,36.838Zm25.2,9.008c-.563-11.889-3.279-22.421-11.989-31.1-8.677-8.677-19.208-11.393-31.1-11.989-12.254-.7-48.981-.7-61.235,0-11.856.563-22.388,3.279-31.1,11.956S1.112,33.923.516,45.812c-.7,12.254-.7,48.981,0,61.235.563,11.889,3.279,22.421,11.989,31.1s19.208,11.393,31.1,11.989c12.254.7,48.981.7,61.235,0,11.889-.563,22.421-3.279,31.1-11.989,8.677-8.677,11.393-19.208,11.989-31.1.7-12.254.7-48.948,0-61.2Zm-15.83,74.35A25.046,25.046,0,0,1,117.985,134.3c-9.77,3.875-32.952,2.981-43.749,2.981s-34.012.861-43.749-2.981A25.046,25.046,0,0,1,16.38,120.2C12.5,110.425,13.4,87.243,13.4,76.446S12.538,42.434,16.38,32.7A25.046,25.046,0,0,1,30.488,18.59c9.77-3.875,32.952-2.981,43.749-2.981s34.012-.861,43.749,2.981A25.046,25.046,0,0,1,132.094,32.7c3.875,9.77,2.981,32.952,2.981,43.749S135.968,110.459,132.094,120.2Z" transform="translate(0.006 -2.238)" fill="#008cff"/>
</svg>
public/img/icons/logo_submeta_pemenor2.png 0 → 100644
View file @ 480e15e8
public/img/icons/logo_submeta_pemenor2.png

21.3 KB

public/img/icons/logo_ufape_lmts.png 0 → 100644
View file @ 480e15e8
public/img/icons/logo_ufape_lmts.png

91 KB

resources/views/index.blade.php
View file @ 480e15e8
......@@ -3,12 +3,13 @@
@section('content')
<div class="container">
<div class="row">
@if(count($eventos)>0)
<div class="col-sm-6" style="position: relative; top: 50px; padding: 25px;">
<div class="row">
<img class="position-image" src="{{ asset('img/icons/logo_submeta_grande.png') }}" alt="">
</div>
<div class="row position-text">
<p style="text-indent: 0.5cm;">
<p style="text-indent: 0.5cm; color:#909090; font-size:16px">
O Submeta é um sistema de submissão de projetos acadêmicos, que pode ser adotado para os diferentes propósitos de Ensino, Pesquisa e Extensão. O sistema abrange todas as principais etapas relacionadas à submissão de projetos, permitindo o lançamento e configuração de editais, além de gerenciar a distribuição das avaliações e os pareceres técnicos dos avaliadores, como também, visualizar os projetos submetidos pelos proponentes.
</p>
</div>
......@@ -34,7 +35,7 @@
@endphp
@if ($fimSub >= $today)
<li class="col-sm-12 li-editais aberto">
<li class="col-sm-12 li-editais aberto bg-white">
<div class="container">
<div class="row">
<div class="col-sm-1">
......@@ -55,7 +56,7 @@
</div>
</li>
@elseif($fimSub < $today)
<li class="col-sm-12 li-editais encerrado" style="display: none;">
<li class="col-sm-12 li-editais encerrado bg-white" style="display: none;">
<div class="container">
<div class="row">
<div class="col-sm-1">
......@@ -134,6 +135,23 @@
</div>
</div>
</div>
@else
<div class="col-md-12" style="text-align: center;">
<div class="form-row justify-content-center">
<div class="col-md-8">
<div class="form-group">
<div style="margin-top: 6rem"><img class="position-image" src="{{ asset('img/icons/logo_submeta_grande.png') }}" alt=""></div>
<div style="margin-top: 3rem">
<p style="text-indent: 0.5cm; color:#909090; font-size:16px">
O Submeta é um sistema de submissão de projetos acadêmicos, que pode ser adotado para os diferentes propósitos de Ensino, Pesquisa e Extensão. O sistema abrange todas as principais etapas relacionadas à submissão de projetos, permitindo o lançamento e configuração de editais, além de gerenciar a distribuição das avaliações e os pareceres técnicos dos avaliadores, como também, visualizar os projetos submetidos pelos proponentes.
</p>
</div>
</div>
</div>
</div>
</div>
@endif
</div>
</div>
@endsection
......
resources/views/layouts/app.blade.php
View file @ 480e15e8
......@@ -254,78 +254,23 @@
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
<div class="styleRodape">
<div class="styleRodape" style="background-color:#fff">
<div class="container">
<div class="row justify-content-center">
<div class="col-sm-2">
<div class="row justify-content-center">
<div class="col-sm-12 styleRodape_Imagem_ufape">
<a href="http://www.ufape.edu.br" target="_blank"><img src="{{ asset('img/logoUfape.svg') }}" alt="Logo" width="40px;"></a>
<div class="form-row justify-content-center">
<div class="col-sm-4" style="margin-top: 2.5rem;">
<img src="{{ asset('img/icons/logo_submeta_pemenor2.png') }}" alt="Logo" width="200px;">
</div>
<div class="col-sm-12 styleRodape_Texto">
<a href="http://www.ufape.edu.br" target="_blank" style="color: white; font-weight: normal;">Universidade Federal do Agreste de Pernambuco</a>
<div class="col-sm-4 form-group" style="margin-top: 0.5rem; color:#909090">
<div style="margin-top: 5px; margin-bottom:5px">Desenvolvido por:</div>
<div> <a href="http://lmts.uag.ufrpe.br/" target="_blank"><img src="{{ asset('img/icons/logo_ufape_lmts.png') }}" alt="Logo" width="200px;"></a></div>
</div>
<div class="col-sm-4 form-group" style="margin-top: 0.5rem; color:#909090">
<div style="margin-top: 5px; margin-bottom:5px">Redes sociais:</div>
<div class="btn-group">
<div><a href="https://www.facebook.com/LMTSUFAPE/" target="_blank"><img src="{{ asset('img/icons/icon_facebook.svg') }}" alt="Logo" width="40px;" style="margin:5px"></a></div>
<div><a href="https://www.instagram.com/lmts_ufape/" target="_blank"><img src="{{ asset('img/icons/icon_instagram.svg') }}" alt="Logo" width="40px;" style="margin:5px"></a></div>
</div>
</div>
<div class="col-sm-3">
<div class="row justify-content-center">
<div class="col-sm-12 styleRodape_Imagem_lmts">
<a target="_blank" href="http://lmts.uag.ufrpe.br/"><img src="{{ asset('img/lmts.png') }}" alt="Logo" width="125px;"></a>
</div>
<div class="col-sm-12 styleRodape_Texto">
<a target="_blank" href="http://lmts.uag.ufrpe.br/" style="color: white; font-weight: normal;">Laboratório Multidisciplinar de Tecnologias Sociais</a>
</div>
</div>
</div>
<!--<div class="col-sm-2" align="center">
<div class="row justify-content-center" >
<div class="styleRodape_linha_left">
<div class="col-sm-12 styleRodape_Texto_Titulo">Mapa do site</div>
<div class="col-sm-12 styleRodape_Texto_Conteudo_MapaDoSite">Quem Somos</div>
<div class="col-sm-12 styleRodape_Texto_Conteudo_MapaDoSite">Equipe</div>
<div class="col-sm-12 styleRodape_Texto_Conteudo_MapaDoSite">Notícia</div>
<div class="col-sm-12 styleRodape_Texto_Conteudo_MapaDoSite">Projetos</div>
</div>
</div>
</div>-->
<div class="col-sm-2">
<div class="row justify-content-center" style="height: 170px;">
<div class="styleRodape_linha_left">
<div class="col-sm-12 styleRodape_Texto_Titulo">Contato
</div>
<div class="col-sm-12 styleRodape_container">
<div class="row">
<div class="col">
<img src="{{ asset('img/icons/instagram-brands.svg') }}" alt="Logo" width="20px;">
<a href="https://www.instagram.com/lmts_ufape/" target="_blank" class="styleRodape_Texto_Contato" style="color: white; font-weight: normal;">@lmts_ufape</a>
</div>
</div>
</div>
<div class="col-sm-12 styleRodape_container">
<div class="row justify-content-center">
<div class="col">
<img src="{{ asset('img/icons/facebook-square-brands.svg') }}" alt="Logo" width="20px;">
<a href="https://www.facebook.com/LMTSUFAPE/" target="_blank" class="styleRodape_Texto_Contato" style="color: white; font-weight: normal;">@LMTSUFAPE</a>
</div>
</div>
</div>
<div class="col-sm-12 styleRodape_container">
<div class="row">
<div class="col">
<span>lmts@ufrpe.br</span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row justify-content-center styleRodape_container styleRodape_linha_top">
<div class="btg-group">
<img src="{{ asset('img/icons/local_logo.svg') }}" alt="Logo" width="10px;">
<a class="styleRodape_Texto" style="padding: 0.5rem; color: white; font-weight: normal;">Avenida Bom Pastor. s/nº Bairro Boa Vista - CEP 55292-270 - Garanhuns - PE</a>
<div><img src="{{ asset('img/icons/icon_email.svg') }}" alt="Logo" width="20px;" style="margin:5px;"> <span>lmts@ufrpe.br</span></div>
</div>
</div>
</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