Merge pull request #107 from stevepiercy/master

back to work
Pylons · Apr 30, 2016 · 5462e3e · 5462e3e
2 parents ceb8af3 + b15c04a
commit 5462e3e
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 63 deletions.
diff --git a/dist/app.230a6357398fdca02e12.css → dist/app.04fa5a2a247802f0701a.css b/dist/app.230a6357398fdca02e12.css → dist/app.04fa5a2a247802f0701a.css
diff --git a/dist/app.04fa5a2a247802f0701a.js b/dist/app.04fa5a2a247802f0701a.js
diff --git a/dist/app.230a6357398fdca02e12.js b/dist/app.230a6357398fdca02e12.js
diff --git a/dist/colors.html b/dist/colors.html
@@ -1,6 +1,6 @@
-<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><title>Welcome to Pyramid, a Python Web Framework</title><meta name="description" content="Pyramid is a lightweight Python web framework aimed at taking small web apps into big web apps. This site provides an easy entry point into Pyramid."><meta name="keywords" content="pyramid, web framework, python web framework, pyramid web framework, python, pylons, pylons project, open source"><meta name="author" content="Pylons Project"><link rel="shortcut icon" href="img/pyramid-16x16.png"><link rel="stylesheet" href="vendors.230a6357398fdca02e12.css"><link rel="stylesheet" href="app.230a6357398fdca02e12.css"><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><title>Welcome to Pyramid, a Python Web Framework</title><meta name="description" content="Pyramid is a lightweight Python web framework aimed at taking small web apps into big web apps. This site provides an easy entry point into Pyramid."><meta name="keywords" content="pyramid, web framework, python web framework, pyramid web framework, python, pylons, pylons project, open source"><meta name="author" content="Pylons Project"><link rel="shortcut icon" href="img/pyramid-16x16.png"><link rel="stylesheet" href="vendors.04fa5a2a247802f0701a.css"><link rel="stylesheet" href="app.04fa5a2a247802f0701a.css"><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
     ga('create', 'UA-21146943-3', 'auto');
