Merge pull request #10 from alpha6/fix_upload_form_style

Style of upload form was fixed
This commit is contained in:
Denis Fedoseev 2017-08-04 10:24:50 +03:00 committed by GitHub
commit fc97a8cc17
3 changed files with 10 additions and 5 deletions

View file

@ -38,3 +38,8 @@
padding-right: 5px;
position: relative;
}
.upload-form {
height: 100px;
padding: 10px;
}

View file

@ -1,5 +1,5 @@
<div class="container">
<div class"upload-form">
<div class="container upload-form" id="upload-form">
<input id="fileupload" type="file" name="image" data-url="/upload" multiple>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script src="/file_uploader/js/vendor/jquery.ui.widget.js"></script>
@ -26,7 +26,6 @@
});
</script>
</div>
<div id="progress">
<div class="progress-bar" style="width: 0%;"></div>
</div>
@ -99,7 +98,7 @@
},
created: function () {
this.fetchData(1)
this.fetchData(this.pageNumber)
},
methods: {
@ -110,6 +109,7 @@
xhr.onload = function () {
var result = JSON.parse(xhr.responseText);
self.imagesList = result.images_list;
console.dir(self.imagesList);
self.pagesCount = result.pages_count;
}
xhr.send()

View file

@ -14,7 +14,7 @@
<link rel="stylesheet" href="/file_uploader/css/jquery.fileupload-ui.css">
<link rel="stylesheet" href="/css/main.css">
<script src="https://vuejs.org/js/vue.min.js"></script>
<script src="https://vuejs.org/js/vue.min.js"></script>
</head>
<body>
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">