Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev

Conflicts:
	modules/gallery/helpers/identity.php

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 5119bf79..87498b40 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -320,6 +320,7 @@ tr.g-warning td.g-warning {
 
 form .g-error {
   background-color: #fff;
+  padding-left: 20px;
 }
 
 .g-open {
@@ -492,6 +493,7 @@ ul.sf-menu li li li.sfHover ul {
 /* Status and validation messages ~~~~ */
 
 .g-message-block {
+  background-position: .4em .3em;
   border: 1px solid #ccc;
   padding: 0;
 }
@@ -516,6 +518,10 @@ div#g-action-status {
   margin-bottom: 1em;
 }
 
+.g-message {
+  background-position: 0 50%;
+}
+
 /* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .g-breadcrumbs {