The branch, master has been updated
       via  42cd233d6955011a97564771df2c9889f2d27805 (commit)
       via  a7716192c3304da2becf72a0c7743c93864d6daa (commit)
      from  07487b01b4cd7a7f48c83bc139538ccf17ca259c (commit)


- Log -----------------------------------------------------------------
commit 42cd233d6955011a97564771df2c9889f2d27805
Author: Michal Čihař <[email protected]>
Date:   Thu Jul 21 13:26:01 2011 +0200

    Move custom CSS out of jquery generated files

commit a7716192c3304da2becf72a0c7743c93864d6daa
Author: Michal Čihař <[email protected]>
Date:   Thu Jul 21 13:25:46 2011 +0200

    Whitespace cleanup

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

Summary of changes:
 themes/original/css/theme_right.css.php         |   10 ++++++----
 themes/original/jquery/jquery-ui-1.8.custom.css |    2 --
 themes/pmahomme/css/theme_right.css.php         |   12 +++++++-----
 themes/pmahomme/jquery/jquery-ui-1.8.custom.css |    2 --
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/themes/original/css/theme_right.css.php 
b/themes/original/css/theme_right.css.php
index 22a5494..94cd84a 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -965,7 +965,7 @@ img.sortableIcon {
 }
 
 h3#serverstatusqueries span {
-    font-size:60%;    
+    font-size:60%;
     display:inline;
 }
 
@@ -1046,9 +1046,9 @@ div#serverstatus table .tblFooters a:after {
 }
 
 div.liveChart {
-    clear:both; 
-    min-width:500px; 
-    height:400px; 
+    clear:both;
+    min-width:500px;
+    height:400px;
     padding-bottom:80px;
 }
 
@@ -2290,3 +2290,5 @@ span.mysql-number {
 .navigation select {
     margin: 0 0.8em;
 }
+/* Timepicker */
+#ui-timepicker-div { z-index: 1003; }
diff --git a/themes/original/jquery/jquery-ui-1.8.custom.css 
b/themes/original/jquery/jquery-ui-1.8.custom.css
index edcb8e6..0ae653b 100644
--- a/themes/original/jquery/jquery-ui-1.8.custom.css
+++ b/themes/original/jquery/jquery-ui-1.8.custom.css
@@ -486,5 +486,3 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; 
} /* reset extra pad
 ----------------------------------*/
 .ui-progressbar { height:2em; text-align: left; }
 .ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
-/* Timepicker */
-#ui-timepicker-div { z-index: 1003; }
diff --git a/themes/pmahomme/css/theme_right.css.php 
b/themes/pmahomme/css/theme_right.css.php
index 95f5cd6..0896b3f 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -1171,7 +1171,7 @@ img.sortableIcon {
 }
 
 h3#serverstatusqueries span {
-    font-size:60%;    
+    font-size:60%;
     display:inline;
 }
 
@@ -1244,9 +1244,9 @@ div#serverstatus table .tblFooters a {
 }
 
 div.liveChart {
-    clear:both; 
-    min-width:500px; 
-    height:400px; 
+    clear:both;
+    min-width:500px;
+    height:400px;
     padding-bottom:80px;
 }
 
@@ -2680,7 +2680,7 @@ span.mysql-number {
     border-radius: 5px;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
-    
+
     background-image: url(./themes/svg_gradient.php?from=eeeeee&to=cccccc);
     background-size: 100% 100%;
     background: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), 
to(#cccccc));
@@ -2734,3 +2734,5 @@ span.mysql-number {
 .navigation select {
     margin: 0 0.8em;
 }
+/* Timepicker */
+#ui-timepicker-div { z-index: 1003; }
diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.custom.css 
b/themes/pmahomme/jquery/jquery-ui-1.8.custom.css
index ca2b44b..fd337dd 100644
--- a/themes/pmahomme/jquery/jquery-ui-1.8.custom.css
+++ b/themes/pmahomme/jquery/jquery-ui-1.8.custom.css
@@ -486,5 +486,3 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; 
} /* reset extra pad
 ----------------------------------*/
 .ui-progressbar { height:2em; text-align: left; }
 .ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
-/* Timepicker */
-#ui-timepicker-div { z-index: 1003; }


hooks/post-receive
-- 
phpMyAdmin

------------------------------------------------------------------------------
5 Ways to Improve & Secure Unified Communications
Unified Communications promises greater efficiencies for business. UC can 
improve internal communications as well as offer faster, more efficient ways
to interact with customers and streamline customer service. Learn more!
http://www.accelacomm.com/jaw/sfnl/114/51426253/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to