The branch, master has been updated via 082d410d253dd9ccdc90870d9acdd29e6a6cc30d (commit) from baf339f802ae65d3776e40bdb9291d4efe13b0e1 (commit)
- Log ----------------------------------------------------------------- commit 082d410d253dd9ccdc90870d9acdd29e6a6cc30d Author: Marc Delisle marc@infomarc.info Date: Wed May 4 06:31:26 2011 -0400
Continue to replace warning level with error level
-----------------------------------------------------------------------
Summary of changes: themes/original/css/theme_right.css.php | 28 +------------------------- themes/original/img/s_warn.png | Bin 201 -> 0 bytes themes/pmahomme/css/theme_right.css.php | 33 +------------------------------ themes/pmahomme/img/s_warn.png | Bin 701 -> 0 bytes themes/pmahomme/img/tab_warning_bg.png | Bin 1697 -> 0 bytes 5 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 themes/original/img/s_warn.png delete mode 100644 themes/pmahomme/img/s_warn.png delete mode 100644 themes/pmahomme/img/tab_warning_bg.png
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 5b12292..431adbc 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -396,10 +396,9 @@ td .icon { margin-<?php echo $left; ?>: 0.6em; }
-/* message boxes: warning, error, confirmation */ +/* message boxes: error, confirmation */ .success h1, .notice h1, -.warning h1, div.error h1 { border-bottom: 2px solid; font-weight: bold; @@ -409,7 +408,6 @@ div.error h1 {
div.success, div.notice, -div.warning, div.error, div.footnotes { margin: 0.3em 0 0 0; @@ -475,30 +473,6 @@ div.footnotes { border-color: #FFD700; }
-.warning { - color: #CC0000; - background-color: #FFFFCC; -} -p.warning, -h1.warning, -div.warning { - border-color: #CC0000; - <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?> - background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png); - background-repeat: no-repeat; - <?php if ($GLOBALS['text_dir'] === 'ltr') { ?> - background-position: 5px 50%; - padding: 0.2em 0.2em 0.2em 25px; - <?php } else { ?> - background-position: 97% 50%; - padding: 0.2em 25px 0.2em 0.2em; - <?php } ?> - <?php } ?> -} -.warning h1 { - border-color: #cc0000; -} - .error { background-color: #FFFFCC; color: #ff0000; diff --git a/themes/original/img/s_warn.png b/themes/original/img/s_warn.png deleted file mode 100644 index 26e0348..0000000 Binary files a/themes/original/img/s_warn.png and /dev/null differ diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 9654cd9..80ac42d 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -569,10 +569,9 @@ td .icon { margin-<?php echo $left; ?>: 0.6em; }
-/* message boxes: warning, error, confirmation */ +/* message boxes: error, confirmation */ .success h1, .notice h1, -.warning h1, div.error h1 { border-bottom: 2px solid; font-weight: bold; @@ -582,7 +581,6 @@ div.error h1 {
div.success, div.notice, -div.warning, div.error, div.footnotes { margin: 0.5em 0 1.3em 0; @@ -611,7 +609,6 @@ div.footnotes {
.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;}
@@ -658,30 +655,6 @@ div.footnotes { border-color: #ffb10a; }
-.warning { - color: #000; - background:url(./themes/pmahomme/img/tab_warning_bg.png) 50% 0% #f2baba; -} - - -p.warning, -h1.warning, -div.warning { - border-color: #e0a1a1; - <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?> - background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png); - background-repeat: no-repeat; - <?php if ($GLOBALS['text_dir'] === 'ltr') { ?> - background-position: 5px 50%; - <?php } else { ?> - background-position: 97% 50%; - <?php } ?> - <?php } ?> -} -.warning h1 { - border-color: #cc0000; -} - .error { border:1px solid maroon !important; color: #000; @@ -957,9 +930,6 @@ ul#topmenu ul { padding: 0.1em 0.3em 0.1em 0.3em; }
-#topmenu .warning {font-size:1em !important; background:#f3f3f3; } -#topmenu .warning a span{color:#ddd !important;} - ul#topmenu ul { -moz-box-shadow: 1px 1px 6px #ddd; -webkit-box-shadow: 2px 2px 3px #666; @@ -1022,7 +992,6 @@ ul#topmenu > li.active {
/* disabled drop/empty tabs */ ul#topmenu span.tab, -a.warning, ul#topmenu span.tabcaution { cursor: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>error.ico), default; color:#ccc; diff --git a/themes/pmahomme/img/s_warn.png b/themes/pmahomme/img/s_warn.png deleted file mode 100644 index c37bd06..0000000 Binary files a/themes/pmahomme/img/s_warn.png and /dev/null differ diff --git a/themes/pmahomme/img/tab_warning_bg.png b/themes/pmahomme/img/tab_warning_bg.png deleted file mode 100644 index bf45105..0000000 Binary files a/themes/pmahomme/img/tab_warning_bg.png and /dev/null differ
hooks/post-receive