Skip to content

Commit

Permalink
Merge branch 'master' of github.com:elementary/mvp into mobile-title
Browse files Browse the repository at this point in the history
  • Loading branch information
Cassidy James Blaede committed Jan 28, 2015
2 parents 69cec57 + b783e98 commit b7db39a
Show file tree
Hide file tree
Showing 11 changed files with 792 additions and 172 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
The New elementaryos.org
================

We're focusing on getting the minimum viable product for our website up and running for the release of Freya. To start, we're just getting a single-page download site ready for Freya. From there we will expand to a small number of pages as needed.
We're focusing on getting the minimum viable product for our website up and running for the release of Freya. ~~To start, we're just getting a single-page download site ready for Freya. From there we will expand to a small number of pages as needed.~~ We'll want to make sure we migrate over any important information like docs before we can take the old site offline.


Project Organization
Expand Down
1 change: 0 additions & 1 deletion _templates/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<li><a href="https://twitter.com/elementary" target="_blank" title="Twitter"><i class="fa fa-twitter"></i></a></li>
<li><a href="http://reddit.com/r/elementaryos" target="_blank" title="Reddit"><i class="fa fa-reddit"></i></a></li>
<li><a href="https://plus.google.com/114635553671833442612" target="_blank" title="Google+"><i class="fa fa-google-plus"></i></a></li>
<li><a href="https://github.com/elementary/mvp" target="_blank" title="GitHub"><i class="fa fa-github"></i></a></li>
<li><a href="https://www.facebook.com/elementaryos" target="_blank" title="Facebook"><i class="fa fa-facebook"></i></a></li>
</ul>
</footer>
Expand Down
8 changes: 8 additions & 0 deletions _templates/header.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,19 @@
<title><?php echo !empty($page['title']) ? $page['title'] : $sitewide['title']; ?></title>

<link rel="shortcut icon" href="favicon.ico">
<link rel="apple-touch-icon" href="images/apple-touch-icon.png">
<link rel="stylesheet" type="text/css" media="all" href="http://fonts.googleapis.com/css?family=Open+Sans:400,600,300">
<link rel="stylesheet" type="text/css" media="all" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" media="all" href="styles/main.css">

<script>
<?php include './scripts/jql.min.js'; ?>
jQl.loadjQ('//cdn.jsdelivr.net/g/jquery');
<?php include './scripts/smooth-scrolling.js'; ?>
</script>

<?php echo $page['scripts']; ?>

<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
Expand Down
9 changes: 5 additions & 4 deletions get-involved.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<div class="heading">
<div class="row">
<h1><a class="inline-tweet" href="http://twitter.com/home/?status=&ldquo;A different language is a different vision of life.&rdquo; —Federico Fellini elementaryos.org/get-involved" target="_blank">&ldquo;A different language is a different vision of life.&rdquo;</a></h1>
<p class="small-label">Federico Fellini</p>
<p class="small-label"><a href="https://en.wikipedia.org/wiki/Federico_Fellini" target="_blank">Federico Fellini</a></p>
</div>
</div>

Expand All @@ -50,7 +50,7 @@
<div class="heading">
<div class="row">
<h1><a class="inline-tweet" href="http://twitter.com/home/?status=&ldquo;Websites should look good from the inside and out&rdquo; —Paul Cookson elementaryos.org/get-involved" target="_blank">&ldquo;Websites should look good from the inside and out&rdquo;</a></h1>
<p class="small-label">Paul Cookson</p>
<p class="small-label"><a href="https://twitter.com/paulcookson" target="_blank">Paul Cookson</a></p>
</div>
</div>

Expand All @@ -60,6 +60,7 @@

<div class="actions">
<a class="button flat suggested-action" href="https://github.com/elementary/mvp" target="_blank">Fork Us on GitHub</a>
<a class="button flat" href="https://github.com/elementary/mvp/issues" target="_blank">See Our Open Bug Reports</a>
</div>
</div>
</section>
Expand All @@ -68,7 +69,7 @@
<div class="heading">
<div class="row">
<h1><a class="inline-tweet" href="http://twitter.com/home/?status=&ldquo;Great design is making something memorable and meaningful.&rdquo; —Dieter Rams elementaryos.org/get-involved" target="_blank">&ldquo;Great design is making something memorable and meaningful.&rdquo;</a></h1>
<p class="small-label">Dieter Rams</p>
<p class="small-label"><a href="https://en.wikipedia.org/wiki/Dieter_Rams" target="_blank">Dieter Rams</a></p>
</div>
</div>

Expand Down Expand Up @@ -103,7 +104,7 @@
<div class="heading">
<div class="row">
<h1><a class="inline-tweet" href="http://twitter.com/home/?status=&ldquo;Before software can be reusable it first has to be usable&rdquo; —Ralph Johnson elementaryos.org/get-involved" target="_blank">&ldquo;Before software can be reusable it first has to be usable&rdquo;</a></h1>
<p class="small-label">Ralph Johnson</p>
<p class="small-label"><a href="https://twitter.com/RalphJohnson" target="_blank">Ralph Johnson</a></p>
</div>
</div>

Expand Down
Binary file added images/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b7db39a

Please sign in to comment.