-    ga('send', 'pageview');</script></head><body><div id="pace-loader"></div><section class="app"><header id="header"><div class="container">HEADER</div></header><nav id="nav"><div class="container"><div class="navbar navbar-inverse navbar-fixed-top"><div class="container"><div class="navbar-header"><button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"><span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span></button> <a class="navbar-brand" href="/"><img class="logo" alt="pyramid" src="img/pyramid-60x60.png"></a><div class="navbar-brand-name">Pyramid</div></div><div class="collapse navbar-collapse"><ul class="nav navbar-nav nav-pills pull-right"><li><a href="/">Home</a></li><li role="presentation" class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">Resources <span class="caret"></span></a><ul class="dropdown-menu dropdown-menu-right"><li><a href="/resources.html">Core</a></li><li><a href="/resources-extending-pyramid.html">Extending Pyramid</a></li></ul></li></ul></div></div></div></div></nav><section id="main"><div class="container"><p><strong>Colors</strong></p><div>Primary</div><div class="bg-primary lighter text-white">Lighter</div><div class="bg-primary light text-white">Light</div><div class="bg-primary text-white">Default</div><div class="bg-primary dark text-white">Dark</div><div class="bg-primary darker text-white">Darker</div><div>Success</div><div class="bg-success lighter text-white">Lighter</div><div class="bg-success light text-white">Light</div><div class="bg-success text-white">Default</div><div class="bg-success dark text-white">Dark</div><div class="bg-success darker text-white">Darker</div><div>Info</div><div class="bg-info lighter text-white">Lighter</div><div class="bg-info light text-white">Light</div><div class="bg-info text-white">Default</div><div class="bg-info dark text-white">Dark</div><div class="bg-info darker text-white">Darker</div><div>Warning</div><div class="bg-warning lighter text-white">Lighter</div><div class="bg-warning light text-white">Light</div><div class="bg-warning text-white">Default</div><div class="bg-warning dark text-white">Dark</div><div class="bg-warning darker text-white">Darker</div><div>Danger</div><div class="bg-danger lighter text-white">Lighter</div><div class="bg-danger light text-white">Light</div><div class="bg-danger text-white">Default</div><div class="bg-danger dark text-white">Dark</div><div class="bg-danger darker text-white">Darker</div><div>Alert</div><div class="bg-alert lighter text-white">Lighter</div><div class="bg-alert light text-white">Light</div><div class="bg-alert text-white">Default</div><div class="bg-alert dark text-white">Dark</div><div class="bg-alert darker text-white">Darker</div><div>System</div><div class="bg-system lighter text-white">Lighter</div><div class="bg-system light text-white">Light</div><div class="bg-system text-white">Default</div><div class="bg-system dark text-white">Dark</div><div class="bg-system darker text-white">Darker</div><div>Light</div><div class="bg-light lighter text-white">Lighter</div><div class="bg-light light text-white">Light</div><div class="bg-light text-white">Default</div><div class="bg-light dark text-white">Dark</div><div class="bg-light darker text-white">Darker</div><div>Dark</div><div class="bg-dark lighter text-white">Lighter</div><div class="bg-dark light text-white">Light</div><div class="bg-dark text-white">Default</div><div class="bg-dark dark text-white">Dark</div><div class="bg-dark darker text-white">Darker</div><div>TPC Red</div><div class="bg-red lighter text-white">Lighter</div><div class="bg-red light text-white">Light</div><div class="bg-red text-white">Default</div><div class="bg-red dark text-white">Dark</div><div class="bg-red darker text-white">Darker</div><div>TPC Gray</div><div class="bg-gray lighter text-white">Lighter</div><div class="bg-gray light text-white">Light</div><div class="bg-gray text-white">Default</div><div class="bg-gray dark text-white">Dark</div><div class="bg-gray darker text-white">Darker</div><div>TPC Green</div><div class="bg-green lighter text-white">Lighter</div><div class="bg-green light text-white">Light</div><div class="bg-green text-white">Default</div><div class="bg-green dark text-white">Dark</div><div class="bg-green darker text-white">Darker</div><div>TPC Blue</div><div class="bg-blue lighter text-white">Lighter</div><div class="bg-blue light text-white">Light</div><div class="bg-blue text-white">Default</div><div class="bg-blue dark text-white">Dark</div><div class="bg-blue darker text-white">Darker</div><div>TPC Beige</div><div class="bg-beige lighter text-white">Lighter</div><div class="bg-beige light text-white">Light</div><div class="bg-beige text-white">Default</div><div class="bg-beige dark text-white">Dark</div><div class="bg-beige darker text-white">Darker</div></div></section><footer id="footer"><div class="container"><div class="row"><p>© Copyright 2008-2016, <a href="http://agendaless.com/"><strong>Agendaless Consulting</strong></a><br><a href="http://www.pylonsproject.org/"><strong>Pylons Project</strong></a> | Build 230a6357398fdca02e12</p><p><a href="https://www.linode.com/?utm_source=referral&utm_medium=website&utm_content=[Pyramid]&utm_campaign=sponsorship" target="_blank">Sponsored by <strong>Linode</strong></a></p></div></div></footer></section><script src="vendors.230a6357398fdca02e12.js"></script><script src="app.230a6357398fdca02e12.js"></script></body></html>
+    ga('send', 'pageview');</script></head><body><div id="pace-loader"></div><section class="app"><header id="header"><div class="container">HEADER</div></header><nav id="nav"><div class="container"><div class="navbar navbar-inverse navbar-fixed-top"><div class="container"><div class="navbar-header"><button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"><span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span></button> <a class="navbar-brand" href="/"><img class="logo" alt="pyramid" src="img/pyramid-60x60.png"></a><div class="navbar-brand-name">Pyramid</div></div><div class="collapse navbar-collapse"><ul class="nav navbar-nav nav-pills pull-right"><li><a href="/">Home</a></li><li role="presentation" class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">Resources <span class="caret"></span></a><ul class="dropdown-menu dropdown-menu-right"><li><a href="/resources.html">Core</a></li><li><a href="/resources-extending-pyramid.html">Extending Pyramid</a></li></ul></li></ul></div></div></div></div></nav><section id="main"><div class="container"><p><strong>Colors</strong></p><div>Primary</div><div class="bg-primary lighter text-white">Lighter</div><div class="bg-primary light text-white">Light</div><div class="bg-primary text-white">Default</div><div class="bg-primary dark text-white">Dark</div><div class="bg-primary darker text-white">Darker</div><div>Success</div><div class="bg-success lighter text-white">Lighter</div><div class="bg-success light text-white">Light</div><div class="bg-success text-white">Default</div><div class="bg-success dark text-white">Dark</div><div class="bg-success darker text-white">Darker</div><div>Info</div><div class="bg-info lighter text-white">Lighter</div><div class="bg-info light text-white">Light</div><div class="bg-info text-white">Default</div><div class="bg-info dark text-white">Dark</div><div class="bg-info darker text-white">Darker</div><div>Warning</div><div class="bg-warning lighter text-white">Lighter</div><div class="bg-warning light text-white">Light</div><div class="bg-warning text-white">Default</div><div class="bg-warning dark text-white">Dark</div><div class="bg-warning darker text-white">Darker</div><div>Danger</div><div class="bg-danger lighter text-white">Lighter</div><div class="bg-danger light text-white">Light</div><div class="bg-danger text-white">Default</div><div class="bg-danger dark text-white">Dark</div><div class="bg-danger darker text-white">Darker</div><div>Alert</div><div class="bg-alert lighter text-white">Lighter</div><div class="bg-alert light text-white">Light</div><div class="bg-alert text-white">Default</div><div class="bg-alert dark text-white">Dark</div><div class="bg-alert darker text-white">Darker</div><div>System</div><div class="bg-system lighter text-white">Lighter</div><div class="bg-system light text-white">Light</div><div class="bg-system text-white">Default</div><div class="bg-system dark text-white">Dark</div><div class="bg-system darker text-white">Darker</div><div>Light</div><div class="bg-light lighter text-white">Lighter</div><div class="bg-light light text-white">Light</div><div class="bg-light text-white">Default</div><div class="bg-light dark text-white">Dark</div><div class="bg-light darker text-white">Darker</div><div>Dark</div><div class="bg-dark lighter text-white">Lighter</div><div class="bg-dark light text-white">Light</div><div class="bg-dark text-white">Default</div><div class="bg-dark dark text-white">Dark</div><div class="bg-dark darker text-white">Darker</div><div>TPC Red</div><div class="bg-red lighter text-white">Lighter</div><div class="bg-red light text-white">Light</div><div class="bg-red text-white">Default</div><div class="bg-red dark text-white">Dark</div><div class="bg-red darker text-white">Darker</div><div>TPC Gray</div><div class="bg-gray lighter text-white">Lighter</div><div class="bg-gray light text-white">Light</div><div class="bg-gray text-white">Default</div><div class="bg-gray dark text-white">Dark</div><div class="bg-gray darker text-white">Darker</div><div>TPC Green</div><div class="bg-green lighter text-white">Lighter</div><div class="bg-green light text-white">Light</div><div class="bg-green text-white">Default</div><div class="bg-green dark text-white">Dark</div><div class="bg-green darker text-white">Darker</div><div>TPC Blue</div><div class="bg-blue lighter text-white">Lighter</div><div class="bg-blue light text-white">Light</div><div class="bg-blue text-white">Default</div><div class="bg-blue dark text-white">Dark</div><div class="bg-blue darker text-white">Darker</div><div>TPC Beige</div><div class="bg-beige lighter text-white">Lighter</div><div class="bg-beige light text-white">Light</div><div class="bg-beige text-white">Default</div><div class="bg-beige dark text-white">Dark</div><div class="bg-beige darker text-white">Darker</div></div></section><footer id="footer"><div class="container"><div class="row"><p>© Copyright 2008-2016, <a href="http://agendaless.com/"><strong>Agendaless Consulting</strong></a><br><a href="http://www.pylonsproject.org/"><strong>Pylons Project</strong></a> | Build 04fa5a2a247802f0701a</p><p><a href="https://www.linode.com/?utm_source=referral&utm_medium=website&utm_content=[Pyramid]&utm_campaign=sponsorship" target="_blank">Sponsored by <strong>Linode</strong></a></p></div></div></footer></section><script src="vendors.04fa5a2a247802f0701a.js"></script><script src="app.04fa5a2a247802f0701a.js"></script></body></html>