Skip to content

Commit

Permalink
foundation updated + some small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
victordiaz committed May 21, 2012
1 parent 1400fb3 commit d3979ba
Show file tree
Hide file tree
Showing 25 changed files with 198 additions and 140 deletions.
5 changes: 3 additions & 2 deletions _layouts/default.html
Expand Up @@ -266,9 +266,10 @@ <h2>Thanks for helping me out!</h2>
$("#cursor").show(true);
$("#cursor").animate({left: posx + 'px', top: posy +'px'
}, 1252, function() {
$(chosen).addClass("hover");
$(chosen).addClass("hover");
$(chosen).click();
});
$("#cursor").animate({}, 152);


});

Expand Down
4 changes: 3 additions & 1 deletion _layouts/project.html
Expand Up @@ -125,7 +125,7 @@ <h3> Link: </h3>


<div class="row book">
<div class = "eight columns">
<div class = "nine columns">

<div class="moreprojects">
<h1> More projects </h1>
Expand All @@ -142,6 +142,8 @@ <h1> More projects </h1>
{% endfor %}
</ul>
</div>
<div class = "nine columns"> </div>

</div> <!-- row -->


Binary file added images/misc/button-gloss.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/misc/button-overlay.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/misc/custom-form-sprites.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/misc/input-bg-outset.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/misc/input-bg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/misc/modal-gloss.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/misc/table-sorter.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/orbit/bullets.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/orbit/left-arrow.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/orbit/loading.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/orbit/mask-black.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/orbit/pause-black.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/orbit/right-arrow.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/orbit/rotator-black.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/orbit/timer-black.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions index.html
Expand Up @@ -9,17 +9,17 @@
<div class = "eight columns" >
<div class="foundation-header">
<h2 class = "correctme">Projects
<span class="subheader">check the info inside!</span>
<span class="subheader">check the info inside</span>



<a href ="JavaScript:void()" id = "randomproject" class="subheader"> Click here to see a random project</a>
<a href ="JavaScript:void()" id = "randomproject" class="subheader"> Be random! </a>

</h2>
</div>


<ul class="block-grid five-up mobile project_preview">
<ul class="block-grid five-up project_preview">

{% for project in site.posts %}
{% if project.category contains 'project' %}
Expand All @@ -29,7 +29,7 @@ <h2 class = "correctme">Projects

<img src="{{root}}/images/{{project.img|downcase}}/preview.jpg" alt="{{project.title}} project"/>
<p> {{project.title }} </p>
<div class = "project_preview_desc project_preview_desc show-on-phones hide-on-desktops hide-on-tablets"> {{project.desc}} </div>
<div class = "project_preview_desc project_preview_desc hide-on-phones hide-on-desktops hide-on-tablets"> <!-- {{project.desc}} --> </div>


</a>
Expand All @@ -50,7 +50,7 @@ <h2 id ="hacks">Experiments
</h2>
</div>

<ul class="block-grid five-up mobile project_preview">
<ul class="block-grid five-up project_preview">



Expand All @@ -63,7 +63,7 @@ <h2 id ="hacks">Experiments
</a>

<p class = "project_preview_title"> {{hack.title }} </p>
<div class = "project_preview_desc show-on-phones hide-on-desktops hide-on-tablets"> {{hack.desc}} </div>
<div class = "project_preview_desc hide-on-phones hide-on-desktops hide-on-tablets"> <!-- {{hack.desc}} --> </div>


</li>
Expand All @@ -81,7 +81,7 @@ <h2 id ="hacks">Experiments
</a>

<p class = "project_preview_title"> {{hack.title }} </p>
<div class = "project_preview_desc show-on-phones hide-on-desktops hide-on-tablets"> {{hack.desc}} </div>
<div class = "project_preview_desc show-on-phones hide-on-desktops hide-on-tablets"> <!-- {{hack.desc}} --> </div>



Expand Down
16 changes: 11 additions & 5 deletions javascripts/app.js
@@ -1,5 +1,5 @@
/* Foundation v2.1.5 http://foundation.zurb.com */
$(document).ready(function () {
/* Foundation v2.2.1 http://foundation.zurb.com */
jQuery(document).ready(function ($) {

/* Use this js doc for all application specific JS */

Expand All @@ -9,14 +9,17 @@ $(document).ready(function () {
function activateTab($tab) {
var $activeTab = $tab.closest('dl').find('a.active'),
contentLocation = $tab.attr("href") + 'Tab';

// Strip off the current url that IE adds
contentLocation = contentLocation.replace(/^.+#/, '#');

//Make Tab Active
$activeTab.removeClass('active');
$tab.addClass('active');

//Show Tab Content
//Show Tab Content
$(contentLocation).closest('.tabs-content').children('li').hide();
$(contentLocation).show();
$(contentLocation).css('display', 'block');
}

$('dl.tabs').each(function () {
Expand All @@ -29,6 +32,7 @@ $(document).ready(function () {

if (window.location.hash) {
activateTab($('a[href="' + window.location.hash + '"]'));
$.foundation.customForms.appendCustomMarkup();
}

/* ALERT BOXES ------------ */
Expand All @@ -45,6 +49,9 @@ $(document).ready(function () {

$('input, textarea').placeholder();

/* TOOLTIPS ------------ */
$(this).tooltips();



/* UNCOMMENT THE LINE YOU WANT BELOW IF YOU WANT IE6/7/8 SUPPORT AND ARE USING .block-grids */
Expand Down Expand Up @@ -88,5 +95,4 @@ $(document).ready(function () {
/* DISABLED BUTTONS ------------- */
/* Gives elements with a class of 'disabled' a return: false; */


});
12 changes: 6 additions & 6 deletions javascripts/foundation.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions javascripts/modernizr.foundation.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion stylesheets/app.css
@@ -1,4 +1,4 @@
/* Foundation v2.1.5 http://foundation.zurb.com */
/* Foundation v2.2.1 http://foundation.zurb.com */
/* Artfully masterminded by ZURB */

/* --------------------------------------------------
Expand Down

0 comments on commit d3979ba

Please sign in to comment.