nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "a little framer styling"

Browse source 
This reverts commit 0ba13491e50d67360d0ed9e2e77dc8095994b8fd.
This commit is contained in:
Dennis Collinson 2012-03-23 11:33:23 -07:00
parent 010e091f62
commit 2bb677b34b
4 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/javascripts/app/pages/framer.js
View file

@ -1,6 +1,8 @@
app.pages.Framer = app.views.Base.extend({ app.pages.Framer = app.views.Base.extend({
templateName : "framer", templateName : "framer",
className : "framer",
id : "post-content",
events : { events : {
"click button.done" : "saveFrame" "click button.done" : "saveFrame"
}, },

9
public/javascripts/app/templates/framer.handlebars
View file

@ -1,6 +1,5 @@
<div class='template-picker form-inline'></div> <div class="controls">
<div class='template-picker'></div>
<div id="post-content"> <button class="done btn-primary">done</button>
<div class="post-view"></div>
</div> </div>
<div class="post-view"></div>

4
public/javascripts/app/templates/template-picker.handlebars
View file

@ -2,6 +2,4 @@
{{#each templates}} {{#each templates}}
<option value="{{.}}">{{.}}</option> <option value="{{.}}">{{.}}</option>
{{/each}} {{/each}}
</select> </select>
<button class="done btn-primary">done</button>

12
public/stylesheets/sass/new-templates.scss
View file

@ -226,6 +226,7 @@ $pane-width: 420px;
.photo-fill { .photo-fill {
@include background-cover(); @include background-cover();
z-index : -5000; //so the framer controls don't get lost
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
@ -249,6 +250,7 @@ $pane-width: 420px;
} }
.rich-media { .rich-media {
z-index : -5000; //so the framer controls don't get lost
position: absolute; position: absolute;
height: 100%; height: 100%;
width: 100%; width: 100%;
@ -798,14 +800,8 @@ text-rendering: optimizelegibility;
width: 100%; width: 100%;
} }
.framer { //make this look way more glamourous, just providing structure. #post-content {
.template-picker { button {
position: absolute; position: absolute;
bottom: 0;
left: 0;
right: 0;
padding : 20px;
background-color: #f0f0f0;
border-top: 1px solid #ccc;
} }
} }