Skip to content

Commit

Permalink
Merge branch 'release/2.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
chambaz committed Sep 16, 2013
2 parents 20f5b1a + 824f567 commit a90abb6
Show file tree
Hide file tree
Showing 50 changed files with 2,201 additions and 641 deletions.
2 changes: 2 additions & 0 deletions .jshintignore
@@ -0,0 +1,2 @@
js/libs/*.min.js
js/plugins.js
10 changes: 10 additions & 0 deletions .jshintrc
@@ -0,0 +1,10 @@
{
"evil": false, // Make sure to warn about eval
"regexdash": true,
"browser": true,
"jquery": true,
"trailing": false,
"sub": true,
"multistr": true,
"expr": true
}
15 changes: 15 additions & 0 deletions .travis.yml
@@ -0,0 +1,15 @@
language: node_js
node_js:
- '0.10'
before_install:
- npm install -g jshint
- gem install sass compass modular-scale
script:
- jshint .
- compass compile
notifications:
email:
recipients:
- secure: NYyWrnOzCZC5VrrZiVaBt1BMb3LAvDb/v0gtXnZyXJz4D8kpV4D+FMDcpc44cId5hx2NMfvv26bIKtCj9N8PHBgM2rlztH8rhlI5uC2d2WK4tl2+Do1NCp/MbJKkhDiRDQGukEf+QBoKv/f/xsbuJIHTvPfwNbpiqw1iwGKxzoo=
campfire:
secure: KMTupKSaR1ThG0rW8RpsXcyVCTPfFKvNhU/TJh1QwVx9mPEfU8oeYh65gSiw5IUYy65yL0cB3jAmzJt6pCpujKj/vdy3l6fq4WAzvVLuPOoGK2QYnAPrB3y3CkDH/rG/tfaktyhJ6DntEHqnwJ+GvTU5M5StPHaL1YnweU87FUE=
2 changes: 1 addition & 1 deletion README.md
@@ -1,4 +1,4 @@
Gumby Framework
Gumby Framework [![Build Status](https://travis-ci.org/GumbyFramework/Gumby.png?branch=master)](https://travis-ci.org/GumbyFramework/Gumby)
=====================

Gumby Framework is a flexible, responsive CSS Framework, Powered by SASS. Create rapid and logical page layout and app
Expand Down
2 changes: 1 addition & 1 deletion bower.json
@@ -1,5 +1,5 @@
{
"name": "gumby",
"version": "2.4.10",
"version": "2.5.0",
"main": ["./js/libs/gumby.min.js", "./css/gumby.css"]
}
857 changes: 792 additions & 65 deletions css/gumby.css

Large diffs are not rendered by default.

138 changes: 133 additions & 5 deletions demo.html
Expand Up @@ -457,6 +457,62 @@ <h2>A <span>responsive <span>960</span> grid</span>
</div>
</div>

<!-- Offset Tests -->
<div class="row">
<div class="twelve columns special">
<p>Columns pushed and pulled by 'x'</p>
</div>
</div>
<div class="row">
<div class="one column push_eleven">
<p>1</p>
</div>
<div class="eleven columns pull_one">
<p>11 Columns Pull 1</p>
</div>
</div>
<div class="row">
<div class="two columns push_ten">
<p>2 Columns</p>
</div>
<div class="ten columns pull_two">
<p>10 Columns Pull 2</p>
</div>
</div>
<div class="row">
<div class="three columns push_nine">
<p>3 Columns Push 9</p>
</div>
<div class="nine columns pull_three">
<p>9 Columns Pull 3</p>
</div>
</div>
<div class="row">
<div class="four columns push_eight">
<p>4 Columns Push 8</p>
</div>
<div class="eight columns pull_four">
<p>8 Columns Pull 4</p>
</div>
</div>
<div class="row">
<div class="five columns push_seven">
<p>5 Columns Push 7</p>
</div>
<div class="seven columns pull_five">
<p>7 Columns Pull 5</p>
</div>
</div>
<div class="row">
<div class="six columns push_six">
<p>6 Columns Push 6</p>
</div>
<div class="six columns pull_six">
<p>6 Columns Pull 6</p>
</div>
</div>


<!-- Centering tests -->
<div class="row">
<div class="twelve columns special">
Expand Down Expand Up @@ -960,6 +1016,76 @@ <h2>A <span>responsive <span>960</span> grid</span>
</div>
</div>

<!-- Offset Tests -->
<div class="row">
<div class="sixteen columns special">
<p>Columns pushed and pulled by 'x'</p>
</div>
</div>
<div class="row">
<div class="one column push_fifteen">
<p>1</p>
</div>
<div class="fifteen columns pull_one">
<p>15 Columns Pull 1</p>
</div>
</div>
<div class="row">
<div class="two columns push_fourteen">
<p>2 Col</p>
</div>
<div class="fourteen columns pull_two">
<p>14 Columns Pull 2</p>
</div>
</div>
<div class="row">
<div class="three columns push_thirteen">
<p>3 Col Push 13</p>
</div>
<div class="thirteen columns pull_three">
<p>13 Columns Pull 3</p>
</div>
</div>
<div class="row">
<div class="four columns push_twelve">
<p>4 Columns Push 12</p>
</div>
<div class="twelve columns pull_four">
<p>12 Columns Pull 4</p>
</div>
</div>
<div class="row">
<div class="five columns push_eleven">
<p>5 Columns Push 11</p>
</div>
<div class="eleven columns pull_five">
<p>11 Columns Pull 5</p>
</div>
</div>
<div class="row">
<div class="six columns push_ten">
<p>6 Columns Push 10</p>
</div>
<div class="ten columns pull_six">
<p>10 Columns Pull 6</p>
</div>
</div>
<div class="row">
<div class="seven columns push_nine">
<p>7 Columns Push 9</p>
</div>
<div class="nine columns pull_seven">
<p>9 Columns Pull 7</p>
</div>
</div>
<div class="row">
<div class="eight columns push_eight">
<p>8 Columns Push 8</p>
</div>
<div class="eight columns pull_eight">
<p>8 Columns Pull 8</p>
</div>
</div>

<!-- Centering tests -->
<div class="row">
Expand Down Expand Up @@ -1082,9 +1208,9 @@ <h2>A <span>responsive <span>960</span> grid</span>
</script>

<!--
Include gumby.js followed by UI modules.
Or concatenate and minify into a single file
<script src="js/libs/gumby.js"></script>
Include gumby.js followed by UI modules followed by gumby.init.js
Or concatenate and minify into a single file -->
<script gumby-touch="js/libs" src="js/libs/gumby.js"></script>
<script src="js/libs/ui/gumby.retina.js"></script>
<script src="js/libs/ui/gumby.fixed.js"></script>
<script src="js/libs/ui/gumby.skiplink.js"></script>
Expand All @@ -1095,9 +1221,11 @@ <h2>A <span>responsive <span>960</span> grid</span>
<script src="js/libs/ui/gumby.navbar.js"></script>
<script src="js/libs/ui/gumby.fittext.js"></script>
<script src="js/libs/ui/jquery.validation.js"></script>
<script src="js/libs/gumby.init.js"></script>-->
<script src="js/libs/gumby.init.js"></script>

<script src="js/libs/gumby.min.js"></script>
<!--
gumby.min.js contains gumby.js, all UI modules and gumby.init.js
<script src="js/libs/gumby.min.js"></script> -->
<script src="js/plugins.js"></script>
<script src="js/main.js"></script>

Expand Down
105 changes: 105 additions & 0 deletions index.html
@@ -0,0 +1,105 @@
<!doctype html>
<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
<!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if IE 9]> <html class="no-js ie9" lang="en"> <![endif]-->
<!-- Consider adding an manifest.appcache: h5bp.com/d/Offline -->
<!--[if gt IE 9]><!--> <html class="no-js" lang="en" itemscope itemtype="http://schema.org/Product"> <!--<![endif]-->
<head>
<meta charset="utf-8">

<!-- Use the .htaccess and remove these lines to avoid edge case issues.
More info: h5bp.com/b/378 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

<title>Gumby - A Flexible, Responsive CSS Framework - Powered by SASS</title>
<meta name="description" content="" />
<meta name="keywords" content="" />
<meta name="author" content="humans.txt">

<link rel="shortcut icon" href="favicon.png" type="image/x-icon" />

<!-- Facebook Metadata /-->
<meta property="fb:page_id" content="" />
<meta property="og:image" content="" />
<meta property="og:description" content=""/>
<meta property="og:title" content=""/>

<!-- Google+ Metadata /-->
<meta itemprop="name" content="">
<meta itemprop="description" content="">
<meta itemprop="image" content="">

<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">

<!-- We highly recommend you use SASS and write your custom styles in sass/_custom.scss.
However, there is a blank style.css in the css directory should you prefer -->
<link rel="stylesheet" href="css/gumby.css">
<!-- <link rel="stylesheet" href="css/style.css"> -->

<script src="js/libs/modernizr-2.6.2.min.js"></script>
</head>

<body>


<!-- Grab Google CDN's jQuery, fall back to local if offline -->
<!-- 2.0 for modern browsers, 1.10 for .oldie -->
<script>
var oldieCheck = Boolean(document.getElementsByTagName('html')[0].className.match(/\soldie\s/g));
if(!oldieCheck) {
document.write('<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.2/jquery.min.js"><\/script>');
} else {
document.write('<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"><\/script>');
}
</script>
<script>
if(!window.jQuery) {
if(!oldieCheck) {
document.write('<script src="js/libs/jquery-2.0.2.min.js"><\/script>');
} else {
document.write('<script src="js/libs/jquery-1.10.1.min.js"><\/script>');
}
}
</script>

<!--
Include gumby.js followed by UI modules followed by gumby.init.js
Or concatenate and minify into a single file -->
<script gumby-touch="js/libs" src="js/libs/gumby.js"></script>
<script src="js/libs/ui/gumby.retina.js"></script>
<script src="js/libs/ui/gumby.fixed.js"></script>
<script src="js/libs/ui/gumby.skiplink.js"></script>
<script src="js/libs/ui/gumby.toggleswitch.js"></script>
<script src="js/libs/ui/gumby.checkbox.js"></script>
<script src="js/libs/ui/gumby.radiobtn.js"></script>
<script src="js/libs/ui/gumby.tabs.js"></script>
<script src="js/libs/ui/gumby.navbar.js"></script>
<script src="js/libs/ui/gumby.fittext.js"></script>
<script src="js/libs/ui/jquery.validation.js"></script>
<script src="js/libs/gumby.init.js"></script>

<!--
gumby.min.js contains gumby.js, all UI modules and gumby.init.js
<script src="js/libs/gumby.min.js"></script> -->
<script src="js/plugins.js"></script>
<script src="js/main.js"></script>

<!-- Change UA-XXXXX-X to be your site's ID -->
<!--<script>
window._gaq = [['_setAccount','UAXXXXXXXX1'],['_trackPageview'],['_trackPageLoadTime']];
Modernizr.load({
load: ('https:' == location.protocol ? '//ssl' : '//www') + '.google-analytics.com/ga.js'
});
</script>-->

<!-- Prompt IE 6 users to install Chrome Frame. Remove this if you want to support IE 6.
chromium.org/developers/how-tos/chrome-frame-getting-started -->
<!--[if lt IE 7 ]>
<script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js"></script>
<script>window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})</script>
<![endif]-->

</body>
</html>
45 changes: 26 additions & 19 deletions js/libs/gumby.init.js
Expand Up @@ -2,26 +2,33 @@
* Gumby Init
*/

