Merge branch 'Superduper-Progressbar-branch-thingie' of https://github.com/luckydonald/core into luckydonald-Superduper-Progressbar-branch-thingie

2 files changed, 41 insertions, 1 deletions

diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index 0641304d211..bb20c8c3f77 100644
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.css
@@ -67,7 +67,15 @@ table td.filename .nametext .innernametext {
 }
 
 /* shorten elements for mobile */
-#uploadprogressbar {
+#uploadprogressbar, #uploadprogressbar .label.inner {
 	width: 50px;
 }
+/* hide desktop-only parts */
+#uploadprogressbar .desktop {
+	display: none !important;
 }
+#uploadprogressbar .mobile {
+	display: block !important;
+}
+
+}
\ No newline at end of file
diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css
index 07b788b937f..f0ffb9ac99e 100644
--- a/apps/files/css/upload.css
+++ b/apps/files/css/upload.css
@@ -47,7 +47,39 @@
 	width: 200px;
 	height: 36px;
 	display:inline-block;
+	text-align: center;
+}
+#uploadprogressbar .ui-progressbar-value.ui-widget-header.ui-corner-left {
+    height: 100%;
+    top: 0px;
+    left: 0px;
+    position: absolute;
+    overflow: hidden;
+}
+#uploadprogressbar .label {
+    top: 6px;
+    opacity: 1;
+    overflow: hidden;
+    white-space: nowrap;
+	font-weight: normal;
+}
+#uploadprogressbar .label.inner {
+    color:white; 
+    position: absolute;
+    display: block;
+    width: 200px;
+}
+#uploadprogressbar .label.outer {
+    position: relative;
+    color: black;
+}
+#uploadprogressbar .desktop {
+	display: block;
+}
+#uploadprogressbar .mobile {
+	display: none;
 }
+
 #uploadprogressbar + stop {
 	font-size: 13px;
 }