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:
authorMichal Čihař <mcihar@suse.cz>2012-05-29 17:37:29 +0400
committerMichal Čihař <mcihar@suse.cz>2012-05-29 17:44:31 +0400
commite16d803e78ed806447e5bccb027df3790c07d899 (patch)
tree40af857c902d156efb5ffee73ec9e04c1cc54247 /themes
parentcff9d9d90e4796cbcb749980585d9a60dce7f465 (diff)
Single place to process font size
Diffstat (limited to 'themes')
-rw-r--r--themes/original/css/common.css.php5
-rw-r--r--themes/pmahomme/css/common.css.php3
2 files changed, 3 insertions, 5 deletions
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 50177c8d33..a1058d60cc 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -16,8 +16,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
/* general tags */
html {
- font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : (
- isset($_COOKIE['pma_fontsize']) ? $_COOKIE['pma_fontsize'] : '82%'));?>;
+ font-size: <?php echo $_SESSION['PMA_Theme']->getFontSize(); ?>
}
input,
@@ -2614,7 +2613,7 @@ table.jqplot-cursor-tooltip {
font-size: 0.75em;
z-index: 2;
}
-
+
td.jqplot-cursor-legend-swatch {
vertical-align: middle;
text-align: center;
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index c3454d9a52..8151e8b52b 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -16,8 +16,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
/* general tags */
html {
- font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : (
- isset($_COOKIE['pma_fontsize']) ? $_COOKIE['pma_fontsize'] : '82%'));?>;
+ font-size: <?php echo $_SESSION['PMA_Theme']->getFontSize(); ?>
}
input,