[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1370-gbbca056

[Michal Čihař]

The branch, master has been updated
       via  bbca0565ce5be3d1bd247c8ba11d2fcafa66990b (commit)
      from  b308f064f25402141fd2c4702c3fc1c458f09b18 (commit)


- Log -----------------------------------------------------------------
commit bbca0565ce5be3d1bd247c8ba11d2fcafa66990b
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Dec 31 15:23:53 2010 +0100

    Unify terminology for CSS/HTML colors.

-----------------------------------------------------------------------

Summary of changes:
 Documentation.html |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 2e45edc..32dc8a1 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1787,18 +1787,18 @@ $cfg['TrustedProxies'] =
     <dd>Navi frame width in pixels. See <tt>themes/themename/layout.inc.php</tt>.
     </dd>
 
-    <dt><span id="cfg_NaviBackground">$cfg['NaviBackground']</span> string [valid css code for background]<br />
-        <span id="cfg_MainBackground">$cfg['MainBackground']</span> string [valid css code for background]
+    <dt><span id="cfg_NaviBackground">$cfg['NaviBackground']</span> string [CSS color for background]<br />
+        <span id="cfg_MainBackground">$cfg['MainBackground']</span> string [CSS color for background]
     </dt>
     <dd>The background styles used for both the frames.
         See <tt>themes/themename/layout.inc.php</tt>.</dd>
 
-    <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] string [valid css code for background]<br />
-        <span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> string [valid css color]</dt>
+    <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] string [CSS color for background]<br />
+        <span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> string [CSS color]</dt>
     <dd>The style used for the pointer in the navi frame.
         See <tt>themes/themename/layout.inc.php</tt>.</dd>
 
-    <dt id="cfg_NaviDatabaseNameColor">$cfg['NaviDatabaseNameColor'] string [valid css code]<br />
+    <dt id="cfg_NaviDatabaseNameColor">$cfg['NaviDatabaseNameColor'] string [CSS color]<br />
     </dt>
     <dd>The color used for the database name in the navi frame.
     See <tt>themes/themename/layout.inc.php</tt>.</dd>
@@ -1811,23 +1811,23 @@ $cfg['TrustedProxies'] =
     <dd>The size of a table's border. See <tt>themes/themename/layout.inc.php</tt>.
     </dd>
 
-    <dt id="cfg_ThBackground">$cfg['ThBackground'] string [valid css code for background]<br />
-        <span id="cfg_ThColor">$cfg['ThColor']</span> string [valid css color]</dt>
+    <dt id="cfg_ThBackground">$cfg['ThBackground'] string [CSS color for background]<br />
+        <span id="cfg_ThColor">$cfg['ThColor']</span> string [CSS color]</dt>
     <dd>The style used for table headers. See
         <tt>themes/themename/layout.inc.php</tt>.</dd>
 
-    <dt id="cfg_BgcolorOne">$cfg['BgOne'] string [HTML color]</dt>
+    <dt id="cfg_BgcolorOne">$cfg['BgOne'] string [CSS color]</dt>
     <dd>The color (HTML) #1 for table rows. See <tt>themes/themename/layout.inc.php</tt>.
     </dd>
 
-    <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] string [HTML color]</dt>
+    <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] string [CSS color]</dt>
     <dd>The color (HTML) #2 for table rows. See <tt>themes/themename/layout.inc.php</tt>.
     </dd>
 
-    <dt><span id="cfg_BrowsePointerBackground">$cfg['BrowsePointerBackground'] </span>string [HTML color]<br />
-        <span id="cfg_BrowsePointerColor">$cfg['BrowsePointerColor'] </span>string [HTML color]<br />
-        <span id="cfg_BrowseMarkerBackground">$cfg['BrowseMarkerBackground'] </span>string [HTML color]<br />
-        <span id="cfg_BrowseMarkerColor">$cfg['BrowseMarkerColor'] </span>string [HTML color]
+    <dt><span id="cfg_BrowsePointerBackground">$cfg['BrowsePointerBackground'] </span>string [CSS color]<br />
+        <span id="cfg_BrowsePointerColor">$cfg['BrowsePointerColor'] </span>string [CSS color]<br />
+        <span id="cfg_BrowseMarkerBackground">$cfg['BrowseMarkerBackground'] </span>string [CSS color]<br />
+        <span id="cfg_BrowseMarkerColor">$cfg['BrowseMarkerColor'] </span>string [CSS color]
     </dt>
     <dd>The colors (HTML) uses for the pointer and the marker in browse mode.<br />
         The former feature highlights the row over which your mouse is passing


hooks/post-receive
-- 
phpMyAdmin