summaryrefslogtreecommitdiff
path: root/css
diff options
context:
space:
mode:
authorJuuso Lapinlampi <wub@partyvan.eu>2016-01-17 17:30:32 +0100
committerJuuso Lapinlampi <wub@partyvan.eu>2016-01-17 17:30:32 +0100
commitea556b08cadb5c3459f0029eefcbd8575d6173e5 (patch)
tree179300553404f10571001476a8f00965a43e3828 /css
parent4dbb7930b80f7af0307922544ea9b3ccab99cb2c (diff)
parent6187651a09fcd8dcdc4e3caeed6248433bbfdcbc (diff)
Merge branch 'luminarys/vanilla-js' from WubTheCaptain
Replaces js/pomf.js and its dependencies with Luminarys' new js/app.js, written in vanilla JavaScript with no dependencies required. This should improve browser backwards compatibility. Includes patches from wub@ to add Luminarys to package.json contributors and adding the proper copyright header to js/app.js. Luminarys' original code had removed an unused CSS property from css/pomf.css. I reverted this change to merge it later as a seperate fix, to be able to merge it properly to the maint branch.
Diffstat (limited to 'css')
-rw-r--r--css/pomf.css33
1 files changed, 23 insertions, 10 deletions
diff --git a/css/pomf.css b/css/pomf.css
index b582cf3..9a6b734 100644
--- a/css/pomf.css
+++ b/css/pomf.css
@@ -239,7 +239,7 @@ nav > ul > li:last-child:after {
.error#upload-filelist {
color: #891A18;
}
-.error#upload-filelist .file-size {
+.error#upload-filelist .progress-percent {
color: #B94A48;
}
.error#upload-filelist .file-progress {
@@ -261,13 +261,12 @@ nav > ul > li:last-child:after {
text-overflow: ellipsis;
white-space: nowrap;
}
-.file-size,
+.file-progress,
.file-url {
display: inline-block;
float: right;
font-size: 0.9em;
margin-left: 8px;
- color: #5C5C5C;
vertical-align: middle;
}
.file-url a {
@@ -276,9 +275,29 @@ nav > ul > li:last-child:after {
.file-url a:hover {
color: #1C1C1C;
}
+.progress-percent {
+ float: right;
+}
+
+progress[value] {
+ /* Reset the default appearance */
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ appearance: none;
+
+ border: none;
+
+}
+
+progress[value]::-webkit-progress-bar {
+ background-color: #eee;
+ border-radius: 2ps;
+ box-shadow: 0 2px 5px rgba(0,0,0,0.25) inset;
+}
+
/* completed rows */
.completed .file-progress,
-.completed .file-size {
+.completed .progress-percent {
display: none;
}
.completed .file-url {
@@ -358,14 +377,8 @@ section.ded {
margin-bottom: 12px;
}
.file-progress {
- float: left;
width: 70%;
}
- .file-size {
- float: left;
- max-width: 30%;
- overflow: hidden;
- }
.file-name, .file-url {
width: 100%;
max-width: 100%;