diff --git a/public/javascripts/app/pages/framer.js b/public/javascripts/app/pages/framer.js index 1aee8f318..f220f2f1a 100644 --- a/public/javascripts/app/pages/framer.js +++ b/public/javascripts/app/pages/framer.js @@ -1,8 +1,6 @@ app.pages.Framer = app.views.Base.extend({ templateName : "framer", - - id : "post-content", - + className : "framer", events : { "click button.done" : "saveFrame" }, diff --git a/public/javascripts/app/templates/framer.handlebars b/public/javascripts/app/templates/framer.handlebars index ca3e884d3..33bf918f6 100644 --- a/public/javascripts/app/templates/framer.handlebars +++ b/public/javascripts/app/templates/framer.handlebars @@ -1,5 +1,6 @@ -
-
- +
+ +
+
-
\ No newline at end of file + diff --git a/public/javascripts/app/templates/template-picker.handlebars b/public/javascripts/app/templates/template-picker.handlebars index 9617e86f2..3f5a513a6 100644 --- a/public/javascripts/app/templates/template-picker.handlebars +++ b/public/javascripts/app/templates/template-picker.handlebars @@ -2,4 +2,6 @@ {{#each templates}} {{/each}} - \ No newline at end of file + + + diff --git a/public/stylesheets/sass/new-templates.scss b/public/stylesheets/sass/new-templates.scss index 3c7c22d7d..3592c3190 100644 --- a/public/stylesheets/sass/new-templates.scss +++ b/public/stylesheets/sass/new-templates.scss @@ -226,7 +226,6 @@ $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,7 +249,6 @@ $pane-width: 420px; } .rich-media { - z-index : -5000; //so the framer controls don't get lost position: absolute; height: 100%; width: 100%; @@ -800,8 +798,14 @@ text-rendering: optimizelegibility; width: 100%; } -#post-content { - button { +.framer { //make this look way more glamourous, just providing structure. + .template-picker { position: absolute; + bottom: 0; + left: 0; + right: 0; + padding : 20px; + background-color: #f0f0f0; + border-top: 1px solid #ccc; } }