Merge branch 'change-carousel' into 'master'

Change carousel layout

Signed-off-by: Matheus Agio Nerone <man13@inf.ufpr.br>

See merge request !41

app/assets/stylesheets/application/welcome.scss

@@ -15,23 +15,19 @@ $carousel_size: 400px;
 
 .carousel {
   height: $carousel_size;
-  h1{
-		background-color: rgba(37, 68, 32, 0.75);
-	}
-	#carrousel-new-description{
-		background-color: rgba(2, 8, 3, 0.75);
-	}
 }
 
-.carousel h1 {
-  background-color: rgba(0, 0, 0, 0.75);
-}
 .carousel ol {
-  background-color: rgba(0, 0, 0, 0.10);
+  background-color: rgba(80, 80, 80, 0.7);
 }
 
 .carousel-caption {
   z-index: 10;
+  margin-bottom: 2px !important;
+  padding-bottom: 0px !important;
+  width: 100%;
+  left: 0% !important;
+  background-image: linear-gradient(to top, rgba(80, 80, 80, 0.7), transparent);
 }
 
 .carousel .item {
@@ -46,6 +42,12 @@ $carousel_size: 400px;
   height: 400px !important;
 
 }
+.carousel-indicators{
+  left: 30% !important;
+  width: 100% !important;
+  margin-bottom: 0px;
+  bottom: 0px !important;
+}
 
 .carousel-indicators li {
   display: inline-block;

app/views/welcome/index.html.erb

@@ -26,20 +26,12 @@
               <%= image_tag highlight.image.url(:larger) %>
               <div class="container">
                 <div class="carousel-caption">
-                  <h1><%= highlight.title %></h1>
-                  <p><a class="btn btn-lg btn-primary" href=<%= highlight.url %> role="button">Mais informações</a></p>
+                  <h1><%= link_to highlight.title, highlight.url, style: 'color: white;'%></h1>
+
                 </div>
               </div>
             </div>
             <% end %>
-            <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
-              <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
-              <span class="sr-only">Previous</span>
-            </a>
-            <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
-              <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
-              <span class="sr-only">Next</span>
-            </a>
           </div>
         </div>
       <% end %>
@@ -77,4 +69,4 @@
       </div>
     <% end %>
   </div>
-</div>
\ No newline at end of file
+</div>