From daac6ffdde957bd578f8b6318b2ae050b35d4b32 Mon Sep 17 00:00:00 2001 From: Rich Kuo Date: Thu, 6 Sep 2012 22:49:56 -0300 Subject: [PATCH 1/2] Updating lines 55 to 64 in the jquery.fileupload-ui.css.erb to the following seems to work on Sass 3.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit /* Fix for IE 6: */ * html .fileinput-button {   line-height: 22px;   margin: 1px -3px 0 0; } /* Fix for IE 7: */ * + html .fileinput-button {   margin: 1px 0 0 0; } --- vendor/assets/stylesheets/jquery.fileupload-ui.css.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/assets/stylesheets/jquery.fileupload-ui.css.erb b/vendor/assets/stylesheets/jquery.fileupload-ui.css.erb index 7b2d101..5ebe411 100644 --- a/vendor/assets/stylesheets/jquery.fileupload-ui.css.erb +++ b/vendor/assets/stylesheets/jquery.fileupload-ui.css.erb @@ -53,13 +53,13 @@ } /* Fix for IE 6: */ -*html .fileinput-button { +* html .fileinput-button { line-height: 22px; margin: 1px -3px 0 0; } /* Fix for IE 7: */ -*+html .fileinput-button { +* + html .fileinput-button { margin: 1px 0 0 0; } From eaadd3746e6f833162f7ec7b92c73e02ec6875d4 Mon Sep 17 00:00:00 2001 From: Rich Kuo Date: Thu, 13 Sep 2012 18:11:40 -0300 Subject: [PATCH 2/2] changed maxFileSize to 5000000 (5mb) --- .../javascripts/jquery-fileupload/jquery.fileupload-ui.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js b/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js index 4c36f00..8e8a5fd 100644 --- a/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js +++ b/vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js @@ -47,7 +47,7 @@ // allowed to be uploaded using this widget: maxNumberOfFiles: undefined, // The maximum allowed file size: - maxFileSize: undefined, + maxFileSize: 5000000, // The minimum allowed file size: minFileSize: undefined, // The regular expression for allowed file types, matches