From f038ecbfe3f4a8d07948c3cd0bf26bd291d71885 Mon Sep 17 00:00:00 2001
From: "John Molakvoæ (skjnldsv)" <skjnldsv@protonmail.com>
Date: Wed, 27 Sep 2017 16:44:56 +0200
Subject: Fixed quota on homepage (files)
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 | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'apps')

diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php
index 09b02943688..6a7b4e4b11e 100644
--- a/apps/files/templates/appnavigation.php
+++ b/apps/files/templates/appnavigation.php
@@ -11,7 +11,7 @@
 			</a>
 		</li>
 		<?php } ?>
-		<li id="quota" class="section pinned <?php
+		<li id="quota" class="pinned <?php
 		if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
 			?>has-tooltip" title="<?php p($_['usage_relative'] . '%');
 		} ?>">
@@ -23,9 +23,8 @@
 						p($l->t('%s used', [$_['usage']]));
 					} ?></p>
 				<div class="quota-container">
-					<div style="width:<?php p($_['usage_relative']);?>%"
-						 <?php if($_['usage_relative'] > 80): ?>class="quota-warning"<?php endif; ?>>
-					</div>
+					<progress value="<?php p($_['usage_relative']); ?>" max="100"
+						<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>></progress>
 				</div>
 			</a>
 		</li>
-- 
cgit v1.2.3


From b9a8ba7a2361d6a1d1bbf6acf20abac58ac2ed91 Mon Sep 17 00:00:00 2001
From: "John Molakvoæ (skjnldsv)" <skjnldsv@protonmail.com>
Date: Thu, 28 Sep 2017 16:33:47 +0200
Subject: Fix upload progress color to primary
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/css/upload.scss | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'apps')

diff --git a/apps/files/css/upload.scss b/apps/files/css/upload.scss
index 6f337a27578..4685b20d43a 100644
--- a/apps/files/css/upload.scss
+++ b/apps/files/css/upload.scss
@@ -50,28 +50,29 @@
 	text-align: center;
 }
 #uploadprogressbar .ui-progressbar-value.ui-widget-header.ui-corner-left {
-    height: 100%;
-    top: 0px;
-    left: 0px;
-    position: absolute;
-    overflow: hidden;
+	height: 100%;
+	top: 0px;
+	left: 0px;
+	position: absolute;
+	overflow: hidden;
+	background-color: $color-primary;
 }
 #uploadprogressbar .label {
-    top: 6px;
-    opacity: 1;
-    overflow: hidden;
-    white-space: nowrap;
+	top: 6px;
+	opacity: 1;
+	overflow: hidden;
+	white-space: nowrap;
 	font-weight: normal;
 }
 #uploadprogressbar .label.inner {
-    color:white; 
-    position: absolute;
-    display: block;
-    width: 200px;
+	color: $color-primary-text;
+	position: absolute;
+	display: block;
+	width: 200px;
 }
 #uploadprogressbar .label.outer {
-    position: relative;
-    color: black;
+	position: relative;
+	color: $color-main-text;
 }
 #uploadprogressbar .desktop {
 	display: block;
-- 
cgit v1.2.3