Merge branch 'master' into talmdal_dev

Conflicts:
	modules/user/views/admin_users.html.php

1 files changed, 52 insertions, 0 deletions

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index fc12b401..12d96d41 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -31,6 +31,11 @@
  **********************************************************************/
 
 .g-narrow {
+  width: 25%;
+}
+
+.g-wide {
+  width: 100%;
 }
 
 /** *******************************************************************
@@ -104,9 +109,12 @@ form .g-error {
 }
 
 .g-installed {
+  background-color: #eeeeee;
 }
 
 .g-default {
+	background-color: #c5dbec;
+	font-weight: bold;
 }
 
 .g-draggable,
@@ -214,9 +222,15 @@ form .g-error {
 }
 
 #g-action-status {
+  margin-bottom: 1em;
   width: 100% !important;
 }
 
+#g-action-status li {
+  padding-top: .4em;
+  padding-bottom: .3em;
+}
+
 #g-site-status li {
   border-bottom: 1px solid #ccc;
   padding: .3em .3em .3em 30px;
@@ -324,3 +338,41 @@ form .g-error {
 #g-dialog .g-cancel {
   margin: .4em 1em;
 }
+
+/* Inline layout (forms, lists) ~~~~~~~~~~ */
+
+.g-short-form label {
+  display: none;
+}
+
+.g-short-form fieldset {
+  border: none;
+  padding: 0 !important;
+}
+
+.g-short-form li {
+  float: left;
+  padding: .4em 0;
+}
+
+.g-short-form input[type="text"] {
+  color: #666;
+  padding: .3em .6em;
+  width: auto;
+}
+
+.g-short-form .g-cancel {
+  display: block;
+  padding: .2em .8em;
+}
+
+#g-sidebar .g-short-form li {
+  padding-left: 0;
+  padding-right: 0;
+}
+
+/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .g-short-form li {
+  float: right;
+}