mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23702 from owncloud/emptycontent 

improve emptycontent styles
This commit is contained in:
Jan-Christoph Borchardt 2016-03-31 17:00:53 +02:00
parent 8ef6c6c7bc a8a98d42cb
commit bfb5748f1f
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/js/filelist.js
View File

@ -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);

7
core/css/styles.css
View File

@ -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-"],

2
settings/js/apps.js
View File

@ -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 {

2
settings/templates/apps.php
View File

@ -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>