diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2017-10-12 11:54:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-12 11:54:14 +0200 |
| commit | 423be3df52c734c3a766df1ec19136769eb62da5 (patch) | |
| tree | c5e4e2ddcbad199ea736c56687e134c1f9b1eb27 | |
| parent | adb847de419c0c44c6ff7ed2fbf3e510bbf63ed4 (diff) | |
| parent | 7f07ff48f24145292c08812b6108453909600247 (diff) | |
| download | nextcloud-server-423be3df52c734c3a766df1ec19136769eb62da5.tar.gz nextcloud-server-423be3df52c734c3a766df1ec19136769eb62da5.zip | |
Merge pull request #6763 from nextcloud/fix-user-quota
Fix quota overflow and error color
| -rw-r--r-- | apps/files/templates/appnavigation.php | 2 | ||||
| -rw-r--r-- | core/css/styles.scss | 4 | ||||
| -rw-r--r-- | settings/templates/settings/personal/personal.info.php | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php index 6a7b4e4b11e..8326fad73ea 100644 --- a/apps/files/templates/appnavigation.php +++ b/apps/files/templates/appnavigation.php @@ -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> diff --git a/core/css/styles.scss b/core/css/styles.scss index c23c5cd86a2..3b621d69862 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -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; diff --git a/settings/templates/settings/personal/personal.info.php b/settings/templates/settings/personal/personal.info.php index d6f6061ebf2..c0326e97491 100644 --- a/settings/templates/settings/personal/personal.info.php +++ b/settings/templates/settings/personal/personal.info.php @@ -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>', |