From 409081615c8f8f18eed0377df61406739411c03e Mon Sep 17 00:00:00 2001 From: Denis Chenu Date: Sun, 14 Jun 2015 20:28:06 +0200 Subject: [PATCH] Dev: fix CSS for expression link color Dev: gringergreen have a:link, then enforcing with class Dev: lost em-assign color in update --- application/helpers/viewHelper.php | 5 +++-- styles/expressions.css | 13 ++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/application/helpers/viewHelper.php b/application/helpers/viewHelper.php index 4bbe12cda3e..dfd194b79d9 100644 --- a/application/helpers/viewHelper.php +++ b/application/helpers/viewHelper.php @@ -245,8 +245,9 @@ public static function stripTagsEM($sHtml) 'em-var-after', 'em-var-inpage', 'em-var-error', - '.em-error', - ), + 'em-assign', + 'em-error', + ), 'URI.AllowedSchemes'=>array( // Maybe only local ? 'http' => true, 'https' => true, diff --git a/styles/expressions.css b/styles/expressions.css index b26bf315be7..6a38420c49c 100644 --- a/styles/expressions.css +++ b/styles/expressions.css @@ -2,11 +2,10 @@ .em-haveerror{border-color: #ff4500} .em-var-string{color: #808080 /* gray */} .em-function{color: #0000ff /* blue */; } -.em-var-static{color:#a0522d /* sienna */}/* Static */ -.em-var-before{color:#9370db /* mediumpurple*/ }/* Var used before set */ -.em-var-after{color:#008000 /* green */}/* Var used after - no js except for survey */ -.em-var-inpage{color:#4169e1 /* royalblue */} /* Javascript used in survey or group mode*/ -.em-var-error{color: #ff4500} -.em-var-error{color: #ff0000 /* orangered */} +.em-var-static,a.em-var-static{color:#a0522d /* sienna */}/* Static */ +.em-var-before,a.em-var-before{color:#9370db /* mediumpurple*/ }/* Var used before set */ +.em-var-after,a.em-var-after{color:#008000 /* green */}/* Var used after - no js except for survey */ +.em-var-inpage,a.em-var-inpage{color:#4169e1 /* royalblue */} /* Javascript used in survey or group mode*/ +.em-var-error,a.em-var-error{color: #ff0000 /* red */} +.em-assign{color: #ff4500 /* orangered */} .em-error{border: 2px solid #ff0000; /* red */;} -[data-link]{cursor:pointer}