From f1a95a7fa4f62b041fdd7719c4e7d5b8eaae52ff Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Tue, 16 Sep 2014 18:34:47 +0200 Subject: [PATCH] Checkpoint commit - more prettification --- Site5/Pages/v5/Ledgers/AccountPlan.aspx | 7 +------ Site5/Style/style-v5.css | 26 ++++++++++++++++++++----- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Site5/Pages/v5/Ledgers/AccountPlan.aspx b/Site5/Pages/v5/Ledgers/AccountPlan.aspx index b2024a73..1581177c 100644 --- a/Site5/Pages/v5/Ledgers/AccountPlan.aspx +++ b/Site5/Pages/v5/Ledgers/AccountPlan.aspx @@ -168,14 +168,9 @@ $('#SpanTextCurrency').text(msg.d.CurrencyCode); $('#SpanEditBalance').text(msg.d.Balance); - - alert('foo'); - parentAccountName = msg.d.ParentAccountName; setAccountTreeText(parentAccountName); - alert('bar'); - $('span#<%= DropOwner.ClientID %>_SpanPeople span input.combo-text').css('background-color', '#FFF'); $('span#<%= DropOwner.ClientID %>_SpanPeople span input.combo-text').css('background-image', "url('" + msg.d.AccountOwnerAvatarUrl + "')"); $('span#<%= DropOwner.ClientID %>_SpanPeople span input.combo-text').attr('placeholder', msg.d.AccountOwnerName); @@ -330,7 +325,7 @@ } else { setTimeout(function() { setAccountTreeText(text); - }, 2500); + }, 250); } } diff --git a/Site5/Style/style-v5.css b/Site5/Style/style-v5.css index 76e79ee0..69bcc1d9 100644 --- a/Site5/Style/style-v5.css +++ b/Site5/Style/style-v5.css @@ -937,15 +937,31 @@ hr -.fakePlaceholderText ::webkit-input-placeholder, -.fakePlaceholderText ::moz-placeholder, +.fakePlaceholderText ::webkit-input-placeholder { + color: #000; +} +.fakePlaceholderText span input.combo-text:moz-placeholder { + color: #000; + opacity: 1; +} +.fakePlaceholderText span input.combo-text::moz-placeholder { + color: #000; + opacity: 1; +} .fakePlaceholderText :ms-input-placeholder { color: #000; } -.fakePlaceholderText span input.combo-text:focus ::webkit-input-placeholder, -.fakePlaceholderText span input.combo-text:focus ::moz-placeholder, -.fakePlaceholderText span input.combo-text:focus :ms-input-placeholder { +.fakePlaceholderText span input.combo-text:focus::webkit-input-placeholder { + color: #FFF; +} +.fakePlaceholderText span input.combo-text:focus:moz-placeholder { + color: #FFF; +} +.fakePlaceholderText span input.combo-text:focus::moz-placeholder { + color: #FFF; +} +.fakePlaceholderText span input.combo-text:focus:ms-input-placeholder { color: #FFF; }