Skip to content

Commit

Permalink
0cc7ba4 Merge remote-tracking branch 'jon/FLUID-5840'
Browse files Browse the repository at this point in the history
  • Loading branch information
@acheetham
acheetham committed Jan 14, 2016
0 parents commit 71d2699
Show file tree
Hide file tree
Showing 262 changed files with 68,632 additions and 0 deletions.
Empty file added .nojekyll
Empty file.
141 changes: 141 additions & 0 deletions 404.html
@@ -0,0 +1,141 @@
<!DOCTYPE html>
<html lang="en" dir="ltr">

<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">

<!--FLUID-5588: Remove use of site.url absolute value and replace with relative URLs -->

<script src="http://fluidproject.org/lib/infusion/infusion-custom.js"></script>
<script src="http://fluidproject.org/js/uio.js"></script>

<!--FLUID-5588: Remove use of site.url absolute value and replace with relative URLs -->
<link href="http://fluidproject.org/lib/infusion/src/framework/preferences/css/Enactors.css" rel="stylesheet">
<link href="http://fluidproject.org/lib/infusion/src/framework/preferences/css/PrefsEditor.css" rel="stylesheet">
<link href="http://fluidproject.org/lib/infusion/src/framework/preferences/css/SeparatedPanelPrefsEditor.css" rel="stylesheet">
<link href="http://fluidproject.org/lib/foundation/css/foundation.css" rel="stylesheet">
<link href="http://fluidproject.org/css/style.css" rel="stylesheet">
<link href="http://fluidproject.org/css/contrast.css" rel="stylesheet">

<link href="http://fonts.googleapis.com/css?family=Roboto+Slab:400,300,700,100" rel="stylesheet">
<link href="http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700" rel="stylesheet">


<title>Page not found | fluid</title>
</head>

<body>
<!-- BEGIN markup for Preference Editor -->
<div class="flc-prefsEditor-separatedPanel fl-prefsEditor-separatedPanel">
<!-- This is the div that will contain the Preference Editor component -->
<div class="flc-slidingPanel-panel flc-prefsEditor-iframe"></div>

<!-- This div is for the sliding panel that shows and hides the Preference Editor controls -->
<div class="fl-panelBar">
<span class="fl-prefsEditor-buttons">
<button id="reset" class="flc-prefsEditor-reset fl-prefsEditor-reset"><span class="fl-icon-undo"></span> Reset</button>
<button id="show-hide" class="flc-slidingPanel-toggleButton fl-prefsEditor-showHide"> Show/Hide</button>
</span>
</div>
</div>

<!-- END markup for Preference Editor -->
<div class="fluid-web">
<div class="row">
<header class="small-12 medium-3 columns">
<div class="fluid-web-skip-links">
<a href="#fluid-web-content">Skip to Content</a>
<a href="#fluid-web-navigation">Skip to Navigation</a>
</div>
<h1><a href="/"><span class="fluid-web-logo-star" role="presentation"></span>fluid</a></h1>
</header>

<nav id="fluid-web-navigation" class="small-12 medium-8 columns fluid-web-nav">
<ul class="right button-group">

<li class="">
<a href="http://fluidproject.org/index.html" class="button inactive">
Home
</a>
</li>

<li class="">
<a href="http://fluidproject.org/about.html" class="button inactive">
About
</a>
</li>

<li class="">
<a href="http://fluidproject.org/projects.html" class="button inactive">
Projects
</a>
</li>

<li class="">
<a href="http://fluidproject.org/infusion.html" class="button inactive">
Infusion
</a>
</li>

<li class="">
<a href="http://fluidproject.org/news.html" class="button inactive">
News
</a>
</li>

</ul>
</nav>
</div>

<div class="row">
<div class="flc-toc-tocContainer toc small-12 columns"> </div>
</div>


