From e16d803e78ed806447e5bccb027df3790c07d899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 15:37:29 +0200
Subject: Single place to process font size

---
 themes/original/css/common.css.php | 5 ++---
 themes/pmahomme/css/common.css.php | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'themes')

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,
-- 
cgit v1.2.3