Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into staging
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
  • Loading branch information
suskind committed Dec 18, 2014
2 parents d0f50ce + 302a4c1 commit 993a1de
Show file tree
Hide file tree
Showing 229 changed files with 5,562 additions and 3,395 deletions.
147 changes: 147 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
{
"env": {
"browser": true,
"node": false,
"amd": false,
"mocha": false,
"jasmine": false
},
"rules": {
"no-alert": false,
"no-array-constructor": false,
"no-bitwise": false,
"no-caller": false,
"no-catch-shadow": false,
"no-comma-dangle": false,
"no-cond-assign": false,
"no-console": false,
"no-constant-condition": false,
"no-control-regex": false,
"no-debugger": false,
"no-delete-var": false,
"no-div-regex": false,
"no-dupe-keys": false,
"no-else-return": false,
"no-empty": false,
"no-empty-class": false,
"no-empty-label": false,
"no-eq-null": false,
"no-eval": false,
"no-ex-assign": false,
"no-extend-native": false,
"no-extra-bind": false,
"no-extra-boolean-cast": false,
"no-extra-parens": false,
"no-extra-semi": false,
"no-extra-strict": false,
"no-fallthrough": false,
"no-floating-decimal": false,
"no-func-assign": false,
"no-implied-eval": false,
"no-inner-declarations": false,
"no-invalid-regexp": false,
"no-iterator": false,
"no-label-var": false,
"no-labels": false,
"no-lone-blocks": false,
"no-lonely-if": false,
"no-loop-func": false,
"no-mixed-requires": false,
"no-mixed-spaces-and-tabs": false,
"no-multi-spaces": false,
"no-multi-str": false,
"no-multiple-empty-lines": false,
"no-native-reassign": false,
"no-negated-in-lhs": false,
"no-nested-ternary": false,
"no-new": false,
"no-new-func": false,
"no-new-object": false,
"no-new-require": false,
"no-new-wrappers": false,
"no-obj-calls": false,
"no-octal": false,
"no-octal-escape": false,
"no-path-concat": false,
"no-plusplus": false,
"no-process-env": false,
"no-process-exit": false,
"no-proto": false,
"no-redeclare": false,
"no-regex-spaces": false,
"no-reserved-keys": false,
"no-restricted-modules": false,
"no-return-assign": false,
"no-script-url": false,
"no-self-compare": false,
"no-sequences": false,
"no-shadow": false,
"no-shadow-restricted-names": false,
"no-space-before-semi": false,
"no-spaced-func": false,
"no-sparse-arrays": false,
"no-sync": false,
"no-ternary": false,
"no-trailing-spaces": false,
"no-undef": false,
"no-undef-init": false,
"no-undefined": false,
"no-underscore-dangle": false,
"no-unreachable": false,
"no-unused-expressions": false,
"no-unused-vars": false,
"no-use-before-define": false,
"no-void": false,
"no-warning-comments": false,
"no-with": false,
"no-wrap-func": false,
"block-scoped-var": false,
"brace-style": false,
"camelcase": false,
"comma-style": false,
"complexity": false,
"consistent-return": false,
"consistent-this": false,
"curly": false,
"default-case": false,
"dot-notation": false,
"eol-last": false,
"eqeqeq": false,
"func-names": false,
"func-style": false,
"global-strict": false,
"guard-for-in": false,
"handle-callback-err": false,
"key-spacing": false,
"max-depth": false,
"max-len": false,
"max-nested-callbacks": false,
"max-params": false,
"max-statements": false,
"new-cap": false,
"new-parens": false,
"one-var": false,
"padded-blocks": false,
"quote-props": false,
"quotes": false,
"radix": false,
"semi": false,
"sort-vars": false,
"space-after-keywords": false,
"space-before-blocks": false,
"space-in-brackets": false,
"space-in-parens": false,
"space-infix-ops": false,
"space-return-throw-case": false,
"space-unary-word-ops": false,
"spaced-line-comment": false,
"strict": false,
"use-isnan": false,
"valid-jsdoc": 2,
"valid-typeof": false,
"vars-on-top": false,
"wrap-iife": false,
"wrap-regex": false,
"yoda": false
}
}
14 changes: 0 additions & 14 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -341,20 +341,6 @@ module.exports = function (grunt) {
},
},

// Creates a plato report
plato: {
inkjs: {
options: {
jshint: grunt.file.readJSON(jshintFile, {
encoding: 'utf-8'
})
},
files: {
'<%= ink.folders.js.srcBase %>report': '<%= ink.folders.js.src %>**/lib.js'
}
}
},

