Permalink
Browse files

Merge remote-tracking branch 'brett/manual'

  • Loading branch information...
2 parents 5999241 + 330b488 commit 625c985b90af6d86c002e250b384ac5f51f7e01c @secretrobotron committed Dec 6, 2011
Showing with 20 additions and 29 deletions.
  1. +5 −16 css/style.css
  2. +15 −13 index.html
View
21 css/style.css
@@ -1480,7 +1480,7 @@ p.copyright a:last-child
{
float: left;
padding: 20px 0;
- width: 350px;
+ width: 600px;
}
#welcome-popup .left-div p.desc
{
@@ -1492,16 +1492,14 @@ p.copyright a:last-child
}
#welcome-popup .left-div ul
{
- overflow: visible;
+
text-align: left;
}
#welcome-popup .left-div li
{
font-size: 17px;
- margin-bottom: 20px;
+
min-height: 55px;
- padding: 5px 0 0 65px;
- position: relative;
}
#welcome-popup .left-div li span
{
@@ -1522,16 +1520,7 @@ p.copyright a:last-child
webkit-border-radius: 30px;
width: 50px;
}
-#welcome-popup .save-btn,#welcome-popup .add-btn
-{
- display: inline-block;
- float: none;
- margin: 10px 10px 0;
-}
-#welcome-popup .save-btn
-{
- margin-top: -8px;
-}
+
#welcome-popup .left-div li a
{
color: #80BA4E;
@@ -1544,7 +1533,7 @@ p.copyright a:last-child
#welcome-popup .left-div li img
{
float: right;
- margin: -22px -15px 0 0;
+ margin: -22px -30px 0 0;
}
#welcome-popup .left-div li p
{
View
28 index.html
@@ -471,14 +471,16 @@ <h3 class="welcome-h3">Let's make some popcorn.</h3>
<div class="left-div">
<p class="desc">Popcorn Maker is a fun and easy way to make interactive open video pages. Here's how to get started:</p>
<ul class="">
- <li><span>1</span><p>Make a new project with</p> <div class="add-btn"><input type="button" class="wizard-add-project-btn p-5" style="height: 24px; width: 24px;" name="add-project" value="" ></div> <p>You can pick a template or <a href="index.html#">design your own</a>.</p></li>
- <li><span>2</span><p>Use Popcorn Maker to add actions to the timeline of your video.</p></li>
- <li><span>3</span><p>When you're done, export using</p><img class="image-icon" src="images/save-btn.png" alt=""></li>
- </ul>
- <!--<div class="checkout"> <p>for more, checkout the</p><div class="help-btn"><a class="open-help" href="#">user manual</a></div> </div>-->
- </div>
- <div class="right-div">
+ <li><p><b>1.</b> Make a new project from the welcome screen, or press the plus button <b>(+)</b> from within the app. <br><p>Pick a template. Remember, you can edit the final HTML when you are done to modify the design</p></li>
+
+ <li><p><b>2.</b> Use Popcorn Maker to add actions to the timeline of your video.<br></p></li>
+
+ <li><p><b>3.</b> When you're done, export using the save button<br><img src="images/save-btn.png"></li>
+ </ul>
+ <p class="desc">For more info, checkout the <a href="lib/userManual.html" id="_user_manual" target="_blank">user manual</a></p>
+
</div>
+
</div>
</div>
</div><!-- End welcome popup -->
@@ -492,9 +494,7 @@ <h3 class="welcome-h3">Let's make some popcorn.</h3>
<h1>Popcorn Maker Help</h1>
<div class="social">
<ul class="">
- <li class="mozilla-labs"><a href="#" class="">Mozilla Labs</a></li>
<li class="twitter"><a href="https://twitter.com/#!/popcornjs" target="_blank" class="">Twitter</a></li>
- <li class="facebook"><a href="#" class="">Facebook</a></li>
</ul>
</div>
</div>
@@ -503,19 +503,21 @@ <h3 class="welcome-h3">Let's make some popcorn.</h3>
<div class="help-main padding-div">
<div class="inner">
<h2>About Popcorn Maker</h2>
- <p>Popcorn Maker is a fun and easy way to make interactive open video pages. You can use it here or install it on your own site. We have a final cut version available too.</p> <p>Crafted lovingly by the Mozilla Foundation and the popcorn.js team.<a href="index.html#" class="learn-more">Learn more &raquo;</a></p>
+ <p>Popcorn Maker is a fun and easy way to make interactive open video pages. You can use it here or <a href="https://github.com/secretrobotron/popcorn-maker">clone it from our Github repo</a> to host it wherever you like!</p> <p>Crafted lovingly by the Mozilla Foundation and the popcorn.js team.</p>
<div class="help-section">
<section class="getting-started">
<h2>Getting Started</h2>
<ul class="">
<li class="users-manual"><a href="lib/userManual.html" id="_user_manual" target="_blank">Users Manual</a></li>
- <li class="tutorials"><a href="#" id="_tutorials">Tutorials</a></li>
+ <!--
+ <li class="tutorials"><a href="#" id="_tutorials">Tutorials</a></li>-->
</ul>
</section>
<section class="contribute">
<h2>Contribute</h2>
<ul class="">
- <li class="submit-template"><a href="#" id="_submit_template">Submit a Template</a></li>
+ <!--
+ <li class="submit-template"><a href="#" id="_submit_template">Submit a Template</a></li>-->
<li class="file-a-bug"><a href="https://webmademovies.lighthouseapp.com/projects/80723-popcorn-maker/overview" target="_blank" id="_file_a_bug">File a bug</a></li>
<li class="download-sdk"><a href="https://github.com/secretrobotron/popcorn-maker" target="_blank" id="_download_sdk">Download the Butter SDK <span>and integrate Popcorn into your app.</span></a></li>
</ul>
@@ -529,7 +531,7 @@ <h3 class="welcome-h3">Let's make some popcorn.</h3>
</ul>
</section>
<a href="#" class="mozilla-logo"><img src="images/logo_mozilla.png" width="109" height="28" alt="Mozilla Logo"></a>
- <p class="copyright">&copy;2011<a href="#">Terms of service</a><a href="#">Fork me</a><a href="#">Popcorn.js.home</a><a href="#">Contact</a></p>
+ <p class="copyright">&copy;2011<a href="#">Terms of service</a><a href="https://github.com/secretrobotron/popcorn-maker">Fork me</a><a href="http://www.mozillapopcorn.org">Popcorn Home</a></p>
</div>
</div>
</div>

0 comments on commit 625c985

Please sign in to comment.