Merge remote-tracking branch 'friendica/master'

3 files changed, 43 insertions, 23 deletions

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 4297ff2f9..d8f1a24f1 100755
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -204,7 +204,7 @@ function html2bbcode($message)
 
 	node2bbcode($doc, 'a', array('href'=>'/(.+)/'), '[url=$1]', '[/url]');
 
-	node2bbcode($doc, 'img', array('src'=>'/(.+)/', 'width'=>'/(\d+)/', 'height'=>'/(\d+)/'), '[img$2x$3]$1', '[/img]');
+	node2bbcode($doc, 'img', array('src'=>'/(.+)/', 'width'=>'/(\d+)/', 'height'=>'/(\d+)/'), '[img=$2x$3]$1', '[/img]');
 	node2bbcode($doc, 'img', array('src'=>'/(.+)/'), '[img]$1', '[/img]');
 
 
diff --git a/view/theme/quattro-green/colors.less b/view/theme/quattro-green/colors.less
index fd32b1043..57fd2ef60 100755
--- a/view/theme/quattro-green/colors.less
+++ b/view/theme/quattro-green/colors.less
@@ -1,6 +1,7 @@
 // Quattro Theme LESS file
 
 // "Echo" palette from Inkscape
+@Yellow1 : #fce94f;
 @Blue1:rgb(25,174,255);
 @Blue2:rgb(0,132,200);
 @Blue3:rgb(0,92,148);
@@ -16,6 +17,7 @@
 @Green1:rgb(204,255,66);
 @Green2:rgb(154,222,0);
 @Green3:rgb(0,145,0);
+@Green4:rgb(221,255,221);
 @Purple1:rgb(241,202,255);
 @Purple2:rgb(215,108,255);
 @Purple3:rgb(186,0,255);
@@ -71,6 +73,7 @@
 @NoticeBackgroundColor: #511919;
 
 @ThreadBackgroundColor: #f6f7f8;
+@ShinyBorderColor: @Green4;
 
 @CommentBoxEmptyColor: @Grey3;
 @CommentBoxEmptyBorderColor: @Grey3;
@@ -91,4 +94,5 @@
 @JotPermissionUnlockBackgroundColor: @Grey2;
 @JotPermissionLockBackgroundColor: @Grey4;
 @JotLoadingBackgroundColor: @Grey1;
+@JotPreviewBackgroundColor: @Green4;
 
diff --git a/view/theme/quattro-green/style.css b/view/theme/quattro-green/style.css
index ab1083e75..301477679 100755
--- a/view/theme/quattro-green/style.css
+++ b/view/theme/quattro-green/style.css
@@ -602,6 +602,8 @@ aside #profiles-menu {
 #contact-block {
   overflow: auto;
   height: auto;
+  /*.contact-block-div { width:60px; height: 60px; }*/
+
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -613,7 +615,7 @@ aside #profiles-menu {
 }
 #contact-block .contact-block-content {
   clear: both;
-  overflow: auto;
+  overflow: idden;
   height: auto;
 }
 #contact-block .contact-block-link {
@@ -622,7 +624,7 @@ aside #profiles-menu {
 }
 #contact-block .contact-block-link img {
   widht: 48px;
-  height: 58px;
+  height: 48px;
 }
 /* mail view */
 .mail-conv-sender, .mail-conv-detail {
@@ -675,31 +677,32 @@ aside #profiles-menu {
   position: relative;
   top: -50px;
 }
+/*
 #group-members {
-  margin-top: 20px;
-  padding: 10px;
-  height: 250px;
-  overflow: auto;
-  border: 1px solid #ddd;
+	margin-top: 20px;
+	padding: 10px;
+	height: 250px;
+	overflow: auto;
+	border: 1px solid #ddd;
 }
 #group-members-end {
-  clear: both;
+	clear: both;
 }
 #group-all-contacts {
-  padding: 10px;
-  height: 450px;
-  overflow: auto;
-  border: 1px solid #ddd;
+	padding: 10px;
+	height: 450px;
+	overflow: auto;
+	border: 1px solid #ddd;
 }
 #group-all-contacts-end {
-  clear: both;
-  margin-bottom: 10px;
+	clear: both;
+	margin-bottom: 10px;
 }
 .contact-block-div {
-  float: left;
-  width: 52px;
-  height: 52px;
-}
+	float: left;
+	width: 60px;
+	height: 60px;
+}*/
 /* widget */
 .widget {
   margin-bottom: 2em;
@@ -946,6 +949,12 @@ section {
   padding: 0;
   margin: 10px 0;
 }
+.shiny {
+  border-right: 10px solid #ddffdd;
+}
+#jot-preview-content .tread-wrapper {
+  background-color: #ddffdd;
+}
 .wall-item-tags {
   padding-top: 5px;
 }
@@ -985,7 +994,6 @@ section {
   bottom: 5px;
   right: 5px;
 }
-/* contacts menu */
 .contact-photo-wrapper {
   position: relative;
 }
@@ -1007,9 +1015,14 @@ section {
 }
 .contact-wrapper {
   float: left;
-  width: 90px;
+  width: 300px;
   height: 90px;
-  margin-bottom: 15px;
+  padding-right: 10px;
+  margin: 0 10px 10px 0px;
+}
+.contact-wrapper .contact-photo-wrapper {
+  float: left;
+  margin-right: 10px;
 }
 .contact-wrapper .contact-photo {
   width: 80px;
@@ -1037,11 +1050,14 @@ section {
   height: 175px;
 }
 .contact-name {
-  text-align: center;
   font-weight: bold;
+  padding-top: 15px;
 }
 .contact-details {
   color: #999999;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 /* editor */
 .jothidden {