more notice css tweaks

Trottel · Apr 18, 2013 · 3c20046 · 3c20046
1 parent 6a1f424
commit 3c20046
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/classes/handler/public.php b/classes/handler/public.php
@@ -929,7 +929,7 @@ function confirmOP() {
 
 					} else {
 
-						print "<h2>" . "Tiny Tiny RSS database is up to date." . "</h2>";
+						print_notice("Tiny Tiny RSS database is up to date.");
 
 						print "<p><form method=\"GET\" action=\"index.php\">
 							<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">

diff --git a/include/functions.php b/include/functions.php
@@ -2925,19 +2925,19 @@ function render_login_form() {
 	function format_warning($msg, $id = "") {
 		global $link;
 		return "<div class=\"warning\" id=\"$id\">
-			<img src=\"images/sign_excl.svg\">$msg</div>";
+			<span><img src=\"images/sign_excl.svg\"></span><span>$msg</span></div>";
 	}
 
 	function format_notice($msg, $id = "") {
 		global $link;
 		return "<div class=\"notice\" id=\"$id\">
-			<img src=\"images/sign_info.svg\">$msg</div>";
+			<span><img src=\"images/sign_info.svg\"></span><span>$msg</span></div>";
 	}
 
 	function format_error($msg, $id = "") {
 		global $link;
 		return "<div class=\"error\" id=\"$id\">
-			<img src=\"images/sign_excl.svg\">$msg</div>";
+			<span><img src=\"images/sign_excl.svg\"></span><span>$msg</span></div>";
 	}
 
 	function print_notice($msg) {

diff --git a/install/index.php b/install/index.php
@@ -80,12 +80,13 @@ function sanity_check($db_type) {
 	}
 
 	function print_error($msg) {
-		print "<div class='error'><img src='../images/sign_excl.svg'> $msg</div>";
+		print "<div class='error'><span><img src='../images/sign_excl.svg'></span>
+			<span>$msg</span></div>";
 	}
 
 	function print_notice($msg) {
 		print "<div class=\"notice\">
-			<img src=\"../images/sign_info.svg\">$msg</div>";
+			<span><img src=\"../images/sign_info.svg\"></span><span>$msg</span></div>";
 	}
 
 	function db_connect($host, $user, $pass, $db, $type, $port) {

diff --git a/tt-rss.css b/tt-rss.css
@@ -288,7 +288,12 @@ div.error {
 div.warning img, div.notice img, div.error img {
 	margin-right : 4px;
 	vertical-align : middle;
+}
+
+div.warning span, div.notice span, div.error span {
 	display : table-cell;
+	vertical-align : middle;
+
 }
 
 ul.nomarks {

diff --git a/utility.css b/utility.css
@@ -73,6 +73,10 @@ div.error {
 
 div.warning img, div.notice img, div.error img {
 	margin-right : 4px;
+	vertical-align : middle;
+}
+
+div.warning span, div.notice span, div.error span {
 	display : table-cell;
 	vertical-align : middle;
 }