Merge branch 'master' into talmdal_dev

Conflicts:
	modules/server_add/helpers/server_add_theme.php

1 files changed, 21 insertions, 6 deletions

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index c94a8421..d0d41ecf 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -170,17 +170,28 @@ input[type="reset"] {
  * 3) Dimension and scale
  **********************************************************************/
 
-.g-narrow {
+.g-one-quarter {
   width: 25%;
 }
 
-.g-wide {
-  width: 100%;
+.g-one-third {
+  width: 33%;
 }
 
-form.g-narrow {
-  padding: 0;
-  width: 270px;
+.g-one-half {
+  width: 50%;
+}
+
+.g-two-thirds {
+  width: 66%;
+}
+
+.g-three-quarters {
+  width: 75%;
+}
+
+.g-whole {
+  width: 100%;
 }
 
 /** *******************************************************************
@@ -222,6 +233,10 @@ form li.g-warning {
   padding: .3em .8em .3em 1em;
 }
 
+.g-short-form li.g-error {
+  padding: .3em 0 .3em 0;
+}
+
 form.g-error input[type="text"],
 li.g-error input[type="text"],
 form.g-error input[type="password"],