From ce1768d0d3f9a6c5c09ea6c40a83eb661ee01597 Mon Sep 17 00:00:00 2001 From: maxwell <maxwell@joindiaspora.com> Date: Sun, 21 Nov 2010 22:57:20 -0800 Subject: [PATCH] fixing dropdown, and removing margin on publisher --- app/views/photos/_new_photo.haml | 6 +++++- public/stylesheets/sass/application.sass | 11 +++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml index f723bedf11..4e05430d2e 100644 --- a/app/views/photos/_new_photo.haml +++ b/app/views/photos/_new_photo.haml @@ -11,8 +11,12 @@ action: "#{photos_path}", debug: true, button: document.getElementById('file-upload'), - sizeLimit: 5000048, + sizeLimit: 4194304, + + onProgress: function(id, fileName, loaded, total){ + alert(; + }, onSubmit: function(id, fileName){ $('#file-upload').addClass("loading"); diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 1fcbfb9514..9c19fdd335 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -144,7 +144,7 @@ header :text-overflow ellipsis :text-shadow 0 1px 0 #000 - :width 120px + :width auto :cursor pointer @@ -167,10 +167,13 @@ header :top 5px :right 0 - + :list :style none + a + :padding + :right 15px .right :right 5px @@ -1291,6 +1294,10 @@ input[type="search"] #photo_edit_options :display none +#photodropzone + :padding 0px + :margin 0px + #section_header :width 100% :border -- GitLab