Skip to content

Commit

Permalink
z index of div and inactive menu buttons gone
Browse files Browse the repository at this point in the history
  • Loading branch information
ScottDowne committed Jun 14, 2011
1 parent 1d62f7d commit 71a216c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
12 changes: 1 addition & 11 deletions index.html
Expand Up @@ -84,7 +84,6 @@

<div id="ui-panel-preview" class="span-17 last" data-export="true">
<div id="ui-trackTitle-div"></div>
<ul id="ui-panel-preview-sortable" class="sortable">

</ul>
<div id="ui-plugin-container"></div>
Expand All @@ -102,7 +101,7 @@
</div>
<div id="preview-pane" style="height: 395px" >

<div id="ui-track-div">
<div id="ui-track-div" style="z-index: -1;">
<!-- reusable -->
</div>
<div id="ui-track-event-editor" title="Edit Track Event">
Expand Down Expand Up @@ -202,15 +201,6 @@ <h3><a href="#">Data View</a></h3>
<ul id="ui-user-videos" class="select-ul is-menu">
</ul>

<button class="ui-menuset">Layout</button>
<!-- start out with a default layout in data-layout -->
<ul id="ui-layout" class="select-ul is-menu" data-layout="wide">
</ul>

<button class="ui-menuset">Theme</button>
<!-- start out with a default theme in data-theme -->
<ul id="ui-theme" class="select-ul is-menu" data-theme="clean">
</ul>

<button class="ui-menuset">Import Project</button>
<ul id="ui-import-to" class="select-ul is-menu">
Expand Down
2 changes: 1 addition & 1 deletion js/butter.application.js
Expand Up @@ -635,7 +635,7 @@
enforceTarget( ui.draggable[ 0 ].id );

var start = _( options.left / document.getElementById( "ui-tracklines" ).offsetWidth * $popcorn.duration() ).fourth(),
end = start + 2,
end = start + 4,
// force div to display on a fourth of a second
width = ( end - start ) / $popcorn.duration() * track.getElement().offsetWidth,
left = start / $popcorn.duration() * track.getElement().offsetWidth;
Expand Down

0 comments on commit 71a216c

Please sign in to comment.