<main class="fluid-web-about" id="fluid-web-content">
<div class="row">
<h2>Page not found</h2>
<p>
The page you requested was not found.
</p>
<h3>Relevant pages</h3>
<p>
<ul>
<li><a href="/index.html">Fluid Project home page</a></li>
<li><a href="/projects.html">Our projects</a></li>
<li><a href="/infusion.html">Fluid Infusion</a></li>
<li><a href="/news.html">News</a></li>
</ul>
</p>
</div>
</main>

<footer class="row fluid-web-section-gap fluid-web-footer">
<div class="medium-6 columns">
<p>Fluid is a project of the <a href="http://idrc.ocadu.ca/">Inclusive Design Research Centre</a> at <a href="http://www.ocadu.ca">OCAD
University</a>, funded by a grant from <a href="http://www.mellon.org/">The Andrew W. Mellon Foundation</a>.</p>

<address>
The Inclusive Design Research Centre<br/>
<a href="https://www.google.com/maps/place/205+Richmond+St+W/@43.6493603,-79.3901121,17z/">205 Richmond St. W. 2nd Floor<span class="fluid-web-map-icon" role="presentation"></span></a><br/>
Toronto, ON Canada M5V 1V3 <br/>
<abbr title="Phone number">T.</abbr> 416-977-6000 #3968 <br/>
<abbr title="Fax">F.</abbr> 416-977-9844
</address>
</div>

<div class="medium-6 columns">
<dl class="fluid-web-projectCoordinator-list">
<dt><a href="mailto:jtreviranus@faculty.ocadu.ca">Jutta Treviranus<span class="fluid-web-mail-icon" role="presentation"></span></a></dt>
<dd>Principal Investigator, Director and Professor</dd>
<dt><a href="mailto:jmitchell@ocadu.ca">Jess Mitchell<span class="fluid-web-mail-icon" role="presentation"></span></a></dt>
<dd>Senior Manager, Research and Development</dd>
<dt><a href="mailto:cclark@ocadu.ca">Colin Clark<span class="fluid-web-mail-icon" role="presentation"></span></a></dt>
<dd>Lead Software Architect</dd>
</dl>
</div>
</footer>

</div>
</body>
</html>
1 change: 1 addition & 0 deletions CNAME
@@ -0,0 +1 @@
fluidproject.org
10 changes: 10 additions & 0 deletions about-us/contact-us/index.html
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<title>Redirect</title>
<meta http-equiv="REFRESH" content="0;url=/about.html">
</head>
<body>
This page has moved. You will be automatically redirected to its new location. If you aren't forwarded to the new page, <a href="/about.html">click here</a>.
</body>
</html>
10 changes: 10 additions & 0 deletions about-us/our-funder/index.html
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<title>Redirect</title>
<meta http-equiv="REFRESH" content="0;url=/about.html">
</head>
<body>
This page has moved. You will be automatically redirected to its new location. If you aren't forwarded to the new page, <a href="/about.html">click here</a>.
</body>
</html>
10 changes: 10 additions & 0 deletions about-us/our-mission/index.html
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<title>Redirect</title>
<meta http-equiv="REFRESH" content="0;url=/about.html">
</head>
<body>
This page has moved. You will be automatically redirected to its new location. If you aren't forwarded to the new page, <a href="/about.html">click here</a>.
</body>
</html>
175 changes: 175 additions & 0 deletions about.html
@@ -0,0 +1,175 @@
<!DOCTYPE html>
<html lang="en" dir="ltr">

<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">

<!--FLUID-5588: Remove use of site.url absolute value and replace with relative URLs -->

<script src="http://fluidproject.org/lib/infusion/infusion-custom.js"></script>
<script src="http://fluidproject.org/js/uio.js"></script>

<!--FLUID-5588: Remove use of site.url absolute value and replace with relative URLs -->
<link href="http://fluidproject.org/lib/infusion/src/framework/preferences/css/Enactors.css" rel="stylesheet">
<link href="http://fluidproject.org/lib/infusion/src/framework/preferences/css/PrefsEditor.css" rel="stylesheet">
<link href="http://fluidproject.org/lib/infusion/src/framework/preferences/css/SeparatedPanelPrefsEditor.css" rel="stylesheet">
<link href="http://fluidproject.org/lib/foundation/css/foundation.css" rel="stylesheet">
<link href="http://fluidproject.org/css/style.css" rel="stylesheet">
<link href="http://fluidproject.org/css/contrast.css" rel="stylesheet">

