Skip to content

Commit 1d9d2f6

Browse files
committed
Merge pull request #9 from chrisvogt/enhance/presentation
Presentation - v1.0.0
2 parents c710b8c + ef8b73a commit 1d9d2f6

File tree

11 files changed

+46
-36
lines changed

11 files changed

+46
-36
lines changed

.codeclimate.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
languages:
2+
Ruby: true
3+
JavaScript: true
4+
PHP: false
5+
Python: false
6+
exclude_paths:
7+
- "components/*"

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ rvm:
44

55
cache: bundler
66

7-
branches:
8-
only:
9-
- gh-pages # test the gh-pages branch
10-
117
env:
128
global:
139
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true

components/jquery/.bower.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"name": "jquery",
3-
"version": "2.1.3",
3+
"version": "2.1.4",
44
"main": "dist/jquery.js",
55
"license": "MIT",
66
"ignore": [
77
"**/.*",
88
"build",
9+
"dist/cdn",
910
"speed",
1011
"test",
1112
"*.md",
@@ -25,11 +26,11 @@
2526
"library"
2627
],
2728
"homepage": "https://github.com/jquery/jquery",
28-
"_release": "2.1.3",
29+
"_release": "2.1.4",
2930
"_resolution": {
3031
"type": "version",
31-
"tag": "2.1.3",
32-
"commit": "8f2a9d9272d6ed7f32d3a484740ab342c02541e0"
32+
"tag": "2.1.4",
33+
"commit": "7751e69b615c6eca6f783a81e292a55725af6b85"
3334
},
3435
"_source": "git://github.com/jquery/jquery.git",
3536
"_target": ">= 1.9.1",

