Merge branch 'feature/speakers_carousel' into develop

Conflicts:
	app/assets/stylesheets/custom/_areas.scss
	app/assets/stylesheets/custom/_main.scss

app/assets/stylesheets/custom/_areas.scss

@@ -8,40 +8,40 @@ $violin: #016f9d;
 $disabled: #ccc;
 
 .themes-talk {
-	.row {
-		margin-bottom: 20px;
-		&:last-child {
-			margin-bottom: 0;
-		}
-	}
-	.theme-block {
-		color: #fff;
-		padding: 20px;
-		min-height: 160px;
-		h4 {
-			color: #fff !important;		
-		}
-	}
+  .row {
+    margin-bottom: 20px;
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+  .theme-block {
+    color: #fff;
+    padding: 20px;
+    min-height: 160px;
+    h4 {
+      color: #fff !important;
+    }
+  }
 }
 
 .g-blue {
-	background-color: $blue;
+  background-color: $blue;
 }
 .g-red {
-	background-color: $red;
+  background-color: $red;
 }
 .g-green {
-	background-color: $green;
+  background-color: $green;
 }
 .g-orange {
-	background-color: $orange;
+  background-color: $orange;
 }
 .g-yellow {
-	background-color: $yellow;
+  background-color: $yellow;
 }
 .g-violin {
-	background-color: $violin;
+  background-color: $violin;
 }
 .g-disabled {
-	background-color: $disabled;
+  background-color: $disabled;
 }

app/assets/stylesheets/custom/_main.scss

@@ -21,6 +21,7 @@ header .info {
   padding-top: 44px;
 }
 header .info h3 {
+
   color: $main_color;
   text-transform: uppercase;
   font-family: Arial;
@@ -31,6 +32,24 @@ header .info h3 .color {
   color: #7c7852 !important;
 }
 
+// slider
+.da-slider {
+  border-top-color: #d4724b;
+  border-bottom-color: #d4724b;
+  color: #000;
+  margin-bottom: 60px;
+}
+.da-slide {
+  p {
+    height: 160px;
+    color: #000;
+  }
+  h2 {
+    font-size: 40px;
+    color: #000;
+  }
+}
+
 // main elements
 a {
   color: $main_color !important;
@@ -53,9 +72,6 @@ h1 {
     color: #333 !important;
   }
 }
-.da-slide p {
-  height: 150px;
-}
 .center {
   text-align: center !important;
 }
@@ -80,14 +96,14 @@ td.middle {
 }
 
 // twitter widget
-.nastachku-twitter-widget {	
-	border: 1px solid #ddd;
+.nastachku-twitter-widget {
+  border: 1px solid #ddd;
 }
 .twtr-doc {
-	border-radius: 0 !important;
+  border-radius: 0 !important;
 }
 .twtr-ft {
-	background-color: #ddd;
+  background-color: #ddd;
 }
 
 // participants table

app/controllers/web/welcome_controller.rb

@@ -2,6 +2,7 @@
 class Web::WelcomeController < Web::ApplicationController
   def index
     @news = News.web
+    @lectors = User.as_lectors.by_created_at
   end
 
 end

app/views/web/welcome/_lectors_carousel.html.haml

@@ -0,0 +1,24 @@
+.row
+  .span12
+    #da-slider.da-slider
+      - @lectors.each do |lector|
+        .da-slide
+          .da-blue
+            %h2
+              %span
+                = lector.full_name
+              %br/
+            %p
+              %strong
+                %small
+                  = lector.company
+              %br/
+              %br/
+              = lector.about
+            .da-img
+              - if lector.photo.url
+                = image_tag(lector.photo.url)
+
+        %nav.da-arrows
+          %span.da-arrows-prev
+          %span.da-arrows-next

app/views/web/welcome/index.html.haml

@@ -1,5 +1,5 @@
 = render "themes"
+= render "lectors_carousel"
+= render "want_to_do"
 .border
 = render "news"
-.border
-= render "want_to_do"