<link href="http://fonts.googleapis.com/css?family=Roboto+Slab:400,300,700,100" rel="stylesheet">
<link href="http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700" rel="stylesheet">


<title>About | fluid</title>
</head>

<body>
<!-- BEGIN markup for Preference Editor -->
<div class="flc-prefsEditor-separatedPanel fl-prefsEditor-separatedPanel">
<!-- This is the div that will contain the Preference Editor component -->
<div class="flc-slidingPanel-panel flc-prefsEditor-iframe"></div>

<!-- This div is for the sliding panel that shows and hides the Preference Editor controls -->
<div class="fl-panelBar">
<span class="fl-prefsEditor-buttons">
<button id="reset" class="flc-prefsEditor-reset fl-prefsEditor-reset"><span class="fl-icon-undo"></span> Reset</button>
<button id="show-hide" class="flc-slidingPanel-toggleButton fl-prefsEditor-showHide"> Show/Hide</button>
</span>
</div>
</div>

<!-- END markup for Preference Editor -->
<div class="fluid-web">
<div class="row">
<header class="small-12 medium-3 columns">
<div class="fluid-web-skip-links">
<a href="#fluid-web-content">Skip to Content</a>
<a href="#fluid-web-navigation">Skip to Navigation</a>
</div>
<h1><a href="/"><span class="fluid-web-logo-star" role="presentation"></span>fluid</a></h1>
</header>

<nav id="fluid-web-navigation" class="small-12 medium-8 columns fluid-web-nav">
<ul class="right button-group">

<li class="">
<a href="http://fluidproject.org/index.html" class="button inactive">
Home
</a>
</li>

<li class="">
<a href="http://fluidproject.org/about.html" class="button current">
About
</a>
</li>

<li class="">
<a href="http://fluidproject.org/projects.html" class="button inactive">
Projects
</a>
</li>

<li class="">
<a href="http://fluidproject.org/infusion.html" class="button inactive">
Infusion
</a>
</li>

<li class="">
<a href="http://fluidproject.org/news.html" class="button inactive">
News
</a>
</li>

</ul>
</nav>
</div>

<div class="row">
<div class="flc-toc-tocContainer toc small-12 columns"> </div>
</div>


<main class="fluid-web-about" id="fluid-web-content">
<div class="row">
<div class="medium-5 columns">
<p class="fluid-web-intro-paragraph1 fluid-web-emphasized-text">
Fluid is an <strong>open, collaborative project</strong> to improve the user experience and inclusiveness of open source software.
</p>

<p>
The Fluid community consists of an international team of partners, individuals, and institutions focused on designing inclusive, flexible, customizable, user-centered interfaces.
</p>
</div>

<div class="medium-7 columns fluid-web-list">
<h2 class="fluid-web-emphasized-text">Areas of Focus</h2>

<ul>
<li><strong>Design of inclusive user interfaces:</strong> combining both design and technology to create a living library of sharable user interface components</li>
<li><strong>Build web tools:</strong> providing an easy way to build JavaScript-based user interfaces that are highly flexible and reusable. Built using Web standards and the jQuery toolkit, Infusion provides a lightweight application development framework supporting simple Model View Controller (MVC) techniques</li>
<li><strong>Create design resources:</strong> curating a <a href="http://wiki.fluidproject.org/display/fluid/Design+Handbook">Design Handbook<span class="fluid-web-external-link" role="presentation"></span></a> (for designers and developers alike) including tools and techniques that are easy to use, learn, and modify</li>
<li><strong>Teach inclusive design:</strong> giving demonstrations and teaching others at conferences and meetings</li>
<li><strong>Nurture an open and inclusive culture:</strong> documenting and making publicly available community processes to support an agile approach to design and development in an open source project</li>
</ul>

