Merge remote branch 'friendica/master' into quattro-fontsoptions

diff --combined view/theme/quattro/dark/style.css
index 69ead7045154c2bce3d10aaef8bc7d344adf74e1,533d151762d1d13554032ff40537d1e7adc8d415..c2dd472afd218a38858ca8a5dee23f5f69f62da8
--- 1/view/theme/quattro/dark/style.css
--- 2/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@@ -404,6 -404,9 +404,6 @@@ code 
    padding: 10px;
    margin-top: 20px;
  }
 -textarea {
 -  font-size: 20px;
 -}
  #panel {
    position: absolute;
    width: 10em;
@@@ -732,6 -735,22 +732,22 @@@ aside #profile-extra-links li 
    margin: 0px;
    list-style: none;
  }
+ aside #wallmessage-link {
+   display: block;
+   -moz-border-radius: 5px 5px 5px 5px;
+   -webkit-border-radius: 5px 5px 5px 5px;
+   border-radius: 5px 5px 5px 5px;
+   color: #ffffff;
+   background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+   font-weight: bold;
+   text-transform: uppercase;
+   padding: 4px 2px 2px 35px;
+   margin-top: 3px;
+ }
+ aside #wallmessage-link:hover {
+   text-decoration: none;
+   background-color: #19aeff;
+ }
  aside #dfrn-request-link {
    display: block;
    -moz-border-radius: 5px 5px 5px 5px;
@@@ -1069,6 -1088,7 +1085,6 @@@ section 
    padding: 0.3em;
  }
  .wall-item-comment-wrapper .comment-edit-text-full {
 -  font-size: 20px;
    height: 4em;
    color: #2d2d2d;
    border: 1px solid #2d2d2d;
@@@ -1136,6 -1156,9 +1152,9 @@@
    opacity: 0.5;
  }
  .wwto {
+   position: absolute !important;
+   width: 25px;
+   height: 25px;
    background: #FFFFFF;
    border: 2px solid #364e59;
    height: 25px;
@@@ -1311,6 -1334,9 +1330,6 @@@ span[id^="showmore-wrap"] 
    border: 1px solid #999999;
    padding: 0.3em;
  }
 -#jot .profile-jot-text:focus {
 -  font-size: 20px;
 -}
  #jot #jot-tools {
    margin: 0px;
    padding: 0px;

diff --combined view/theme/quattro/green/style.css
index b698ca3492382a59277b9d551146978b09558569,429da809d42667e6902eb84dc02da236414b1cc4..47db715f921b6162dad71aba4b0a957767995595
--- 1/view/theme/quattro/green/style.css
--- 2/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@@ -404,6 -404,9 +404,6 @@@ code 
    padding: 10px;
    margin-top: 20px;
  }
 -textarea {
 -  font-size: 20px;
 -}
  #panel {
    position: absolute;
    width: 10em;
@@@ -732,6 -735,22 +732,22 @@@ aside #profile-extra-links li 
    margin: 0px;
    list-style: none;
  }
+ aside #wallmessage-link {
+   display: block;
+   -moz-border-radius: 5px 5px 5px 5px;
+   -webkit-border-radius: 5px 5px 5px 5px;
+   border-radius: 5px 5px 5px 5px;
+   color: #ffffff;
+   background: #009100 url('../../../images/connect-bg.png') no-repeat left center;
+   font-weight: bold;
+   text-transform: uppercase;
+   padding: 4px 2px 2px 35px;
+   margin-top: 3px;
+ }
+ aside #wallmessage-link:hover {
+   text-decoration: none;
+   background-color: #ccff42;
+ }
  aside #dfrn-request-link {
    display: block;
    -moz-border-radius: 5px 5px 5px 5px;
@@@ -1069,6 -1088,7 +1085,6 @@@ section 
    padding: 0.3em;
  }
  .wall-item-comment-wrapper .comment-edit-text-full {
 -  font-size: 20px;
    height: 4em;
    color: #2d2d2d;
    border: 1px solid #2d2d2d;
@@@ -1136,6 -1156,9 +1152,9 @@@
    opacity: 0.5;
  }
  .wwto {
+   position: absolute !important;
+   width: 25px;
+   height: 25px;
    background: #FFFFFF;
    border: 2px solid #364e59;
    height: 25px;
@@@ -1311,6 -1334,9 +1330,6 @@@ span[id^="showmore-wrap"] 
    border: 1px solid #999999;
    padding: 0.3em;
  }
 -#jot .profile-jot-text:focus {
 -  font-size: 20px;
 -}
  #jot #jot-tools {
    margin: 0px;
    padding: 0px;

diff --combined view/theme/quattro/quattro.less
index 2daed85c31f396fd9234c30e9d4ed80d3dc6141a,51fdfcf7c480c9a8ae45b5b43e036876c46a3a5b..e7325b7ccb73fd13ae792309b335a6a212dc6b5a
--- 1/view/theme/quattro/quattro.less
--- 2/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@@ -71,6 -71,9 +71,6 @@@ code 
        margin-top: 20px; 
  }
  
 -textarea { font-size: 20px; }
 -
 -
  #panel {
        position: absolute;
        width: 10em;
@@@ -311,6 -314,18 +311,18 @@@ aside 
                li { padding: 0px; margin: 0px; list-style: none; }
        }
  
+       #wallmessage-link {
+               display: block;
+               .rounded();
+               color: @AsideConnect;
+               background: @AsideConnectBg url('../../../images/connect-bg.png') no-repeat left center;
+               font-weight: bold;
+               text-transform:uppercase;
+               padding: 4px 2px 2px 35px;
+                 margin-top: 3px;
+               
+               &:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
+       }
        #dfrn-request-link {
                display: block;
                .rounded();
@@@ -539,6 -554,7 +551,6 @@@ section 
                padding:0.3em;
        }
        .comment-edit-text-full {
 -              font-size: 20px;
                height: 4em;
                color: @CommentBoxFullColor;
                border: 1px solid @CommentBoxFullBorderColor;
@@@ -740,6 -756,8 +752,6 @@@ span[id^="showmore-wrap"] 
                color: @CommentBoxEmptyColor;
                border: 1px solid @CommentBoxEmptyBorderColor;
                padding:0.3em;
 -              
 -              &:focus { font-size: 20px; }
        }
  
        #jot-tools {