From ca00e24504095a8aa5276283a9795074db5693c6 Mon Sep 17 00:00:00 2001
From: "John Molakvoæ (skjnldsv)" <skjnldsv@protonmail.com>
Date: Wed, 4 Oct 2017 17:16:20 +0200
Subject: Fix quota overflow and error color
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 core/css/styles.scss | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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;
-- 
cgit v1.2.3


From 7f07ff48f24145292c08812b6108453909600247 Mon Sep 17 00:00:00 2001
From: "John Molakvoæ (skjnldsv)" <skjnldsv@protonmail.com>
Date: Wed, 4 Oct 2017 17:26:56 +0200
Subject: Correct class to quota
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 apps/files/templates/appnavigation.php                 | 2 +-
 settings/templates/settings/personal/personal.info.php | 5 ++---
 2 files changed, 3 insertions(+), 4 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/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>',
-- 
cgit v1.2.3