From f2d7fad0fb6263a0b93ed91f4f82b9e8a1acd26e Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 17 Dec 2014 11:00:16 +0100
Subject: [PATCH 1/4] put Favorites second in list, after 'All files'

---
 apps/files/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/index.php b/apps/files/index.php
index 02076226c1a..64b49c3bf1f 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -93,7 +93,7 @@ function sortNavigationItems($item1, $item2) {
 		'id' => 'favorites',
 		'appname' => 'files',
 		'script' => 'simplelist.php',
-		'order' => 50,
+		'order' => 5,
 		'name' => $l->t('Favorites')
 	)
 );

From 433d1de923392c005193e99ad1d8efdf2513544f Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 17 Dec 2014 11:04:18 +0100
Subject: [PATCH 2/4] fix empty state for Favorites

---
 apps/files/css/files.css            | 4 ++++
 apps/files/templates/simplelist.php | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 3829759a14e..cf166003fb1 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -556,6 +556,10 @@ table tr.summary td {
 
 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
 
+#emptycontent .icon-starred {
+	height: 50px;
+}
+
 table.dragshadow {
 	width:auto;
 }
diff --git a/apps/files/templates/simplelist.php b/apps/files/templates/simplelist.php
index c00febce653..15949bf704e 100644
--- a/apps/files/templates/simplelist.php
+++ b/apps/files/templates/simplelist.php
@@ -3,7 +3,10 @@
 </div>
 <div id='notification'></div>
 
-<div id="emptycontent" class="hidden"></div>
+<div id="emptycontent" class="hidden">
+	<div class="icon-starred"></div>
+	<?php p($l->t('Files and folders you mark as favorites will show up here')); ?>
+</div>
 
 <input type="hidden" name="dir" value="" id="dir">
 

From c7cf0d0386036aba138a9279e09ea09a1fc206a1 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 17 Dec 2014 11:08:39 +0100
Subject: [PATCH 3/4] fix file list summary left alignment

---
 apps/files/css/mobile.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index 780b7ac8443..4881f7c70e4 100644
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.css
@@ -24,7 +24,7 @@ table td {
 }
 /* and accordingly fix left margin of file list summary on mobile */
 .summary .info {
-	margin-left: 55px;
+	margin-left: 105px;
 }
 
 /* remove shift for multiselect bar to account for missing navigation */

From e2977ff4c1e7b5b1c678a91550bc3e42ffd26d64 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 17 Dec 2014 13:40:57 +0100
Subject: [PATCH 4/4] fix favorite star flickering on empty state page

---
 apps/files/css/files.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index cf166003fb1..eb6fec4a97f 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -557,7 +557,9 @@ table tr.summary td {
 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
 
 #emptycontent .icon-starred {
-	height: 50px;
+	height: 30px;
+	width: 30px;
+	margin: 0 auto 10px;
 }
 
 table.dragshadow {