diff options
author | Dennis Collinson <dennis.collective@gmail.com> | 2012-03-22 23:22:07 +0400 |
---|---|---|
committer | Dennis Collinson <dennis.collective@gmail.com> | 2012-03-28 01:52:52 +0400 |
commit | 8c640b179e3050c4a2c02340ec25ccb1aefdc8b6 (patch) | |
tree | 8799d947920f76d46f403242aa3475279df2545d /public | |
parent | 93e64c43aaf2f7a815866d2e6f979d363970fecf (diff) |
showing photos in framer
Diffstat (limited to 'public')
-rw-r--r-- | public/javascripts/app/forms/post_form.js | 1 | ||||
-rw-r--r-- | public/stylesheets/sass/new-templates.scss | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/public/javascripts/app/forms/post_form.js b/public/javascripts/app/forms/post_form.js index 275af46d9..9acc56ab4 100644 --- a/public/javascripts/app/forms/post_form.js +++ b/public/javascripts/app/forms/post_form.js @@ -29,6 +29,7 @@ app.forms.Post = app.forms.Base.extend({ this.model.set(_.inject(this.formAttrs, setValueFromField, {})) //pass collections across this.model.photos = this.pictureForm.photos + this.model.set({"photos": this.model.photos.toJSON() }) function setValueFromField(memo, attribute, selector){ var selectors = form.find(selector); diff --git a/public/stylesheets/sass/new-templates.scss b/public/stylesheets/sass/new-templates.scss index 4b2bfdfd8..3c7c22d7d 100644 --- a/public/stylesheets/sass/new-templates.scss +++ b/public/stylesheets/sass/new-templates.scss @@ -226,7 +226,7 @@ $pane-width: 420px; .photo-fill { @include background-cover(); - + z-index : -5000; //so the framer controls don't get lost position: absolute; top: 0; left: 0; @@ -250,6 +250,7 @@ $pane-width: 420px; } .rich-media { + z-index : -5000; //so the framer controls don't get lost position: absolute; height: 100%; width: 100%; |