summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2016-03-31 15:26:37 +0200
committerJan-Christoph Borchardt <hey@jancborchardt.net>2016-03-31 15:31:04 +0200
commita8a98d42cb4a201c0b31df7525df7e0a32c8b412 (patch)
treee61a62a4c6b9e093ea77b03881438f28c25742a1
parent8ef6c6c7bcf0b58561aee6ec1a18ea7a8643a773 (diff)
downloadnextcloud-server-a8a98d42cb4a201c0b31df7525df7e0a32c8b412.tar.gz
nextcloud-server-a8a98d42cb4a201c0b31df7525df7e0a32c8b412.zip
improve emptycontent styles
-rw-r--r--apps/files/js/filelist.js2
-rw-r--r--core/css/styles.css7
-rw-r--r--settings/js/apps.js2
-rw-r--r--settings/templates/apps.php2
4 files changed, 9 insertions, 4 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 842ec4aac73..0c4d41b65f9 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2280,12 +2280,14 @@
this.$el.find('#filestable thead th').addClass('hidden');
this.$el.find('#emptycontent').addClass('hidden');
$('#searchresults').addClass('filter-empty');
+ $('#searchresults .emptycontent').addClass('emptycontent-search');
if ( $('#searchresults').length === 0 || $('#searchresults').hasClass('hidden') ) {
this.$el.find('.nofilterresults').removeClass('hidden').
find('p').text(t('files', "No entries in this folder match '{filter}'", {filter:this._filter}, null, {'escape': false}));
}
} else {
$('#searchresults').removeClass('filter-empty');
+ $('#searchresults .emptycontent').removeClass('emptycontent-search');
this.$el.find('#filestable thead th').toggleClass('hidden', this.isEmpty);
if (!this.$el.find('.mask').exists()) {
this.$el.find('#emptycontent').toggleClass('hidden', !this.isEmpty);
diff --git a/core/css/styles.css b/core/css/styles.css
index a429d55560e..a1dda59a86b 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -177,17 +177,20 @@ body {
#emptycontent,
.emptycontent {
- font-size: 16px;
color: #888;
text-align: center;
margin-top: 100px; /* ie8 */
margin-top: 30vh;
width: 100%;
}
+#emptycontent.emptycontent-search,
+.emptycontent.emptycontent-search {
+ position: static;
+}
#emptycontent h2,
.emptycontent h2 {
- font-weight: 600;
margin-bottom: 10px;
+ line-height: 150%;
}
#emptycontent [class^="icon-"],
.emptycontent [class^="icon-"],
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 9322319d4ba..e052a9ee9d3 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -506,7 +506,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
if (apps.length === 0) {
$appList.addClass('hidden');
$emptyList.removeClass('hidden');
- $emptyList.removeClass('hidden').find('h2').text(t('settings', 'No apps found for "{query}"', {
+ $emptyList.removeClass('hidden').find('h2').text(t('settings', 'No apps found for {query}', {
query: query
}));
} else {
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 4ae1022585d..47d1eff463e 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -167,7 +167,7 @@ script(
</div>
<div id="app-content">
<div id="apps-list" class="icon-loading"></div>
- <div id="apps-list-empty" class="hidden emptycontent">
+ <div id="apps-list-empty" class="hidden emptycontent emptycontent-search">
<div class="icon-search"></div>
<h2><?php p($l->t('No apps found for your version')) ?></h2>
</div>