<h2 class="fluid-web-emphasized-text">Open Source</h2>

<p>Fluid uses open licenses enabling remixing, adaptation, and sharing.</p>

<ul>
<li>The Fluid Infusion Framework is released under both the <a href="http://www.opensource.org/licenses/ecl2.php">ECL 2.0<span class="fluid-web-external-link" role="presentation"></span></a> and <a href="http://www.opensource.org/licenses/bsd-license.php">New BSD<span class="fluid-web-external-link" role="presentation"></span></a> licenses,
making it widely compatible with a variety of open source licenses as well as commercial code.</li>
<li>All documentation, including Design Handbook and the project Wiki, is available under a <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution License<span class="fluid-web-external-link" role="presentation"></span></a>.</li>
</ul>
</div>
</div>

<div class="row">
<h2 class="fluid-web-deemphasized-text">The Fluid Community on the Web</h2>
<div class="text-center fluid-web-community">
<ul class="inline-list fluid-web-community-list">
<li><a href="http://wiki.fluidproject.org/"><span class="fluid-web-community-icon fluid-web-community-wiki" role="presentation"></span>wiki</a></li>
<li><a href="http://wiki.fluidproject.org/display/fluid/IRC+Channel"><span class="fluid-web-community-icon fluid-web-community-irc" role="presentation"></span>irc chat</a></li>
<li><a href="http://issues.fluidproject.org"><span class="fluid-web-community-icon fluid-web-community-bugs" role="presentation"></span>bug tracking</a></li>
<li><a href="http://github.com/fluid-project"><span class="fluid-web-community-icon fluid-web-community-source" role="presentation"></span>source code</a></li>
<li><a href="http://wiki.fluidproject.org/display/fluid/Mailing+Lists"><span class="fluid-web-community-icon fluid-web-community-mailinglist" role="presentation"></span>mailing list</a></li>
<li><a href="http://wiki.fluidproject.org/display/fluid/Meetings"><span class="fluid-web-community-icon fluid-web-community-meetings" role="presentation"></span>online meetings</a></li>
<li><a href="http://wiki.fluidproject.org/display/fluid/Presentations"><span class="fluid-web-community-icon fluid-web-community-presentations" role="presentation"></span>presentations</a></li>
</ul>
</div>
</div>

</main>

<footer class="row fluid-web-section-gap fluid-web-footer">
<div class="medium-6 columns">
<p>Fluid is a project of the <a href="http://idrc.ocadu.ca/">Inclusive Design Research Centre</a> at <a href="http://www.ocadu.ca">OCAD
University</a>, funded by a grant from <a href="http://www.mellon.org/">The Andrew W. Mellon Foundation</a>.</p>

<address>
The Inclusive Design Research Centre<br/>
<a href="https://www.google.com/maps/place/205+Richmond+St+W/@43.6493603,-79.3901121,17z/">205 Richmond St. W. 2nd Floor<span class="fluid-web-map-icon" role="presentation"></span></a><br/>
Toronto, ON Canada M5V 1V3 <br/>
<abbr title="Phone number">T.</abbr> 416-977-6000 #3968 <br/>
<abbr title="Fax">F.</abbr> 416-977-9844
</address>
</div>

<div class="medium-6 columns">
<dl class="fluid-web-projectCoordinator-list">
<dt><a href="mailto:jtreviranus@faculty.ocadu.ca">Jutta Treviranus<span class="fluid-web-mail-icon" role="presentation"></span></a></dt>
<dd>Principal Investigator, Director and Professor</dd>
<dt><a href="mailto:jmitchell@ocadu.ca">Jess Mitchell<span class="fluid-web-mail-icon" role="presentation"></span></a></dt>
<dd>Senior Manager, Research and Development</dd>
<dt><a href="mailto:cclark@ocadu.ca">Colin Clark<span class="fluid-web-mail-icon" role="presentation"></span></a></dt>
<dd>Lead Software Architect</dd>
</dl>
</div>
</footer>

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

0 comments on commit 71d2699

Please sign in to comment.