diff --git a/GCDWebUploader/GCDWebUploader.bundle/css/index.css b/GCDWebUploader/GCDWebUploader.bundle/css/index.css index 3f45475..1d83317 100644 --- a/GCDWebUploader/GCDWebUploader.bundle/css/index.css +++ b/GCDWebUploader/GCDWebUploader.bundle/css/index.css @@ -64,21 +64,19 @@ font-size: 0.9em; } +#reload { + float: right; +} + /* Bootstrap overrides */ .btn:focus { outline: none; /* FIXME: Work around for Chrome only but still draws focus ring while button pressed */ } -.row > div > p { - text-align: right; - margin-top: 8px; - margin-bottom: 0px; -} - -.progress { - margin-top: 8px; - margin-bottom: 0px; +.btn-toolbar { + margin-top: 30px; + margin-bottom: 20px; } .table .progress { @@ -87,11 +85,6 @@ height: 16px; } -.row { - margin-top: 30px; - margin-bottom: 20px; -} - .panel-default > .panel-heading { color: #555; } diff --git a/GCDWebUploader/GCDWebUploader.bundle/index.html b/GCDWebUploader/GCDWebUploader.bundle/index.html index 132a38f..8247a96 100644 --- a/GCDWebUploader/GCDWebUploader.bundle/index.html +++ b/GCDWebUploader/GCDWebUploader.bundle/index.html @@ -64,26 +64,17 @@
-
-
-
- - - -
-
-
-
-
-
-
+
+ + +
diff --git a/GCDWebUploader/GCDWebUploader.bundle/js/index.js b/GCDWebUploader/GCDWebUploader.bundle/js/index.js index 08c75e9..f6e4100 100644 --- a/GCDWebUploader/GCDWebUploader.bundle/js/index.js +++ b/GCDWebUploader/GCDWebUploader.bundle/js/index.js @@ -146,15 +146,9 @@ $(document).ready(function() { dataType: 'json', start: function(e) { - $("#progress-bar").css("width", "0%"); $(".uploading").show(); }, - progressall: function(e, data) { - var progress = parseInt(data.loaded / data.total * 100, 10); - $("#progress-bar").css("width", progress + "%"); // .text(progress + "%") - }, - stop: function(e) { $(".uploading").hide(); },