From 37523feecc6330e1b08d5dea66a0dc1e7d7374cb Mon Sep 17 00:00:00 2001
From: Marcela Ribeiro de Oliveira <mro15@inf.ufpr.br>
Date: Wed, 16 Mar 2016 10:23:04 -0300
Subject: [PATCH] Contact icons
---
app/assets/stylesheets/application/about.scss | 18 ------------
.../stylesheets/application/welcome.scss | 28 ++++++++++++++++++-
app/views/about/index.html.erb | 18 +++---------
app/views/learning_objects/show.html.erb | 2 +-
4 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/app/assets/stylesheets/application/about.scss b/app/assets/stylesheets/application/about.scss
index 9f3df891..07869b13 100644
--- a/app/assets/stylesheets/application/about.scss
+++ b/app/assets/stylesheets/application/about.scss
@@ -13,21 +13,3 @@
text-justify: inter-word;
}
}
-//// CONTACT
-.about-contact {
- .contact-row {
- margin-bottom: 10px;
-
- h4 {
- font-weight: 400;
- margin-bottom: 5px;
- }
- }
- .contact-item {
- background-color: #2E3192;
- width: 30px;
- height: 30px;
- border-radius: 5px;
- margin-right: 5px;
- }
-}
diff --git a/app/assets/stylesheets/application/welcome.scss b/app/assets/stylesheets/application/welcome.scss
index 16636220..60ff70a2 100644
--- a/app/assets/stylesheets/application/welcome.scss
+++ b/app/assets/stylesheets/application/welcome.scss
@@ -76,11 +76,37 @@ $carousel_size: 400px;
}
}
.contact-item {
- background-color: #2E3192;
width: 30px;
height: 30px;
border-radius: 5px;
margin-right: 5px;
+ i {
+ font-size: 35px;
+ margin-left: -15px;
+ margin-top: -2px;
+ }
+ .i-google{
+ background: #FFFFFF;
+ color: #d34836;
+ }
+ .i-twitter{
+ background: #FFFFFF;
+ color: #1dcaff;
+ }
+ .i-facebook{
+ font-size: 29px;
+ background: #3b5998;
+ color: #FFFFFF;
+ margin-top: 0px;
+ width: 30px;
+ border-radius: 5px;
+ padding-top: 1px;
+ }
+ .logo-contact{
+ width: auto;
+ height: 70px;
+ margin-left: -15px;
+ }
}
}
diff --git a/app/views/about/index.html.erb b/app/views/about/index.html.erb
index cf9122af..d2d17284 100644
--- a/app/views/about/index.html.erb
+++ b/app/views/about/index.html.erb
@@ -72,25 +72,15 @@
<div class="contact-row">
<h4>Redes Sociais</h4>
<div class="row">
- <div class='col-md-1 col-sm-offset-1 contact-item'></div>
- <div class='col-md-1 contact-item'></div>
- <div class='col-md-1 contact-item'></div>
- <div class='col-md-1 contact-item'></div>
- </div>
- </div>
- <div class="contact-row">
- <h4>Outros sites do ministério da educação</h4>
- <div class="row">
- <div class='contact-item col-md-1 col-sm-offset-1'></div>
- <div class='contact-item col-md-1'></div>
- <div class='contact-item col-md-1'></div>
- <div class='contact-item col-md-1'></div>
+ <div class='col-md-1 col-sm-offset-1 contact-item'><i class="fa fa-facebook i-facebook"></i></div>
+ <div class='col-md-1 contact-item'><i class="fa fa-google-plus-square i-google"></i></div>
+ <div class='col-md-1 contact-item'><i class="fa fa-twitter-square i-twitter"></i></div>
</div>
</div>
<div class="contact-row">
<h4>Portal desenvolvido por</h4>
<div class="row">
- <div class='contact-item col-md-1 col-sm-offset-1'></div>
+ <div class='contact-item col-md-1 col-sm-offset-1'><%=link_to (image_tag 'logo_c3.png', class:"logo-contact"), "http://www.c3sl.ufpr.br/", target:"_blank"%> </div>
</div>
</div>
</div>
diff --git a/app/views/learning_objects/show.html.erb b/app/views/learning_objects/show.html.erb
index d7e3db97..8cafb1f1 100644
--- a/app/views/learning_objects/show.html.erb
+++ b/app/views/learning_objects/show.html.erb
@@ -32,7 +32,7 @@
</div>
<div class="media-body">
<h5>Autor</h5>
- <h3 style="font-family:bolder"><%= author %></h3>
+ <h3><%= author %></h3>
</div>
</div>
<% end %>
--
GitLab