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

Merge pull request #6763 from nextcloud/fix-user-quota 

Fix quota overflow and error color
This commit is contained in:
John Molakvoæ 2017-10-12 11:54:14 +02:00 committed by GitHub
parent adb847de41 7f07ff48f2
commit 423be3df52
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/templates/appnavigation.php
View File

@ -24,7 +24,7 @@
} ?></p>
<div class="quota-container">
<progress value="<?php p($_['usage_relative']); ?>" max="100"
<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>></progress>
<?php if($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
</div>
</a>
</li>

4
core/css/styles.scss
View File

@ -944,9 +944,6 @@ code {
white-space: nowrap;
position: absolute;;
top: 0;
&.quota-warning {
background-color: $color-warning;
}
&.quotatext-bg {
mix-blend-mode: luminosity;
}
@ -954,6 +951,7 @@ code {
color: $color-primary-text;
overflow: hidden;
z-index: 50;
max-width: 100%;
}
.quotatext {
padding: .6em 1em;

5
settings/templates/settings/personal/personal.info.php
View File

@ -39,10 +39,9 @@ vendor_style('jcrop/css/jquery.Jcrop');
<div id="quota" class="section">
<progress value="<?php p($_['usage_relative']); ?>" max="100"
<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>></progress>
<?php if($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
<div style="width:<?php p($_['usage_relative']);?>%" class="quotatext-fg
<?php if($_['usage_relative'] > 80): ?> quota-warning <?php endif; ?>">
<div style="width:<?php p($_['usage_relative']);?>%" class="quotatext-fg">
<p class="quotatext">
<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',