From: fabrixxm <fabrix.xm@gmail.com>
Date: Sun, 24 May 2015 08:26:21 +0000 (+0200)
Subject: Merge branch 'develop' into issue-1574
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b29b01fad40aa0ca13cee877aed1520344c6acdf;p=friendica.git

Merge branch 'develop' into issue-1574
---

b29b01fad40aa0ca13cee877aed1520344c6acdf
diff --cc view/theme/quattro/quattro.less
index 56eab54cc9,dded1514a5..480effd501
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@@ -144,8 -140,9 +144,8 @@@ header 
  		#logo-text { font-size: 22px }
  	}
  }
 -
  /* nav */
- nav {
+ nav { 
  	width: 100%; height: 32px;
  	position: fixed; left: 0px; top: 0px;
  	padding: 0px;
@@@ -302,10 -299,8 +302,10 @@@ ul.menu-popup 
  }
  
  
 +
 +
  /* aside 230px*/
- aside {
+ aside { 
  	display: table-cell;
  	vertical-align: top;
  	width: 200px;
@@@ -1200,10 -1190,9 +1197,10 @@@ ul.tabs 
  		display: block;
  		margin-left: 200px;
  		color: @FieldHelpColor;
- 
+ 		
  	}
  
 +
  	.onoff {
  		float: left;
  		width: 80px;