fixes conflicts

2015-08-06 13:42:57 +02:00
parent 56f480d5c0 ca575a6f20
commit ec6d34a49f
35 changed files with 442 additions and 191 deletions
--- a/app/assets/stylesheets/debates.scss
+++ b/app/assets/stylesheets/debates.scss
@@ -247,7 +247,7 @@ header {
 // 05.1. Debates Index
 // - - - - - - - - - - - -

-.debates-featured {
+.debate-featured {
  margin-bottom: rem-calc(34);
  margin-top: rem-calc(23);

@@ -345,8 +345,8 @@ header {
  margin-bottom: $line-height*2;
 }

-.debates-index {
-  @extend .debates-featured;
+.debate {
+  @extend .debate-featured;
  margin-bottom: 0;
  margin-top: 0;