watch: {
css: {
files: [
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ Ink is an interface kit for quick development of web interfaces, simple to use a

Ink is part of [SAPOs Open Source Software initiative](http://oss.sapo.pt).

## Current Version: 3.1.1
## Current Version: 3.1.2

You can read our full documentation, examples and recipes in http://ink.sapo.pt

## Getting started

Let's get you started with Ink right away. Here's what you need to know and do:

1. Download the [latest](https://github.com/sapo/Ink/archive/3.1.1.zip) release.
1. Download the [latest](https://github.com/sapo/Ink/archive/3.1.2.zip) release.
2. Check the recipes we provide in the ```dist/cookbook``` folder and choose one to start from or use ```quick-start.html``` as a blank slate.
3. Make sure you have `ink.css`, `ink-ie.css` and `ink.js` included somewhere in the `<head>`.
4. Add your own css and scripts to carry all your project-specific changes. You can use ```quick-start.css``` from the ```dist/css``` folder. It allready contains the same media queries as Ink.
Expand Down Expand Up @@ -71,7 +71,7 @@ If you want to build from our source code, you'll need to install a few things:
* #### OS X
* **Install Homebrew:**
```
ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)"
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
```
* **Install Node.js:**
```
Expand Down Expand Up @@ -171,6 +171,7 @@ Get its source, contribute or report and issue here: **https://github.com/sapo/I
+ [Bower](http://bower.io/)

## Versions
* [Ink 3.1.2](https://github.com/sapo/Ink/archive/3.1.2.zip)
* [Ink 3.1.1](https://github.com/sapo/Ink/archive/3.1.1.zip)
* [Ink 3.1.0](https://github.com/sapo/Ink/archive/3.1.0.zip)
* [Ink 3.0.5](https://github.com/sapo/Ink/archive/3.0.5.zip)
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Ink",
"version": "3.0.5",
"version": "3.1.2",
"description": "An HTML5/CSS3 framework used at SAPO for fast and efficient website design and prototyping.",
"keywords": [
"HTML",
Expand Down
6 changes: 3 additions & 3 deletions dist/cookbook/3-boxes.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
<link rel="apple-touch-startup-image" href="../img/splash.768x1004.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:portrait)">
<link rel="apple-touch-startup-image" href="../img/splash.1024x748.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:landscape)">

<!-- load inks CSS -->
<!-- load Ink's CSS -->
<link rel="stylesheet" type="text/css" href="../css/ink-flex.min.css">
<link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css">

<!-- load inks CSS for IE8 -->
<!-- load Ink's CSS for IE8 -->
<!--[if lt IE 9 ]>
<link rel="stylesheet" href="../css/ink-ie.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<![endif]-->
Expand All @@ -42,7 +42,7 @@
});
</script>

<!-- load inks javascript files -->
<!-- load Ink's javascript files -->
<script type="text/javascript" src="../js/holder.js"></script>
<script type="text/javascript" src="../js/ink-all.min.js"></script>
<script type="text/javascript" src="../js/autoload.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions dist/cookbook/4-boxes.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<link rel="apple-touch-startup-image" href="../img/splash.768x1004.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:portrait)">
<link rel="apple-touch-startup-image" href="../img/splash.1024x748.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:landscape)">

<!-- load inks CSS -->
<!-- load Ink's CSS -->
<link rel="stylesheet" type="text/css" href="../css/ink-flex.min.css">
<link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css">

<!-- load inks CSS for IE8 -->
<!-- load Ink's CSS for IE8 -->
<!--[if lt IE 9 ]>
<link rel="stylesheet" href="../css/ink-ie.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<![endif]-->
Expand All @@ -40,7 +40,7 @@
});
</script>

<!-- load inks javascript files -->
<!-- load Ink's javascript files -->
<script type="text/javascript" src="../js/holder.js"></script>
<script type="text/javascript" src="../js/ink-all.min.js"></script>
<script type="text/javascript" src="../js/autoload.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions dist/cookbook/advanced-grid.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<link rel="apple-touch-startup-image" href="../img/splash.768x1004.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:portrait)">
<link rel="apple-touch-startup-image" href="../img/splash.1024x748.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:landscape)">

<!-- load inks CSS -->
<!-- load Ink's CSS -->
<link rel="stylesheet" type="text/css" href="../css/ink-flex.min.css">
<link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css">

<!-- load inks CSS for IE8 -->
<!-- load Ink's CSS for IE8 -->
<!--[if lt IE 9 ]>
<link rel="stylesheet" href="../css/ink-ie.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<![endif]-->
Expand All @@ -40,7 +40,7 @@
});
</script>

<!-- load inks javascript files -->
<!-- load Ink's javascript files -->
<script type="text/javascript" src="../js/holder.js"></script>
<script type="text/javascript" src="../js/ink-all.min.js"></script>
<script type="text/javascript" src="../js/autoload.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions dist/cookbook/article-page.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<link rel="apple-touch-startup-image" href="../img/splash.768x1004.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:portrait)">
<link rel="apple-touch-startup-image" href="../img/splash.1024x748.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:landscape)">

<!-- load inks CSS -->
<!-- load Ink's CSS -->
<link rel="stylesheet" type="text/css" href="../css/ink-flex.min.css">
<link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css">

<!-- load inks CSS for IE8 -->
<!-- load Ink's CSS for IE8 -->
<!--[if lt IE 9 ]>
<link rel="stylesheet" href="../css/ink-ie.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<![endif]-->
Expand All @@ -40,7 +40,7 @@
});
</script>

<!-- load inks javascript files -->
<!-- load Ink's javascript files -->
<script type="text/javascript" src="../js/holder.js"></script>
<script type="text/javascript" src="../js/ink-all.min.js"></script>
<script type="text/javascript" src="../js/autoload.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions dist/cookbook/carousel.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<link rel="apple-touch-startup-image" href="../img/splash.768x1004.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:portrait)">
<link rel="apple-touch-startup-image" href="../img/splash.1024x748.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:landscape)">

<!-- load inks CSS -->
<!-- load Ink's CSS -->
<link rel="stylesheet" type="text/css" href="../css/ink-flex.min.css">
<link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css">

<!-- load inks CSS for IE8 -->
<!-- load Ink's CSS for IE8 -->
<!--[if lt IE 9 ]>
<link rel="stylesheet" href="../css/ink-ie.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<![endif]-->
Expand All @@ -40,7 +40,7 @@
});
</script>

<!-- load inks javascript files -->
<!-- load Ink's javascript files -->
<script type="text/javascript" src="../js/holder.js"></script>
<script type="text/javascript" src="../js/ink-all.min.js"></script>
<script type="text/javascript" src="../js/autoload.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions dist/cookbook/fixed-width-column.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<link rel="apple-touch-startup-image" href="../img/splash.768x1004.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:portrait)">
<link rel="apple-touch-startup-image" href="../img/splash.1024x748.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:landscape)">

<!-- load inks CSS -->
<!-- load Ink's CSS -->
<link rel="stylesheet" type="text/css" href="../css/ink-flex.min.css">
<link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css">

<!-- load inks CSS for IE8 -->
<!-- load Ink's CSS for IE8 -->
<!--[if lt IE 9 ]>
<link rel="stylesheet" href="../css/ink-ie.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<![endif]-->
Expand All @@ -40,7 +40,7 @@
});
</script>

<!-- load inks javascript files -->
<!-- load Ink's javascript files -->
<script type="text/javascript" src="../js/holder.js"></script>
<script type="text/javascript" src="../js/ink-all.min.js"></script>
<script type="text/javascript" src="../js/autoload.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions dist/cookbook/forms.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<link rel="apple-touch-startup-image" href="../img/splash.768x1004.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:portrait)">
<link rel="apple-touch-startup-image" href="../img/splash.1024x748.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:landscape)">

<!-- load inks CSS -->
<!-- load Ink's CSS -->
<link rel="stylesheet" type="text/css" href="../css/ink-flex.min.css">
<link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css">

<!-- load inks CSS for IE8 -->
<!-- load Ink's CSS for IE8 -->
<!--[if lt IE 9 ]>
<link rel="stylesheet" href="../css/ink-ie.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<![endif]-->
Expand All @@ -40,7 +40,7 @@
});
</script>

<!-- load inks javascript files -->
<!-- load Ink's javascript files -->
<script type="text/javascript" src="../js/holder.js"></script>
<script type="text/javascript" src="../js/ink-all.min.js"></script>
<script type="text/javascript" src="../js/autoload.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions dist/cookbook/gallery-modal.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<link rel="apple-touch-startup-image" href="../img/splash.768x1004.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:portrait)">
<link rel="apple-touch-startup-image" href="../img/splash.1024x748.png" media="screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:landscape)">

<!-- load inks CSS -->
<!-- load Ink's CSS -->
<link rel="stylesheet" type="text/css" href="../css/ink-flex.min.css">
<link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css">

<!-- load inks CSS for IE8 -->
<!-- load Ink's CSS for IE8 -->
<!--[if lt IE 9 ]>
<link rel="stylesheet" href="../css/ink-ie.min.css" type="text/css" media="screen" title="no title" charset="utf-8">
<![endif]-->
Expand All @@ -40,7 +40,7 @@
});
</script>

<!-- load inks javascript files -->
<!-- load Ink's javascript files -->
<script type="text/javascript" src="../js/holder.js"></script>
<script type="text/javascript" src="../js/ink-all.min.js"></script>
<script type="text/javascript" src="../js/autoload.js"></script>
Expand Down
Loading

0 comments on commit 993a1de

Please sign in to comment.