components/jquery/bower.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"name": "jquery",
3-
"version": "2.1.3",
3+
"version": "2.1.4",
44
"main": "dist/jquery.js",
55
"license": "MIT",
66
"ignore": [
77
"**/.*",
88
"build",
9+
"dist/cdn",
910
"speed",
1011
"test",
1112
"*.md",

components/jquery/dist/jquery.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* jQuery JavaScript Library v2.1.3
2+
* jQuery JavaScript Library v2.1.4
33
* http://jquery.com/
44
*
55
* Includes Sizzle.js
@@ -9,7 +9,7 @@
99
* Released under the MIT license
1010
* http://jquery.org/license
1111
*
12-
* Date: 2014-12-18T15:11Z
12+
* Date: 2015-04-28T16:01Z
1313
*/
1414

1515
(function( global, factory ) {
@@ -67,7 +67,7 @@ var
6767
// Use the correct document accordingly with window argument (sandbox)
6868
document = window.document,
6969

70-
version = "2.1.3",
70+
version = "2.1.4",
7171

7272
// Define a local copy of jQuery
7373
jQuery = function( selector, context ) {
@@ -531,7 +531,12 @@ jQuery.each("Boolean Number String Function Array Date RegExp Object Error".spli
531531
});
532532

533533
function isArraylike( obj ) {
534-
var length = obj.length,
534+
535+
// Support: iOS 8.2 (not reproducible in simulator)
536+
// `in` check used to prevent JIT error (gh-2145)
537+
// hasOwn isn't used here due to false negatives
538+
// regarding Nodelist length in IE
539+
var length = "length" in obj && obj.length,
535540
type = jQuery.type( obj );
536541

537542
if ( type === "function" || jQuery.isWindow( obj ) ) {

components/jquery/dist/jquery.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/jquery/dist/jquery.min.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/jquery/src/core.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,12 @@ jQuery.each("Boolean Number String Function Array Date RegExp Object Error".spli
478478
});
479479

480480
function isArraylike( obj ) {
481-
var length = obj.length,
481+
482+
// Support: iOS 8.2 (not reproducible in simulator)
483+
// `in` check used to prevent JIT error (gh-2145)
484+
// hasOwn isn't used here due to false negatives
485+
// regarding Nodelist length in IE
486+
var length = "length" in obj && obj.length,
482487
type = jQuery.type( obj );
483488

484489
if ( type === "function" || jQuery.isWindow( obj ) ) {

params.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

readme.md

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
11
#friendsofcake.com
22

3-
[![Build Status](https://travis-ci.org/chrisvogt/FriendsOfCake.github.io.svg?branch=gh-pages)](https://travis-ci.org/chrisvogt/FriendsOfCake.github.io) [![Code Climate](https://codeclimate.com/github/chrisvogt/FriendsOfCake.github.io/badges/gpa.svg)](https://codeclimate.com/github/chrisvogt/FriendsOfCake.github.io) [![GitHub license](https://img.shields.io/github/license/chrisvogt/FriendsOfCake.github.io.svg?style=flat-square)]() <img src="https://cdn.rawgit.com/chrisvogt/FriendsOfCake.github.io/develop/img/FOC.png" alt="Friends Of Cake" width="280" align="right" />
3+
[![Travis](https://img.shields.io/travis/chrisvogt/FriendsOfCake.github.io.svg?style=flat-square)](https://travis-ci.org/chrisvogt/FriendsOfCake.github.io)
4+
[![Code Climate](https://img.shields.io/codeclimate/github/chrisvogt/FriendsOfCake.github.io.svg?style=flat-square)](https://codeclimate.com/github/chrisvogt/FriendsOfCake.github.io)
5+
[![GitHub license](https://img.shields.io/github/license/FriendsOfCake/FriendsOfCake.github.io.svg?style=flat-square)](https://github.com/FriendsOfCake/FriendsOfCake.github.io/blob/master/LICENSE)
6+
<img src="img/FOC.png" alt="Friends Of Cake" width="280" align="right">
47

5-
This repository holds the [friendsofcake.com](http://friendsofcake.com) website code, currently powered by [GitHub Pages](https://pages.github.com/) and [Jekyll](http://jekyllrb.com/).
8+
This repository holds the source code to the [friendsofcake.com](http://friendsofcake.com) website, a [Jekyll](http://jekyllrb.com/)-powered site hosted for free on [GitHub Pages](https://pages.github.com/).
69

710
### Development Notes
811

9-
#### Setup a local instance
12+
#### Setting up a local instance
1013

11-
This project is setup to use [Bundler](http://bundler.io/), [Jekyll](http://jekyllrb.com/), and [Bower](http://bower.io/). After cloning this repository, run:
14+
This project is setup to use [Bundler](http://bundler.io/), [Jekyll](http://jekyllrb.com/), and [Bower](http://bower.io/).
15+
16+
After cloning this repository, run:
1217

1318
1. `bundle install` to download dependencies required to build.
14-
2. `bower install` to download front-end packages into the `./components` directory.
19+
2. `bower install` to download front-end packages into the `./components` directory. (This is not necessary for the `master` branch.)
1520
3. `jekyll serve` to run locally or `jekyll build` to generate into `./site` directory.
1621

17-
#### Development workflow
18-
19-
The workflow for contributing to this project is as follows:
20-
21-
1. Create a fork of the repository.
22-
2. Base your feature branch on the `develop` repository.
23-
3. Open a [new issue](https://github.com/FriendsOfCake/FriendsOfCake.github.io/issues) describing the bug, feature, or work you will be contributing.
24-
3. Submit pull requests against the `develop` repository.
25-
2622
### Screenshot
2723

28-
![friendsofcake.com screenshot](http://i.imgur.com/7r6JKzP.gif)
24+
![friendsofcake.com screenshot](screenshot.png)
2925

30-
<img src="https://cdn.rawgit.com/jekyll/brand/master/jekyll-logo-light-transparent.png" alt="Made with Jekyll" width="140" align="right" /> <img src="http://bower.io/img/bower-logo.svg" alt="Made with Bower" height="70" align="right" />
26+
<img src="https://cdn.rawgit.com/jekyll/brand/master/jekyll-logo-light-transparent.png" alt="Made with Jekyll" width="140" align="right" /> <img src="http://bower.io/img/bower-logo.svg" alt="Made with Bower" height="70" align="right">

0 commit comments

Comments
 (0)