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
path: root/themes
diff options
context:
space:
mode:
authorMarc Delisle <marc@infomarc.info>2015-03-03 23:44:08 +0300
committerMarc Delisle <marc@infomarc.info>2015-03-03 23:44:08 +0300
commitdff3e9f885b040bb21b41cc9630ec20399ef4d47 (patch)
tree7b5529ff79b9ae46d01bb1fef589392707be82e7 /themes
parent70119347253f4bc4af49f20c3a072ff8d9379263 (diff)
parentb661cd7c9b31f8bc564d2f9a1b8527e0eb966de8 (diff)
Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
Diffstat (limited to 'themes')
-rw-r--r--themes/pmahomme/css/common.css.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 2610bc8303..22e6b13827 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -2649,6 +2649,10 @@ fieldset .disabled-field td {
display: inline;
}
+.pma_table th.draggable.right span {
+ margin-<?php echo $right; ?>: 0px;
+}
+
.pma_table th.draggable span {
margin-<?php echo $right; ?>: 10px;
}