The branch, master has been updated via 7408db5eef64cf463a66dc75f7255136e885ad7b (commit) via 4520c809f39899415d4f6852b4fc652fae9ee793 (commit) from 60e08fc20c3dc216a23c38089ec51a817760184d (commit)

- Log ----------------------------------------------------------------- commit 7408db5eef64cf463a66dc75f7255136e885ad7b Merge: 4520c809f39899415d4f6852b4fc652fae9ee793 60e08fc20c3dc216a23c38089ec51a817760184d Author: Mike Hommé mike@globalcode.org Date: Mon Apr 18 23:35:56 2011 -0400

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit 4520c809f39899415d4f6852b4fc652fae9ee793 Author: Mike Hommé mike@globalcode.org Date: Mon Apr 18 22:56:33 2011 -0400

Moves colors around on "informational" messages such as warnings, info, successes, errors.

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

Summary of changes: themes/pmahomme/css/theme_right.css.php | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index eaf6095..a013337 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -88,6 +88,9 @@ a:hover { -webkit-border-radius:5px; border-radius:5px; } + +#initials_table td{padding:8px !important} + #initials_table a { border:1px solid #aaa; background:#fff; @@ -583,13 +586,22 @@ div.footnotes { <?php } else { ?> padding: 0.3em; <?php } ?> + -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; - -moz-box-shadow: 0px 1px 2px #fff inset; - -webkit-box-shadow: 0px 1px 2px #fff inset; + + -moz-box-shadow: 0 1px 1px #fff inset; + -webkit-box-shadow: 0 1px 1px #fff inset; + box-shadow: 0 1px 1px #fff inset; }

+.success a{text-decoration:underline;} +.notice a{text-decoration:underline;} +.warning a{text-decoration:underline;} +.error a{text-decoration:underline;} +.footnotes a{text-decoration:underline;} + .success { color: #000000; background-color: #ebf8a4; @@ -612,13 +624,13 @@ div.success { }

.notice, .footnotes { - color: #000000; - background-color: #ffeda4; + color: #3a6c7e; + background-color: #e8eef1; } h1.notice, div.notice, div.footnotes { - border-color: #eccf5b; + border-color: #3a6c7e; <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?> background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png); background-repeat: no-repeat; @@ -659,8 +671,8 @@ div.warning {

.error { border:1px solid maroon !important; - color: #fff; - background:url(./themes/pmahomme/img/tab_warning_bg.png) 50% 0% #e97777; + color: #000; + background:pink; }

h1.error, @@ -680,6 +692,8 @@ div.error h1 { border-color: #ff0000; }

+ + .confirmation { color: #000000; background-color: pink;

hooks/post-receive