Skip to content
Snippets Groups Projects
Commit 94ddefab authored by Mateus Rambo Strey's avatar Mateus Rambo Strey
Browse files

fix header and disable turbolinks

parent 7904cbfc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/assets/javascripts/application.js
+ 1
− 1
View file @ 94ddefab
......@@ -17,5 +17,5 @@
//= require select2_locale_pt-BR
//= require bootstrap-tagsinput
//= require jquery.turbolinks
//= require turbolinks
// require turbolinks
//= require_tree ./application
app/assets/stylesheets/application.scss
+ 10
− 8
View file @ 94ddefab
......@@ -437,18 +437,20 @@ table.tipo1 p {
.fundo {
background: black;
}
.right-edge { padding: 0px 45px; }
.right-edge {
padding: 0px 45px;
margin-bottom: 25px;
}
.left-edge {
position:absolute;
left: -35px;
}
}
.set-align {
position: relative;
margin: 5px;
padding: 0px 35px;
}
.set-align {
position: relative;
margin: 5px;
padding: 0px 35px;
}
.right-button { padding: 0px 60px; }
......
app/views/shared/application/_header.html.erb
+ 0
− 34
View file @ 94ddefab
......@@ -91,40 +91,6 @@
<a class="nav-dropdown" data-content="about" href="javascript:void(0);">Sobre&nbsp;<span class="caret"/></a>
</h3></li>
<li role="separator" class="divider"></li>
<li class="dropdown nav-button">
<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0);">Links
úteis&nbsp;<span class="caret"/></a>
<ul class="dropdown-menu">
<li>
<div class="row" style="width: 620px;">
<ul class="list-unstyled col-md-6 col-md-offset-1">
<li><b>Portais nacionais e internacionais</b></li>
<li role="separator" class="divider"></li>
<li>&bull;<a href="">Portais Educacionais</a></li>
<li>&bull;<a href="">Museus</a></li>
<li>&bull;<a href="">Bibliotecas</a></li>
<li>&bull;<a href="">Revistas</a></li>
<li>&bull;<a href="">Projetos Inovadores</a></li>
<li>&bull;<a href="">Jornais</a></li>
<li>&bull;<a href="">Projeto de escolas</a></li>
<li>&bull;<a href="">Um computador por aluno</a></li>
<li>&bull;<a href="">Geoprocessamento</a></li>
<li>&bull;<a href="">Prêmio Professores do Brasil</a></li>
<li>&bull;<a href="">Capacitação ProInfo Integrado</a></li>
</ul>
<ul class="list-unstyled col-md-5">
<li><b>Visite também</b></li>
<li role="separator" class="divider"></li>
<li>&bull;<a href="">Domínio Público</a></li>
<li>&bull;<a href="">E-ProInfo</a></li>
<li>&bull;<a href="">Objetos Educacionais</a></li>
<li>&bull;<a href="">Plataforma Freire</a></li>
<li>&bull;<a href="">TV Escola</a></li>
</ul>
</div>
</li>
</ul>
</li>
</ul>
</div>
</div>
......
app/views/shared/application/_links.html.erb
+ 2
− 4
View file @ 94ddefab
......@@ -2,15 +2,13 @@
<div class="col-md-8">
<h4><b>Portais nacionais e internacionais</b></h4>
<div class="row inner-column">
<ul class="list-unstyled col-md-6">
<ul class="list-bullet col-md-12">
<li><a href="">Portais Educacionais</a></li>
<li><a href="">Museus</a></li>
<li><a href="">Bibliotecas</a></li>
<li><a href="">Revistas</a></li>
<li><a href="">Projetos Inovadores</a></li>
<li><a href="">Jornais</a></li>
</ul>
<ul class="list-unstyled col-md-6">
<li><a href="">Projeto de escolas</a></li>
<li><a href="">Um computador por aluno</a></li>
<li><a href="">Geoprocessamento</a></li>
......@@ -22,7 +20,7 @@
<div class="col-md-4">
<h4><b>Visite também</b></h4>
<div class="row inner-column">
<ul class="list-unstyled col-md-12">
<ul class="list-bullet col-md-12">
<li><a href="">Domínio Público</a></li>
<li><a href="">E-ProInfo</a></li>
<li><a href="">Objetos Educacionais</a></li>
......
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