Merge remote-tracking branch 'origin/master' into plugin_namespaces

Conflicts:
	core/Tracker/Request.php
	core/ViewDataTable.php
	core/ViewDataTable/HtmlTable/Goals.php
	plugins/Actions/Actions.php
	plugins/Annotations/API.php
	plugins/CoreHome/CoreHome.php
	plugins/DBStats/DBStats.php
	plugins/DevicesDetection/DevicesDetection.php
	plugins/Goals/Goals.php
	plugins/Live/Live.php
	plugins/Referers/Referers.php
	plugins/UserSettings/UserSettings.php
	plugins/UsersManager/API.php
	plugins/VisitTime/VisitTime.php
	plugins/VisitorInterest/VisitorInterest.php

3 files changed, 104 insertions, 4 deletions

diff --git a/plugins/Transitions/javascripts/transitions.js b/plugins/Transitions/javascripts/transitions.js
index da6c8a8bc2..d442a0cf4c 100644
--- a/plugins/Transitions/javascripts/transitions.js
+++ b/plugins/Transitions/javascripts/transitions.js
@@ -29,7 +29,7 @@ DataTable_RowActions_Transitions.isPageUrlReport = function (module, action) {
 
 DataTable_RowActions_Transitions.isPageTitleReport = function (module, action) {
     return module == 'Actions' && (action == 'getPageTitles' || action == 'getPageTitlesFollowingSiteSearch');
-}
+};
 
 DataTable_RowActions_Transitions.prototype.trigger = function (tr, e, subTableLabel) {
     var link = tr.find('> td:first > a').attr('href');
@@ -808,9 +808,9 @@ Piwik_Transitions_Canvas.prototype.isNarrowMode = function () {
 /**
  * Helper to create horizontal gradients
  * TODO
- * @param    lightColor
- * @param    darkColor
- * @param    position    left|right
+ * @param    {String} colorGroup
+ * @param    {String} position    left|right
+ * @param    {Boolean} isHighlighted
  */
 Piwik_Transitions_Canvas.prototype.createHorizontalGradient = function (colorGroup, position, isHighlighted) {
     var fromX, toX, fromColor, toColor, lightColor, darkColor;
diff --git a/plugins/Transitions/stylesheets/_transitionColors.less b/plugins/Transitions/stylesheets/_transitionColors.less
new file mode 100644
index 0000000000..e74d16b341
--- /dev/null
+++ b/plugins/Transitions/stylesheets/_transitionColors.less
@@ -0,0 +1,98 @@
+// 
+// transitions colors
+// 
+
+// colors for entries gradients
+.transition-entries[data-name=light] {
+    color: #fff;
+}
+
+.transition-entries[data-name=dark] {
+    color: #BACFE8;
+}
+
+.transition-entries[data-name=light-highlighted] {
+    color: #fff;
+}
+
+.transition-entries[data-name=dark-highlighted] {
+    color: #FAD293;
+}
+
+// colors for exits gradients
+.transition-exits[data-name=light] {
+    color: #fff;
+}
+
+.transition-exits[data-name=dark] {
+    color: #BACFE8;
+}
+
+.transition-exits[data-name=light-highlighted] {
+    color: #fff;
+}
+
+.transition-exits[data-name=dark-highlighted] {
+    color: #FAD293;
+}
+
+// background gradients colors
+.transition-background[data-name=light] {
+    color: #fff;
+}
+
+.transition-background[data-name=dark] {
+    color: #BACFE8;
+}
+
+.transition-background[data-name=light-highlighted] {
+    color: #fff;
+}
+
+.transition-background[data-name=dark-highlighted] {
+    color: #FAD293;
+}
+
+// closed group gradient colors
+.transition-closed-group[data-name=light] {
+    color: #DDE4ED;
+}
+
+.transition-closed-group[data-name=dark] {
+    color: #9BBADE;
+}
+
+.transition-closed-group[data-name=light-highlighted] {
+    color: #FAE2C0;
+}
+
+.transition-closed-group[data-name=dark-highlighted] {
+    color: #FAD293;
+}
+
+// items gradient colors
+.transition-items[data-name=light] {
+    color: #E3DFD1;
+}
+
+.transition-items[data-name=dark] {
+    color: #E8E4D5;
+}
+
+// 'others' gradients colors
+.transition-others[data-name=light] {
+    color: #F5F3EB;
+}
+
+.transition-others[data-name=dark] {
+    color: #E8E4D5;
+}
+
+// loop gradient colors
+.transition-loops[data-name=light] {
+    color: #F5F3EB;
+}
+
+.transition-loops[data-name=dark] {
+    color: #E8E4D5;
+}
\ No newline at end of file
diff --git a/plugins/Transitions/stylesheets/transitions.less b/plugins/Transitions/stylesheets/transitions.less
index 7fc748602b..978ffdd86a 100644
--- a/plugins/Transitions/stylesheets/transitions.less
+++ b/plugins/Transitions/stylesheets/transitions.less
@@ -1,3 +1,5 @@
+@import "_transitionColors";
+
 #Transitions_Container {
     position: relative;
     z-index: 1500;