Merge remote branch 'upstream/master'

7 files changed, 45 insertions, 17 deletions

diff --git a/view/theme/diabook/js/README b/view/theme/diabook/js/README
index c93b2118e..57ca16d02 100644
--- a/view/theme/diabook/js/README
+++ b/view/theme/diabook/js/README
@@ -19,4 +19,8 @@ An integer representing the maximum width for the image.
 Example
 $(function() {
   $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
-});
\ No newline at end of file
+});
+
+_______________________________________________________________________________________________
+
+http://javascriptly.com/examples/jquery-grab-bag/autogrow-textarea.html
diff --git a/view/theme/diabook/style-network-wide.css b/view/theme/diabook/style-network-wide.css
index 8c4ad0c08..0289419f4 100644
--- a/view/theme/diabook/style-network-wide.css
+++ b/view/theme/diabook/style-network-wide.css
@@ -396,7 +396,7 @@
 /* global */
 body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 15px;
+  font-size: 13px;
   background-color: #ffffff;
   color: #2d2d2d;
   margin: 50px auto auto;
@@ -958,8 +958,8 @@ ul.menu-popup .empty {
 aside {
   display: table-cell;
   vertical-align: top;
-  width: 170px;
-  padding: 0px 10px 0px 0px;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
   border-right: 1px solid #D2D2D2;
   float: left;
   /* background: #F1F1F1; */
@@ -1924,7 +1924,7 @@ transition: all 0.2s ease-in-out;
 ul.tabs {
   list-style-type: none;
   padding-bottom: 10px;
-  font-size: 15px;
+  font-size: 13px;
   width: 805px;
 }
 ul.tabs li {
@@ -2169,6 +2169,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index 1e57041e4..2e6a19481 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -2157,6 +2157,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
diff --git a/view/theme/diabook/style-profile-wide.css b/view/theme/diabook/style-profile-wide.css
index 47fb80b6d..ffd790ea6 100644
--- a/view/theme/diabook/style-profile-wide.css
+++ b/view/theme/diabook/style-profile-wide.css
@@ -395,7 +395,7 @@
 /* global */
 body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 15px;
+  font-size: 13px;
   background-color: #ffffff;
   color: #2d2d2d;
   margin: 50px auto auto;
@@ -939,8 +939,8 @@ ul.menu-popup .empty {
 aside {
   display: table-cell;
   vertical-align: top;
-  width: 170px;
-  padding: 0px 10px 0px 0px;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
   border-right: 1px solid #D2D2D2;
   float: left;
   /* background: #F1F1F1; */
@@ -1901,7 +1901,7 @@ transition: all 0.2s ease-in-out;
 ul.tabs {
   list-style-type: none;
   padding-bottom: 10px;
-  font-size: 15px;
+  font-size: 13px;
   width: 805px;
 }
 ul.tabs li {
@@ -2151,6 +2151,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index ff39a0456..ebde6ecfc 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -2140,6 +2140,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css
index d9a975e2c..64f82c487 100644
--- a/view/theme/diabook/style-wide.css
+++ b/view/theme/diabook/style-wide.css
@@ -423,7 +423,7 @@
 /* global */
 body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 15px;
+  font-size: 13px;
   background-color: #ffffff;
   color: #2d2d2d;
   margin: 50px auto auto;
@@ -1082,8 +1082,8 @@ ul.menu-popup .empty {
 aside {
   display: table-cell;
   vertical-align: top;
-  width: 170px;
-  padding: 0px 10px 0px 0px;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
   border-right: 1px solid #D2D2D2;
   float: left;
   /* background: #F1F1F1; */
@@ -1185,6 +1185,9 @@ aside #side-peoplefind-url {
   float: left;
   margin-right: 20px;	
 	}
+#login-submit-wrapper{
+  margin-top: 20px;
+	}
 /* widget */
 .widget {
   margin-bottom: 2em;
@@ -1261,7 +1264,7 @@ aside #side-peoplefind-url {
 .icon.text_add		{ 
 		background-image: url("../../../images/icons/16/add.png");
 		float: right;
-		opacity: 0.1;
+		opacity: 0.2;
 		margin-right: 14px;
 		}
 .icon.text_add:hover	{ 
@@ -1278,7 +1281,7 @@ transition: all 0.2s ease-in-out;
 		}
 .icon.text_edit {
   background-image: url("../../../images/icons/10/edit.png");
-  opacity: 0.1;
+  opacity: 0.2;
   margin-top: 6px;
   float: right;
   height: 10px;
@@ -2124,7 +2127,7 @@ body .pageheader{
 ul.tabs {
   list-style-type: none;
   padding-bottom: 10px;
-  font-size: 15px;
+  font-size: 13px;
   width: 805px;
 }
 ul.tabs li {
@@ -2417,6 +2420,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index e73bd1f57..fa945f848 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -1182,6 +1182,9 @@ aside #side-peoplefind-url {
   float: left;
   margin-right: 20px;	
 	}
+#login-submit-wrapper{
+  margin-top: 20px;
+	}
 /* widget */
 .widget {
   margin-bottom: 2em;
@@ -1256,7 +1259,7 @@ aside #side-peoplefind-url {
 .icon.text_add		{ 
 		background-image: url("../../../images/icons/16/add.png");
 		float: right;
-		opacity: 0.1;
+		opacity: 0.2;
 		margin-right: 14px;
 		}
 .icon.text_add:hover	{ 
@@ -1273,7 +1276,7 @@ transition: all 0.2s ease-in-out;
 		}
 .icon.text_edit {
   background-image: url("../../../images/icons/10/edit.png");
-  opacity: 0.1;
+  opacity: 0.2;
   margin-top: 6px;
   float: right;
   height: 10px;
@@ -2406,6 +2409,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;