diff --git a/app/assets/images/fnde.png b/app/assets/images/fnde.png
new file mode 100644
index 0000000000000000000000000000000000000000..19bf5082710dffa1fef3b06252932f090a6c6bce
Binary files /dev/null and b/app/assets/images/fnde.png differ
diff --git a/app/assets/images/icons/downloadred.png b/app/assets/images/icons/downloadred.png
new file mode 100644
index 0000000000000000000000000000000000000000..d67b8a025b6b5b7e51bdb91a221dd8a726b05f89
Binary files /dev/null and b/app/assets/images/icons/downloadred.png differ
diff --git a/app/assets/images/icons/foldergreen.png b/app/assets/images/icons/foldergreen.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c4da5a1501d915c3f7d746378b10872ddc318e5
Binary files /dev/null and b/app/assets/images/icons/foldergreen.png differ
diff --git a/app/assets/images/icons/signup.png b/app/assets/images/icons/signup.png
new file mode 100644
index 0000000000000000000000000000000000000000..083ccb7ad3cb5f5a4cda6f4efa515d0199754d5a
Binary files /dev/null and b/app/assets/images/icons/signup.png differ
diff --git a/app/assets/images/logo_brasil.png b/app/assets/images/logo_brasil.png
index 9d7e5d51f0fdbd92f94f2ab0d53e3aca23ed54fe..46dd6a59d8b6477d66c96c657b1213f99a47a09e 100644
Binary files a/app/assets/images/logo_brasil.png and b/app/assets/images/logo_brasil.png differ
diff --git a/app/assets/images/logo_ministerio.png b/app/assets/images/logo_ministerio.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1da0b032991ee57ec2ed728c28c0721d4a5b84f
Binary files /dev/null and b/app/assets/images/logo_ministerio.png differ
diff --git a/app/assets/javascripts/application/accessibility.js b/app/assets/javascripts/application/accessibility.js
index a5a8557a7a8b7658711262c14bf1ca19740c1be4..cc098c00d9eca996fd3b9ba69f5bf1a43a69146e 100644
--- a/app/assets/javascripts/application/accessibility.js
+++ b/app/assets/javascripts/application/accessibility.js
@@ -108,6 +108,8 @@ var contrast = function() {
$select7.data('select2').$dropdown.removeClass("words");
$select7.data('select2').$results.removeClass("fundo");
+ $('.caret').css('border-top',' 7px solid black');
+
}
else {
$(contrast_elements).addClass('contraste');
@@ -154,6 +156,14 @@ var contrast = function() {
$select7.data('select2').$container.addClass("selec");
$select7.data('select2').$dropdown.addClass("words");
$select7.data('select2').$results.addClass("fundo");
+
+ $('.caret').css('border-top',' 7px solid white');
+
+ // $('.select-tag-container').addClass('select2-results__option--highlighted[aria-selected]');
+ // var $sele = $('.select2-results__option--highlighted[aria-selected]').select2();
+ // $sele.data('select2').$container.css('background-color:','red');
+ $('.select2-search-choice:not(.my-custom-css)', this).addClass('my-custom-css');
+
}
}
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 6a77ac88cb1c62160800cb8fd24b8f5eb59f8a35..426bcda1cb5e2287a08f6c8be8cf29fd4c534419 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -244,7 +244,7 @@ footer {
left:0;
padding-top: 50px;
border-width: 0px;
- color: #FFF;
+ color: black;
.main{
background-color: #313131;
@@ -254,7 +254,7 @@ footer {
.footerbar{
padding: 16px;
- background-color: #080808;
+ background-color: #AAB1AD;
}
}
@@ -389,3 +389,18 @@ table.tipo1 p{ font-size: 15px; font-weight: bold; }
.fundo{
background: black;
}
+.right-edge { padding: 0px 45px; }
+
+.left-edge { position: relative; top: 30px; }
+
+.left-edge { left: 0px; }
+
+.right-button { padding: 0px 60px; }
+
+.logo-footer{
+ float: left;
+ margin-right: 1%;
+ margin-left: 1%;
+ width: 18%;
+
+}
diff --git a/app/assets/stylesheets/application/search.scss b/app/assets/stylesheets/application/search.scss
index 52202b55eac249d8d40d127c5f0b65771b1de38a..3237e45e562c205f9c15d14fa5e0552e9576ca20 100644
--- a/app/assets/stylesheets/application/search.scss
+++ b/app/assets/stylesheets/application/search.scss
@@ -1,3 +1,6 @@
+#s2id_myelement > .select2-choice{
+ background-color:green;
+}
.search-sidebar {
margin-top: 40px;
@@ -20,7 +23,6 @@
width: 100% !important;
}
-
// #nestedAccordion{
// width:100%;
// }
diff --git a/app/views/shared/application/_footer.html.erb b/app/views/shared/application/_footer.html.erb
index e4e96daded60b0425116993001ddcdc52d5cb7c0..41c2827a93b83a9e25bcdd2b159500e369d2ddd3 100644
--- a/app/views/shared/application/_footer.html.erb
+++ b/app/views/shared/application/_footer.html.erb
@@ -1,31 +1,43 @@
<footer>
- <div class="main">
+ <div class="main" style="background-color: #E6E6E6;">
<div class="container" style="min-height: 200px;">
- <div class="col-md-3">
- <%= image_tag 'logo.png', height: '120' %>
- </div>
- <div class="col-md-9" style="padding-top: 20px">
+
+ <div class="col-md-12" style="padding-top: 50px">
+ <div class="logo-footer">
<%= link_to 'http://www.brasil.gov.br/' do %>
- <%= image_tag 'logo_brasil.png', style: 'margin-left: 20px' %>
+ <%= image_tag 'logo_brasil.png', style: 'width: auto; height: 70px;' %>
<% end %>
+ </div>
+ <div class="logo-footer">
<%= link_to 'http://www.fnde.gov.br/' do %>
- <%= image_tag 'logo_fnde.jpg', height: '70', style: 'margin-left: 20px' %>
+ <%= image_tag 'logo_ministerio.png', height: '70', style: 'width: auto; height: 70px; margin-left: 18%;' %>
<% end %>
+ </div>
+ <div class="logo-footer">
+ <%= link_to 'http://www.fnde.gov.br/' do %>
+ <%= image_tag 'fnde.png', height: '70', style: 'width: auto; height: 100px; margin-top: -8%;' %>
+ <% end %>
+ </div>
+ <div class="logo-footer">
<%= link_to 'http://www.ufpr.br/portalufpr/' do %>
- <%= image_tag 'logo_ufpr.jpg', height: '100', style: 'margin-left: 20px'%>
+ <%= image_tag 'logo_ufpr.jpg', height: '100', style: 'width: auto; height: 70px;'%>
<% end %>
-
+ </div>
+ <div class="logo-footer">
<%= link_to 'http://www.c3sl.ufpr.br/' do %>
- <%= image_tag 'logo_c3.png', style: 'margin-left: 20px'%>
+ <%= image_tag 'logo_c3.png', style: 'width: auto; height: 70px;'%>
<% end %>
</div>
+ </div>
</div>
<div class="footerbar">
<div class="container">
+ <div style="text-align:center">
<%= image_tag 'cc.png' %>
Creative Commons Attribution 4.0 International Licence
</div>
+ </div>
</div>
</div>
</footer>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 69d4d07acbf46ed76d26b4bd81115f13135ff81e..85816d3d4a69fcb61734e7705c1951acc301b836 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -47,17 +47,17 @@
</div>
<div class="col-md-3 col-md-offset-1 hidden-xs hidden-sm">
<div class="panel-wrapper">
- <div style="padding: 30px; min-height: 400px">
- <h2>Cadastre-se!</h2><br>
- <h2>Vantagens de cadastrar:</h2><br>
- <h2>Faça suas coleções.</h2><br>
- <h2>Curta objetos.</h2><br>
- <h2>Tenha seus objetos favoritos.</h2><br>
+ <div style="padding: 30px; min-height: 400px;">
+ <div style="text-align:center"><%= image_tag image_path('icons/signup.png'), class: "logo",size: "140x140" %></div>
+ <div style="text-align:center"><h2>Cadastre-se para aproveitar:</h2></div><br/>
+ <h4><div class="left-edge"><%= image_tag image_path('icons/star-gold.png'), class: "logo",size: "30x30" %></div><div class="right-edge">Avalie, comente e favorite arquivos.</div></h4>
+ <h4><div class="left-edge"><%= image_tag image_path('icons/foldergreen.png'), class: "logo",size: "30x30" %></div><div class="right-edge">Siga coleções e usuários.</div></h4>
+ <h4><div class="left-edge"><%= image_tag image_path('icons/downloadred.png'), class: "logo",size: "30x30" %></div><div class="right-edge">Crie coleções para rápido acesso e download.</div></h4>
</div>
<div style="width: 100%; padding: 30px;">
<%= form_tag(new_user_registration_path, method: 'get') do %>
<%= text_field_tag :email, '', placeholder: "Seu email", class: 'form-control'%>
- <%= button_to "Cadastrar-se", new_user_registration_path,class: "btn btn-danger", style: 'margin-top: 10px; width: 230px; background-color: #FF2134;'%>
+ <div class="right-button"> <%= button_to "Cadastrar", new_user_registration_path,class: "btn btn-danger", style: 'margin-top: 10px; width: 230px; background-color: #FF2134;'%></div>
<% end %>
</div>
</div>
diff --git a/app/views/welcome/subject.html.erb b/app/views/welcome/subject.html.erb
index 0dad2cc48fd5ad2217bdad401b754b4c96acc7e9..2f7ef60e97a41b533af54f2da7e49fac9327a41a 100644
--- a/app/views/welcome/subject.html.erb
+++ b/app/views/welcome/subject.html.erb
@@ -52,20 +52,6 @@
</div>
</div>
<div class="row mainpage-subjects">
- <div class="row mainpage-subjects">
- <div class="col-md-12">
- <% if @general.present? %>
- <div class="row learning-object-columns">
- <h2>Adicionados Recentemente</h2>
- <% @general.each do |subject|%>
- <div class="row mainpage-subject-element">
- <%= render subject, orientation: 'vertical'%>
-
- </div>
- <% end %>
- </div>
- <% end %>
- </div>
- </div>
+ <h2>Adicionados Recentemente</h2>
</div>
</div>