From a677048bd38bc52001e7c95af892ef6726ab0cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Thu, 18 Jun 2015 09:52:07 +0200
Subject: [PATCH] Fix conflicts and IE11

---
 app/styles/core/base.scss            |  1 -
 app/styles/modules/home-project.scss | 39 +---------------------------
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/app/styles/core/base.scss b/app/styles/core/base.scss
index fb8a0bd9..3244ad0c 100644
--- a/app/styles/core/base.scss
+++ b/app/styles/core/base.scss
@@ -46,7 +46,6 @@ body {
 
 .centered {
     @extend %main;
-    margin: 0 auto;
     max-width: 1200px;
     min-width: 960px;
     width: 90%;
diff --git a/app/styles/modules/home-project.scss b/app/styles/modules/home-project.scss
index 3300ee9d..233e2170 100644
--- a/app/styles/modules/home-project.scss
+++ b/app/styles/modules/home-project.scss
@@ -37,7 +37,7 @@
         flex: 1;
         flex-shrink: 3;
         margin-right: 1rem;
-        max-width: 800px;
+        max-width: 960px;
         width: 0;
     }
     .involved-data {
@@ -63,40 +63,3 @@
         }
     }
 }
-
-
-//.summary-stats {
-//    align-items: flex-start;
-//    display: flex;
-//    .info-num {
-//        @extend %xlarge;
-//        @extend %bold;
-//        float: left;
-//        margin-right: .3rem;
-//        position: relative;
-//        top: 5px;
-//    }
-//    .info-text {
-//        @extend %small;
-//        float: left;
-//        line-height: .9rem;
-//    }
-//}
-//
-//.project-data-container {
-//    display: flex;
-//    justify-content: space-between;
-//    ul {
-//        flex-grow: 0;
-//        max-width: 33%;
-//    }
-//    li {
-//        display: inline-block;
-//        margin-right: .1rem;
-//        width: 10%;
-//        figure {
-//            width: 100%;
-//        }
-//    }
-//}
-//