Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--setup/styles.css4
-rw-r--r--test/libraries/PMA_FormDisplay_tpl_test.php8
2 files changed, 2 insertions, 10 deletions
diff --git a/setup/styles.css b/setup/styles.css
index 2159934b3a..285d68e413 100644
--- a/setup/styles.css
+++ b/setup/styles.css
@@ -94,11 +94,11 @@ h1 {
/* phpMyAdmin logo colors */
.blue {
- color: #7584B3;
+ color: #666699;
}
.orange {
- color: #FFAD17;
+ color: #FF9900;
}
.red {
diff --git a/test/libraries/PMA_FormDisplay_tpl_test.php b/test/libraries/PMA_FormDisplay_tpl_test.php
index 014491224a..d4f2cce695 100644
--- a/test/libraries/PMA_FormDisplay_tpl_test.php
+++ b/test/libraries/PMA_FormDisplay_tpl_test.php
@@ -203,7 +203,6 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
$opts['userprefs_allow'] = false;
$opts['setvalue'] = ':group';
$opts['doc'] = "http://doclink";
- $opts['wiki'] = "http://wikilink";
$opts['comment'] = "testComment";
$opts['comment_warning'] = true;
$opts['show_restore_default'] = true;
@@ -255,13 +254,6 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
$this->assertTag(
PMA_getTagArray(
- '<img src="testImages_info.png" title="Wiki" alt="Wiki" />'
- ),
- $result
- );
-
- $this->assertTag(
- PMA_getTagArray(
'<span class="disabled-notice">'
),
$result