Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[ui] resolved merge conflicts

  • Loading branch information...
commit b1f39892b49484864223550c8fc1bdcb7b4d55ee 2 parents 1181547 + 152c1a4
Paolo Fragomeni authored
Showing with 63 additions and 18 deletions.
  1. +22 −0 package.json
  2. +9 −0 public/css/index.css
  3. +32 −18 public/index.html
View
22 package.json
@@ -0,0 +1,22 @@
+{
+ "name": "flatiron-www",
+ "version": "0.0.0-4",
+ "subdomain": "flatiron",
+ "dependencies": {
+ "http-server": "*",
+ "colors": "*",
+ "optimist": "*",
+ "wordwrap": "*"
+ },
+ "domains": [
+ "flatironjs.org",
+ "flatironjs.com",
+ "flatironjs.net",
+ "www.flatironjs.org",
+ "www.flatironjs.com",
+ "www.flatironjs.net"
+ ],
+ "scripts": {
+ "start": "node_modules/.bin/http-server"
+ }
+}
View
9 public/css/index.css
@@ -275,6 +275,15 @@ a.github {
z-index: 5;
}
+#fork-me-on-github img {
+ z-index: 100;
+ width: auto;
+ position: absolute;
+ top: 0;
+ left: 0;
+ border: 0;
+}
+
#shelter-container, #shelter-lid {
position: absolute;
right: 15px;
View
50 public/index.html
@@ -31,7 +31,7 @@
<a href="#composition">composition</a>
</nav>
</div>
- <div id="slogan1">an unobtrusive full stack web framework</div>
+ <div id="slogan1">an unobtrusive framework initiative for node.js</div>
</div>
<div id="shelter-container">
@@ -41,6 +41,13 @@
<div id="shelter-lid">
</div>
+ <div id="fork-me-on-github">
+ <a href="https://github.com/flatiron">
+ <img src="https://a248.e.akamai.net/assets.github.com/img/bec6c51521dcc8148146135149fe06a9cc737577/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f6c6566745f6461726b626c75655f3132313632312e706e67"
+ alt="Fork me on GitHub">
+ </a>
+ </div>
+
<div id="nodejitsu">
</div>
@@ -52,11 +59,15 @@
</div>
<div id="scrolling-content">
- <h1>a full stack framework for node.js</h1>
+ <h1>an unobtrusive framework initiative for node.js</h1>
No one agrees on frameworks. It's difficult to get consensus on how much or how little a framework should do. Flatiron's approach is to package simple to use yet full featured components and let developers subtract or add what they want.
<p>
- Flatiron promotes code organization and sustainability by clearly seperating development concerns. Each component works elegantly with or without its counterparts. Many of the components work the same in the browser as they do on the server.
- <br/><br/>
+ Flatiron promotes code organization and sustainability by clearly separating development concerns. Each component works elegantly with or without its counterparts. Many of the components work the same in the browser as they do on the server.
+ <p>This is the motivation behind flatiron. At it's core flatiron is two things:</p>
+ <p><strong>An initiative to build a collection of decoupled tools with the same standard of quality and performance that you would expect from anything built by <a href="http://nodejitsu.com">Nodejitsu.</a></strong></p>
+ <p><strong>A full-stack web application development framework which packages these tools together to make <a href="http://blog.nodejitsu.com/scaling-isomorphic-javascript-code">isomorphic</a> and <a href="http://nodejs.org/docs/v0.6.0/api/streams.html">stream-based</a> application development easier.</strong></p>
+ <p>Build the best tools and the best systems will follow.</p>
+
<h1>inside the framework</h1>
Packaged inside the framework are the basic building blocks for a modern web application.
@@ -68,22 +79,16 @@
<a href="#composition"><div class="component" id="diagram_composition"><span>composition</span></div></a>
<div id="puffy"></div>
</div>
-
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
- <p>
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-
- <!-- img src="img/placeholder.png" width="684" height="490" alt="Placeholder" -->
<div class="end-section"></div>
<header>
<h1>routing</h1><a href="http://github.com/flatiron/sugarskull" class="github">GITHUB</a><br/>
- make directing trafic simple by centralizing your routing into a table. sugarskull works on the client and the server.
+ make directing traffic simple by centralizing your routing into a table. sugarskull works on the client and the server.
</header>
<h1 id="routing">sugarskull ★ full featured routing</h1>
- Sugarskull is a URL router. It works on the browser and the server (Node.js). It's not a plugin for another framework. It's not dependant on anything. It's a modern router that was designed from the ground up for javascript. It's unique.
+ Sugarskull is a URL router. It works on the browser and the server (Node.js). It's not a plugin for another framework. It's not dependent on anything. It's a modern router that was designed from the ground up for javascript. It's unique.
<p>On the client, it uses part of the URL to figure out what functions should execute, which usually has some effect on the way the page is presented. On the server, it helps figure out what to do when someone goes to a URL.
@@ -239,12 +244,21 @@ <h1 id="composition">broadway ★ simple glue for components</h1>
<script type="text/javascript" src="js/jquery.1.7.min.js"></script>
<script type="text/javascript" src="js/index.js"></script>
- <!-- script> // Change UA-XXXXX-X to be your site's ID
- window._gaq = [['_setAccount','UAXXXXXXXX1'],['_trackPageview'],['_trackPageLoadTime']];
- Modernizr.load({
- load: ('https:' == location.protocol ? '//ssl' : '//www') + '.google-analytics.com/ga.js'
- });
- </script -->
+ <script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-24971485-5']);
+ _gaq.push(['_setDomainName', 'none']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+ </script>
<!--[if lt IE 7 ]>
Please sign in to comment.
Something went wrong with that request. Please try again.