From 357647577fd96144ba6b51dddf340203c781f484 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Thu, 22 May 2014 11:42:20 +0200
Subject: [PATCH] use view color for text in textfield

BUG:333837
---
 .../plasmacomponents/qml/TextField.qml        |  4 ++--
 src/desktoptheme/oxygen/colors                | 24 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/declarativeimports/plasmacomponents/qml/TextField.qml b/src/declarativeimports/plasmacomponents/qml/TextField.qml
index d2d283eb8..d5883a683 100644
--- a/src/declarativeimports/plasmacomponents/qml/TextField.qml
+++ b/src/declarativeimports/plasmacomponents/qml/TextField.qml
@@ -319,7 +319,7 @@ FocusScope {
         text: placeholderText
         visible: textInput.text == "" && !textField.activeFocus
         // XXX: using textColor and low opacity for theming placeholderText
-        color: theme.buttonTextColor
+        color: theme.viewTextColor
         opacity: 0.5
         elide: Text.ElideRight
         clip: true
@@ -349,7 +349,7 @@ FocusScope {
         renderType: Text.NativeRendering
         passwordCharacter: "•"
         selectByMouse: true
-        color: theme.buttonTextColor
+        color: theme.viewTextColor
         enabled: textField.enabled
         clip: true
         focus: true
diff --git a/src/desktoptheme/oxygen/colors b/src/desktoptheme/oxygen/colors
index 93ed4f728..760c109df 100644
--- a/src/desktoptheme/oxygen/colors
+++ b/src/desktoptheme/oxygen/colors
@@ -41,18 +41,18 @@ ForegroundPositive=0,95,0
 ForegroundVisited=88,55,150
 
 [Colors:View]
-BackgroundAlternate=85,85,85
-BackgroundNormal=0,0,0
-DecorationFocus=239,132,65
-DecorationHover=119,183,255
-ForegroundActive=0,0,0
-ForegroundInactive=0,0,0
-ForegroundLink=164,192,228
-ForegroundNegative=0,0,0
-ForegroundNeutral=187,187,187
-ForegroundNormal=255,255,255
-ForegroundPositive=0,95,0
-ForegroundVisited=97,147,207
+BackgroundAlternate=248,247,246
+BackgroundNormal=252,252,252
+DecorationFocus=30,146,255
+DecorationHover=61,174,230
+ForegroundActive=246,116,0
+ForegroundInactive=175,176,179
+ForegroundLink=61,174,230
+ForegroundNegative=237,21,21
+ForegroundNeutral=201,206,59
+ForegroundNormal=49,54,59
+ForegroundPositive=17,209,22
+ForegroundVisited=61,174,230
 
 [Colors:Window]
 BackgroundAlternate=40,40,40