Merge
authorChloe Laisne <chloe.laisne@gmail.com>
Tue, 18 Oct 2016 20:10:45 +0530
changeset 361 90cb51111854
parent 360 d592af4a27a0 (diff)
parent 358 be40e00aa56f (current diff)
child 362 c7aac4484587
Merge
--- a/cms/app-client/app/components/visu-langues.js	Tue Oct 18 16:02:54 2016 +0200
+++ b/cms/app-client/app/components/visu-langues.js	Tue Oct 18 20:10:45 2016 +0530
@@ -150,9 +150,9 @@
                 var dMax = Math.max.apply(null, d._children.map(function(d){ return d.count; }));
 
                 function shade(d) {
-                    var color = "#becfd4";
+                    var color = "#777777";
                     var aColor = hexadecimalToInteger(color);
-                    var solidColor = "#71848d";
+                    var solidColor = "#333333";
                     var aSolidColor = hexadecimalToInteger(solidColor);
                     var aFillColor = [];
                     for(var i = 0; i < 3; i++) {
--- a/cms/app-client/app/styles/components/player-component.scss	Tue Oct 18 16:02:54 2016 +0200
+++ b/cms/app-client/app/styles/components/player-component.scss	Tue Oct 18 20:10:45 2016 +0530
@@ -110,6 +110,7 @@
     display: block;
     top: 50%;
     cursor: pointer;
+    border: none;
 }
 
 .player-component #audio.extra .progress .bar {
--- a/cms/app-client/app/styles/components/playlist-component.scss	Tue Oct 18 16:02:54 2016 +0200
+++ b/cms/app-client/app/styles/components/playlist-component.scss	Tue Oct 18 20:10:45 2016 +0530
@@ -25,10 +25,12 @@
     font-size: 13px;
     display: inline-block;
     color: inherit;
+    margin: 0;
 }
 
 .playlist-component .header .pagination {
     float: right;
+    margin: 0;
 }
 
 .playlist-component .header .pagination .fa {
@@ -51,6 +53,7 @@
     font-size: 0px;
     overflow-y: scroll;
     position: relative;
+    width: 100%;
 }
 
 .playlist-component ul li {
--- a/cms/app-client/app/styles/tabs/langues.scss	Tue Oct 18 16:02:54 2016 +0200
+++ b/cms/app-client/app/styles/tabs/langues.scss	Tue Oct 18 20:10:45 2016 +0530
@@ -11,17 +11,17 @@
 #tabs-langues .breadcrumbs:hover,
 #tabs-langues .node:hover,
 #tabs-langues .node.selected {
-	background-color: $medium-blue!important;
-	color: $light-blue!important;
+	background-color: $corpus-blue!important;
+	color: $corpus-white!important;
 }
 
 #tabs-langues .breadcrumbs {
-	background-color: $medium-white;
-    color: $medium-blue;
+	background-color: $corpus-white;
+    color: $corpus-black;
     position: relative;
 	line-height: 30px;
 	padding: 0 10px;
-	border-bottom: 1px solid $medium-blue;
+	border-bottom: 1px solid $corpus-white;
 	box-sizing: border-box;
 }
 
@@ -49,12 +49,11 @@
 	position: absolute;
 	margin: 0;
 	padding: 0;
-	border-left: 1px solid $dark-grey;
-	border-bottom: 1px solid $dark-grey;
+	border-left: 1px solid $corpus-white;
+	border-bottom: 1px solid $corpus-white;
 	padding: 10px;
 	box-sizing: border-box;
-	background-color: $medium-white;
-	color: $light-white;
+	color: $corpus-white;
 }
 
 #tabs-langues .node:hover {