# HG changeset patch
# User Chloe Laisne <chloe.laisne@gmail.com>
# Date 1466780499 -7200
# Node ID 204f2563200677e38fc185479d5f7a8e465e8f9c
# Parent  e038d5782d06963470d065b23aa6b8884f2f3cf2
tabs/discours title + route scss cleanup

diff -r e038d5782d06 -r 204f25632006 cms/app-client/app/components/discourses-component.js
--- a/cms/app-client/app/components/discourses-component.js	Fri Jun 24 15:26:26 2016 +0200
+++ b/cms/app-client/app/components/discourses-component.js	Fri Jun 24 17:01:39 2016 +0200
@@ -18,7 +18,7 @@
         d3.json(baseURL + "/discourses", function(discourses) {
 
             var width = self.$().parent().width();
-            var height = self.$().parent().height();
+            var height = self.$().parent().height() - self.$().siblings().height();
 
             var bubble = d3.layout.pack()
                 .sort(function comparator(a, b) { return a.value + b.value; })
diff -r e038d5782d06 -r 204f25632006 cms/app-client/app/styles/app.scss
--- a/cms/app-client/app/styles/app.scss	Fri Jun 24 15:26:26 2016 +0200
+++ b/cms/app-client/app/styles/app.scss	Fri Jun 24 17:01:39 2016 +0200
@@ -17,10 +17,7 @@
     margin-bottom: 10px;
 
     @import 'tabs/chrono';
-    @import 'tabs/carto';
     @import 'tabs/langues';
-    @import 'tabs/discours';
-    @import 'tabs/thematiques';
     @import 'tabs/detail';
 
     @import 'components/sorting-component';
@@ -44,11 +41,16 @@
     text-align: center;
 }
 
+body.tabs-discours h2 {
+    color: #13212d;
+}
+
 .corpus-app-container {
     color: #687a84;
     box-sizing: border-box;
 }
 
+body.tabs-discours .corpus-app-container,
 body.tabs-chrono .corpus-app-container {
     padding: 20px;
 }
@@ -90,10 +92,8 @@
     float: right;
 }
 
-.mapdiv{
-    width: 470px;
-    background-color: #FFFFFF;
-    height: 500px;
+#mapdiv{
+  width: 100%;
 }
 
 .corpus-app-content {
diff -r e038d5782d06 -r 204f25632006 cms/app-client/app/styles/components/filter-component.scss
--- a/cms/app-client/app/styles/components/filter-component.scss	Fri Jun 24 15:26:26 2016 +0200
+++ b/cms/app-client/app/styles/components/filter-component.scss	Fri Jun 24 17:01:39 2016 +0200
@@ -4,7 +4,7 @@
 }
 
 .filter-component h2 {
-
+    color: #ffffff;
 }
 
 .filter-component ul {
diff -r e038d5782d06 -r 204f25632006 cms/app-client/app/styles/components/playlist-component.scss
--- a/cms/app-client/app/styles/components/playlist-component.scss	Fri Jun 24 15:26:26 2016 +0200
+++ b/cms/app-client/app/styles/components/playlist-component.scss	Fri Jun 24 17:01:39 2016 +0200
@@ -7,6 +7,7 @@
     text-transform: none;
     padding: 0px 20px;
     text-align: left;
+    color: #ffffff;
 }
 
 .playlist-component ul {
diff -r e038d5782d06 -r 204f25632006 cms/app-client/app/styles/tabs/carto.scss
--- a/cms/app-client/app/styles/tabs/carto.scss	Fri Jun 24 15:26:26 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#mapdiv{
-  width: 100%;
-}
diff -r e038d5782d06 -r 204f25632006 cms/app-client/app/styles/tabs/detail.scss
--- a/cms/app-client/app/styles/tabs/detail.scss	Fri Jun 24 15:26:26 2016 +0200
+++ b/cms/app-client/app/styles/tabs/detail.scss	Fri Jun 24 17:01:39 2016 +0200
@@ -1,18 +1,18 @@
 .notice{
-  // padding: 10px;
+	padding: 10px;
 }
 
 .notice-header,
 .notice-body,
 .notice-footer{
-  padding: 10px 10px 0;
+	padding: 10px 10px 0;
 }
 
 .notice-header h2{
-  margin: 0;
+	margin: 0;
 }
 
 .notice-body b{
-  display: inline-block;
-  min-width: 140px;
+	display: inline-block;
+	min-width: 140px;
 }
diff -r e038d5782d06 -r 204f25632006 cms/app-client/app/styles/tabs/discours.scss
--- a/cms/app-client/app/styles/tabs/discours.scss	Fri Jun 24 15:26:26 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-.visu-discours p{
-  cursor: pointer;
-}
-
-.left{
-  float: left;
-  margin-left: 50px;
-}
-
-.right{
-  float: right;
-  margin-right: 50px;
-}
diff -r e038d5782d06 -r 204f25632006 cms/app-client/app/styles/tabs/thematiques.scss
diff -r e038d5782d06 -r 204f25632006 cms/app-client/app/templates/tabs/discours.hbs
--- a/cms/app-client/app/templates/tabs/discours.hbs	Fri Jun 24 15:26:26 2016 +0200
+++ b/cms/app-client/app/templates/tabs/discours.hbs	Fri Jun 24 17:01:39 2016 +0200
@@ -1,1 +1,2 @@
+<h2>Sélectionner un type de discours</h2>
 {{discourses-component}}
\ No newline at end of file