aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2014-12-17 13:42:20 +0100
committerJan-Christoph Borchardt <hey@jancborchardt.net>2014-12-17 13:42:20 +0100
commit532ba99f1ccc092dc5ddfbc15b70a027bca3e558 (patch)
treecef1c7276d03f9bb5ae28bc564d2eb38020c1a13 /apps
parent77c4c2856aa4cb27ca6ab77e5bedbaa65300d111 (diff)
parente2977ff4c1e7b5b1c678a91550bc3e42ffd26d64 (diff)
downloadnextcloud-server-532ba99f1ccc092dc5ddfbc15b70a027bca3e558.tar.gz
nextcloud-server-532ba99f1ccc092dc5ddfbc15b70a027bca3e558.zip
Merge pull request #12895 from owncloud/favorites-polish
polish the Favorites design
Diffstat (limited to 'apps')
-rw-r--r--apps/files/css/files.css6
-rw-r--r--apps/files/css/mobile.css2
-rw-r--r--apps/files/index.php2
-rw-r--r--apps/files/templates/simplelist.php5
4 files changed, 12 insertions, 3 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 3829759a14e..eb6fec4a97f 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -556,6 +556,12 @@ table tr.summary td {
#scanning-message{ top:40%; left:40%; position:absolute; display:none; }
+#emptycontent .icon-starred {
+ height: 30px;
+ width: 30px;
+ margin: 0 auto 10px;
+}
+
table.dragshadow {
width:auto;
}
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 */
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')
)
);
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">