Skip to content

Commit

Permalink
Merge pull request #2 from esbrandt/mixxxdevelopers-website
Browse files Browse the repository at this point in the history
lp:1206147, website
  • Loading branch information
ywwg committed Oct 12, 2013
2 parents ee1cbbd + b028ff4 commit b0f8dc5
Show file tree
Hide file tree
Showing 5 changed files with 465 additions and 7 deletions.
2 changes: 1 addition & 1 deletion getinvolved.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<div class="halfbox_right">
<H3>Start Developing Now</H3>
<ul>
<li><p>Get a <a href="http://www.launchpad.net">Launchpad</a> account and <a href="http://mixxx.org/wiki/doku.php/using_bazaar">fork your own branch</a>!</p></li>
<li><p>Get a <a href="https://github.com">Github</a> account and <a href="http://mixxx.org/wiki/doku.php/using_git">fork your own branch</a>!</p></li>
<li><p>Pick a bug off our <a href="https://bugs.launchpad.net/mixxx/+bugs?field.tag=easy">Easy Bugs List</a> and start hacking!<br><br> Fixed it? Your name will be in the <a href="http://mixxx.org/contact.php">Mixxx credits</a>!</p></li>
<li><p>When you're stuck, get help from our existing developers our IRC channel: #mixxx on <a href="http://www.freenode.net">Freenode</a></p></li>
<li><p>Join our mailing list: <a href="https://lists.sourceforge.net/lists/listinfo/mixxx-devel">mixxx-devel</a></li>
Expand Down
Binary file modified images/developmentcycle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
460 changes: 460 additions & 0 deletions images/developmentcycle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 3 additions & 5 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
</div>
-->
</div>
<!-- Deactivate linking to outdated MAS version 10/6/13 8:26 AM //jus
<div style="float: right; margin-top: 0px; margin-right: -14px;">
<script type="text/javascript">
if (OSName.search("OS X") >= 0) {
Expand All @@ -65,15 +66,12 @@
}
</script>
</div>
-->
<!--
<div style="float: right; margin-top: 16px; padding-right: 8px;">
<img src="/images/squiggle.png">
</div>-->
<div style="width: 500px; padding-top: 6px;" >
<p style="padding: 0px; margin: 0px; text-align: center;">The most advanced free DJ software <br>can be yours in seconds.
<!--Start creating live MP3 DJ mixes today.-->
</p>
</div>
<p style="text-align: center;">The most advanced free DJ software can be yours in seconds.</p>
<div style="clear: both;"></div>
</div> <!-- gapfiller -->

Expand Down
2 changes: 1 addition & 1 deletion navbar.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
</div>
<div id="navbar_smalllinks">
<p>
<a href="/manual/latest">Manual</a>
<a href="/forums">Forums</a>
<a href="/wiki">Wiki</a>
<a href="http://mixxxblog.blogspot.com">Blog</a>
<a href="/manual/latest">Manual</a>
</p>
<p style="font-size: 0.7em">
<a href="/press">Press</a>
Expand Down

0 comments on commit b0f8dc5

Please sign in to comment.