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:
authorMadhura Jayaratne <madhura.cj@gmail.com>2015-05-25 12:09:24 +0300
committerMadhura Jayaratne <madhura.cj@gmail.com>2015-05-25 12:09:24 +0300
commitcdbcb85d52e7e10b1c35ecf9223c9674e4fa640c (patch)
treea2cc3745aee9b01ba4cd1866f10379563861ac0c
parentff784378204ac0d89a3e14785fa04b8a3de4687b (diff)
bug #4921 Textarea rows settings ignored Features > Text fields
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
-rw-r--r--ChangeLog1
-rw-r--r--themes/original/css/common.css.php5
-rw-r--r--themes/pmahomme/css/common.css.php2
3 files changed, 1 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index c0a5e39721..f43e8e4446 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,7 @@ phpMyAdmin - ChangeLog
+ rfe #1242 Work with --skip-grant-tables
- bug #4922 "Sort by key" drop-down value is lost
+ rfe #1673 Browse: improve display of right-aligned data
+- bug #4921 Textarea rows settings ignored Features > Text fields
4.4.8.0 (not yet released)
- bug Allow accessing visual query builder when pmadb is not configured
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index e926a2be0d..ee4cf21122 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -120,11 +120,6 @@ form {
textarea {
overflow: visible;
- height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
-}
-
-textarea.char {
- height: <?php echo ceil($GLOBALS['cfg']['CharTextareaRows'] * 1.2); ?>em;
}
fieldset {
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 00d83576b3..0c0bcf8995 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -325,12 +325,10 @@ input.button:disabled {
textarea {
overflow: visible;
margin: 6px;
- height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
}
textarea.char {
margin: 6px;
- height: <?php echo ceil($GLOBALS['cfg']['CharTextareaRows'] * 1.2); ?>em;
}
fieldset, .preview_sql {