Skip to content

Commit

Permalink
Merge branch 'develop' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
Fábio Santos committed Jul 27, 2015
2 parents bf8c422 + dba3394 commit 3c19a33
Show file tree
Hide file tree
Showing 48 changed files with 1,266 additions and 1,172 deletions.
16 changes: 5 additions & 11 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Ink is an interface kit for quick development of web interfaces, simple to use a

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

## Current Version: 3.1.9
## Current Version: 3.1.10

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

Expand Down Expand Up @@ -95,13 +95,6 @@ If you want to build from our source code, you'll need to install a few things:
```

* #### Ubuntu
* **Install Node.js**
```
sudo apt-get install python-software-properties python g++ make
sudo add-apt-repository ppa:chris-lea/node.js
sudo apt-get update
sudo apt-get install nodejs
```
* **Install Grunt:**
```
sudo npm install -g grunt-cli
Expand All @@ -128,7 +121,7 @@ If you want to build from our source code, you'll need to install a few things:

If you don't need to rebuild Javascript code you can just use [Scout](http://mhs.github.io/scout-app/) which is a nice, free and cross platform Sass/Compass compiler.

Building on Windows is a lot tricker so we won't get into details on how to install all the required tools. Instead here's a list of useful pages you'll need to read while trying this endeavour:
Building on Windows is a lot trickier so we won't get into details on how to install all the required tools. Instead here's a list of useful pages you'll need to read while trying this endeavour:

* [Getting started with Sass and Compass](http://thesassway.com/beginner/getting-started-with-sass-and-compass)
* [Grunt](http://gruntjs.com/frequently-asked-questions)
Expand All @@ -147,10 +140,10 @@ Grunt exposes these build tasks:
---

## Documentation
The documentation is no longer distributed with Inks releases. We've completely rewritten or documentation and are now running our site on Github pages using Jekyll.
The documentation is no longer distributed with Ink releases. We've completely rewritten or documentation and are now running our site on Github pages using Jekyll.

You can read it at http://ink.sapo.pt
Get its source, contribute or report and issue here: **https://github.com/sapo/Ink-doc**
Get its source, contribute or report an issue here: **https://github.com/sapo/Ink-doc**

## Ink is built with help from these wonderful projects:

Expand All @@ -171,6 +164,7 @@ Get its source, contribute or report and issue here: **https://github.com/sapo/I
+ [Bower](http://bower.io/)

## Versions
* [Ink 3.1.10](https://github.com/sapo/Ink/archive/3.1.10.zip)
* [Ink 3.1.9](https://github.com/sapo/Ink/archive/3.1.9.zip)
* [Ink 3.1.8](https://github.com/sapo/Ink/archive/3.1.8.zip)
* [Ink 3.1.7](https://github.com/sapo/Ink/archive/3.1.7.zip)
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Ink",
"version": "3.1.9",
"version": "3.1.10",
"description": "An HTML5/CSS3 framework used at SAPO for fast and efficient website design and prototyping.",
"keywords": [
"HTML",
Expand Down
95 changes: 26 additions & 69 deletions dist/cookbook/4-boxes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,81 +89,38 @@ <h1>site name<small>smaller text</small></h1>
</ul>
</nav>
</header>
<div class="button-toolbar">
<div class="button-group">
<button class="ink-button" disabled="">left</button>
<button class="ink-button">middle</button>
<button class="ink-button">right</button>
<div class="column-group gutters">
<div class="all-100">
<h2>heading</h2>
<img src="holder.js/1650x928/auto/ink" alt="">
</div>
<div class="button-group">
<button class="ink-button">left</button>
<button class="ink-button" disabled="">middle</button>
<button class="ink-button">right</button>
<div class="all-33 small-100 tiny-100">
<h3>heading</h3>
<img src="holder.js/1200x600/auto/ink" alt="">
<p class="quarter-top-space">"Red is not the right word," was the reply. "The plague was scarlet. The whole face and body turned scarlet in an hour's time. Don't I know? Didn't I see enough of it? And I am telling you it was scarlet because&mdash;well, because it was scarlet. There is no other word for it."</p>
</div>
<div class="button-group">
<button class="ink-button">left</button>
<button class="ink-button">middle</button>
<button class="ink-button" disabled="">right</button>
<div class="all-33 small-100 tiny-100">
<h3>heading</h3>
<img src="holder.js/1200x600/auto/ink" alt="">
<p class="quarter-top-space">"Red is not the right word," was the reply. "The plague was scarlet. The whole face and body turned scarlet in an hour's time. Don't I know? Didn't I see enough of it? And I am telling you it was scarlet because&mdash;well, because it was scarlet. There is no other word for it."</p>
</div>
<div class="button-group">
<button class="ink-button green" disabled="">left</button>
<button class="ink-button green">middle</button>
<button class="ink-button green">right</button>
</div>
<div class="button-group">
<button class="ink-button green">left</button>
<button class="ink-button green" disabled="">middle</button>
<button class="ink-button green">right</button>
</div>
<div class="button-group">
<button class="ink-button black">left</button>
<button class="ink-button black">middle</button>
<button class="ink-button black" disabled="">right</button>
<div class="all-33 small-100 tiny-100">
<h3>heading</h3>
<img src="holder.js/1200x600/auto/ink" alt="">
<p class="quarter-top-space">"Red is not the right word," was the reply. "The plague was scarlet. The whole face and body turned scarlet in an hour's time. Don't I know? Didn't I see enough of it? And I am telling you it was scarlet because&mdash;well, because it was scarlet. There is no other word for it."</p>
</div>
</div>


<div class="column-group half-top-space">
<div class="all-33">
<div class="column-group">
<div class="all-50 align-center"><a href="#" class="ink-button">Button</a></div>
<div class="all-50 align-center"><button class="ink-button green">Button</button></div>
</div>
</div>
<div class="all-33">
<div class="column-group">
<div class="all-50 align-center"><button class="ink-button orange">Button</button></div>
<div class="all-50 align-center"><button class="ink-button red">Button</button></div>
</div>
</div>
<div class="all-33">
<div class="column-group">
<div class="all-50 align-center"><button class="ink-button blue">Button</button></div>
<div class="all-50 align-center"><button class="ink-button black">Button</button></div>
</div>
</div>
</div>
<div class="column-group half-vertical-space">
<div class="all-33">
<div class="column-group">
<div class="all-50 align-center"><button class="ink-button" disabled="">Button</button></div>
<div class="all-50 align-center"><button class="ink-button green" disabled="">Button</button></div>
</div>
</div>
<div class="all-33">
<div class="column-group">
<div class="all-50 align-center"><button class="ink-button orange" disabled="">Button</button></div>
<div class="all-50 align-center"><button class="ink-button red" disabled="">Button</button></div>
</div>
</div>
<div class="all-33">
<div class="column-group">
<div class="all-50 align-center"><button class="ink-button blue" disabled="">Button</button></div>
<div class="all-50 align-center"><button class="ink-button black" disabled="">Button</button></div>
</div>
</div>
</div>
<footer class="clearfix">
<div class="ink-grid">
<ul class="unstyled inline half-vertical-space">
<li class="active"><a href="#">About</a></li>
<li><a href="#">Sitemap</a></li>
<li><a href="#">Contacts</a></li>
</ul>
<p class="note">Identification of the owner of the copyright, either by name, abbreviation, or other designation by which it is generally known.</p>
</div>
</footer>

</div>
</body>
</html>
Loading

0 comments on commit 3c19a33

Please sign in to comment.