From 258ffbca1884358fd3edf9939b858535b6a544ae Mon Sep 17 00:00:00 2001
From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com>
Date: Thu, 26 Sep 2019 16:00:24 +0200
Subject: [PATCH] fixed merging issue, tooltip descriptions colour

---
 voxygen/src/hud/bag.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/voxygen/src/hud/bag.rs b/voxygen/src/hud/bag.rs
index 9924fdcaaa..fcdd644d13 100644
--- a/voxygen/src/hud/bag.rs
+++ b/voxygen/src/hud/bag.rs
@@ -2,7 +2,7 @@ use super::{
     img_ids::{Imgs, ImgsRot},
     Event as HudEvent, Fonts, TEXT_COLOR, TEXT_COLOR_2,
 };
-use crate::ui::{ImageFrame, Tooltip, Tooltipable};
+use crate::ui::{ImageFrame, Tooltip, TooltipManager, Tooltipable};
 use client::Client;
 use conrod_core::{
     color,
@@ -113,7 +113,7 @@ impl<'a> Widget for Bag<'a> {
         .title_font_size(15)
         .desc_font_size(10)
         .title_text_color(TEXT_COLOR)
-        .desc_text_color(TEXT_COLOR_2);
+        .desc_text_color(TEXT_COLOR);
 
         // Bag parts
         Image::new(self.imgs.bag_bot)
@@ -187,7 +187,7 @@ impl<'a> Widget for Bag<'a> {
                         &item.description(),
                         &item.category(),
                         &item_tooltip,
-                    )
+                    )                    
                     .set(state.ids.inv_slots[i], ui)
             } else {
                 slot_widget.set(state.ids.inv_slots[i], ui)