// test for touch event support
Modernizr.load({
test: Modernizr.touch,
// initialize Gumby
if(Gumby.autoInit) {
Gumby.debug('Gumby auto initialization');
window.Gumby.init();
}

// if present load custom jQuery mobile build and update Gumby.click
yep: Gumby.path+'/jquery.mobile.custom.min.js',
callback: function(url, result, key) {
// check jQuery mobile has successfully loaded before using tap events
if($.mobile) {
window.Gumby.click += ' tap';
}
},
// if AMD return Gumby object to define
if(typeof define == "function" && define.amd) {
define(window.Gumby);
}

// either way initialize Gumby
complete: function() {
window.Gumby.init();
// test for touch event support and load jQuery if present
if(Gumby.touchEvents) {
Gumby.debug('Loading jQuery mobile touch events');
Modernizr.load({
test: Modernizr.touch,

// if AMD return Gumby object to define
if(typeof define == "function" && define.amd) {
define(window.Gumby);
// if present load custom jQuery mobile build and update Gumby.click
yep: Gumby.touchEvents+'/jquery.mobile.custom.min.js',
callback: function(url, result, key) {
// check jQuery mobile has successfully loaded before using tap events
if(!$.mobile) {
Gumby.error('Error loading jQuery mobile touch events');
return;
}

window.Gumby.click += ' tap';
}
}
});
});
}

0 comments on commit a90abb6

Please sign in to comment.