Skip to content
This repository has been archived by the owner on Sep 20, 2023. It is now read-only.

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@vincenthz
vincenthz committed Aug 30, 2016
1 parent 882f594 commit bbf4873
Show file tree
Hide file tree
Showing 4 changed files with 161 additions and 39 deletions.
29 changes: 21 additions & 8 deletions bench.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<meta name="description" content>
<meta name="author" content="haskell foundation">

<!-- theme tweaked from https://blackrockdigital.github.io/startbootstrap-agency/ -->

<title>Foundation: Benchmarks</title>

<!-- Bootstrap Core CSS -->
Expand Down Expand Up @@ -38,7 +40,7 @@
<body id="page-top" class="index">

<!-- Navigation -->
<nav id="mainNav" class="navbar navbar-default navbar-custom navbar-fixed-top">
<nav id="mainNav" class="navbar navbar-default navbar-custom navbar-fixed-top affix">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header page-scroll">
Expand All @@ -57,9 +59,11 @@
<li>
<a href="./features.html">Features</a>
</li>
<!--
<li>
<a href="./documentation.html">Documentation</a>
<a href="/documentation.html">Documentation</a>
</li>
-->
<li>
<a href="./bench.html">Benchmarks</a>
</li>
Expand All @@ -70,8 +74,16 @@
<!-- /.container-fluid -->
</nav>

<section>
<h1>Benchmarks</h1>
<header>
<div class="container">
<div class="intro-lead-in"></div>
<div class="intro-heading"></div>
</div>
</header>
<section>

<h1>Benchmarks</h1>


<div class="container">
<div class="col-lg-12 text-center">
Expand Down Expand Up @@ -120,8 +132,9 @@ <h2>name benchs/text2.csv</h2>
<footer>
<div class="container">
<div class="row">
<hr>
<div class="col-md-8">
<span class="copyright">Copyright &copy; Foundation 2016 -- generated by <a href>hakyll</a></span>
<span class="copyright text-muted">Copyright &copy; <a href="https://github.com/haskell-foundation/">Haskell Foundation</a> 2016</span>
</div>
</div>
</div>
Expand All @@ -140,12 +153,12 @@ <h2>name benchs/text2.csv</h2>
<script src="js/jqBootstrapValidation.js"></script>

<!-- Theme JavaScript -->
<script src="js/agency.min.js"></script>
<script src="js/agency.js"></script>

<script>
$(function() {
new Chart(document.getElementById("benchs_text_csv"), { type: 'bar', data: { labels: ["break/#english-start/foundation", "break/#english-start/text", "break/#english-middle/foundation", "break/#english-middle/text", "break/#english-notfound/foundation", "break/#english-notfound/text"], datasets: [{ label: 'in ns', data: [18.0, 16.0, 101.0, 102.0, 372.0, 366.0], backgroundColor: ['rgba(255, 99, 132, 0.2)', 'rgba(54, 162, 235, 0.2)', 'rgba(255, 206, 86, 0.2)', 'rgba(75, 192, 192, 0.2)', 'rgba(153, 102, 255, 0.2)', 'rgba(255, 159, 64, 0.2)'], borderColor: ['rgba(255,99,132,1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)', 'rgba(153, 102, 255, 1)', 'rgba(255, 159, 64, 1)'], borderWidth: 1 }] }, options: { scales: { yAxes: [{ ticks: { beginAtZero: true } }] } } } );
new Chart(document.getElementById("benchs_text2_csv"), { type: 'bar', data: { labels: ["break/#english-start/foundation", "break/#english-start/text", "break/#english-middle/foundation", "break/#english-middle/text", "break/#english-notfound/foundation", "break/#english-notfound/text"], datasets: [{ label: 'in ns', data: [18.0, 16.0, 101.0, 102.0, 372.0, 366.0], backgroundColor: ['rgba(255, 99, 132, 0.2)', 'rgba(54, 162, 235, 0.2)', 'rgba(255, 206, 86, 0.2)', 'rgba(75, 192, 192, 0.2)', 'rgba(153, 102, 255, 0.2)', 'rgba(255, 159, 64, 0.2)'], borderColor: ['rgba(255,99,132,1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)', 'rgba(153, 102, 255, 1)', 'rgba(255, 159, 64, 1)'], borderWidth: 1 }] }, options: { scales: { yAxes: [{ ticks: { beginAtZero: true } }] } } } );
new Chart(document.getElementById("benchs_text_csv"), { type: 'bar', data: { labels: ["break/#english-start/foundation", "break/#english-start/text", "break/#english-middle/foundation", "break/#english-middle/text", "break/#english-notfound/foundation", "break/#english-notfound/text"], datasets: [{ label: 'in nanoseconds', data: [18.0, 16.0, 101.0, 102.0, 372.0, 366.0], backgroundColor: ['rgba(255, 99, 132, 0.2)', 'rgba(54, 162, 235, 0.2)', 'rgba(255, 206, 86, 0.2)', 'rgba(75, 192, 192, 0.2)', 'rgba(153, 102, 255, 0.2)', 'rgba(255, 159, 64, 0.2)'], borderColor: ['rgba(255,99,132,1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)', 'rgba(153, 102, 255, 1)', 'rgba(255, 159, 64, 1)'], borderWidth: 1 }] }, options: { scales: { yAxes: [{ ticks: { beginAtZero: true } }] } } } );
new Chart(document.getElementById("benchs_text2_csv"), { type: 'bar', data: { labels: ["break/#english-start/foundation", "break/#english-start/text", "break/#english-middle/foundation", "break/#english-middle/text", "break/#english-notfound/foundation", "break/#english-notfound/text"], datasets: [{ label: 'in nanoseconds', data: [18.0, 16.0, 101.0, 102.0, 372.0, 366.0], backgroundColor: ['rgba(255, 99, 132, 0.2)', 'rgba(54, 162, 235, 0.2)', 'rgba(255, 206, 86, 0.2)', 'rgba(75, 192, 192, 0.2)', 'rgba(153, 102, 255, 0.2)', 'rgba(255, 159, 64, 0.2)'], borderColor: ['rgba(255,99,132,1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)', 'rgba(153, 102, 255, 1)', 'rgba(255, 159, 64, 1)'], borderWidth: 1 }] }, options: { scales: { yAxes: [{ ticks: { beginAtZero: true } }] } } } );
});
</script>

Expand Down
121 changes: 113 additions & 8 deletions features.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
<meta name="description" content>
<meta name="author" content="haskell foundation">

<title>Features</title>
<!-- theme tweaked from https://blackrockdigital.github.io/startbootstrap-agency/ -->

<title>Home</title>

<!-- Bootstrap Core CSS -->
<link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
Expand Down Expand Up @@ -38,7 +40,7 @@
<body id="page-top" class="index">

<!-- Navigation -->
<nav id="mainNav" class="navbar navbar-default navbar-custom navbar-fixed-top">
<nav id="mainNav" class="navbar navbar-default navbar-custom navbar-fixed-top affix">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header page-scroll">
Expand All @@ -57,9 +59,11 @@
<li>
<a href="./features.html">Features</a>
</li>
<!--
<li>
<a href="./documentation.html">Documentation</a>
<a href="/documentation.html">Documentation</a>
</li>
-->
<li>
<a href="./bench.html">Benchmarks</a>
</li>
Expand All @@ -70,16 +74,117 @@
<!-- /.container-fluid -->
</nav>

<section>
<p>There’s too many features to list and I need to prepare to go to holidays, so that will wait.</p>
</section>

<!-- Header -->
<header>
<div class="container">
<div class="intro-lead-in"></div>
<div class="intro-heading">Features</div>
</div>
</header>

<section id="Types">
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading">Types</h2>
<h3 class="section-subheading text-muted">Collection of modern types, with a central API</h3>
</div>
</div>
<div class="row text-center">
<div class="col-md-6">
<span class="fa-stack fa-4x">
<i class="fa fa-circle fa-stack-2x text-primary"></i>
<i class="fa fa-wrench fa-stack-1x fa-inverse"></i>
</span>
<h4 class="service-heading">Diverse Types</h4>
<p class="text-muted">Unboxed vectors, Boxed vectors, Packed UTF8 String, Bitmap.</p>
</div>
<div class="col-md-6">
<span class="fa-stack fa-4x">
<i class="fa fa-circle fa-stack-2x text-primary"></i>
<i class="fa fa-gear fa-stack-1x fa-inverse"></i>
</span>
<h4 class="service-heading">API</h4>
<p class="text-muted">Polymorphic API working on many types similarly; let the types drive the implementation detail</p>
</div>
</div>
</div>
</section>

<section id="Numerical">
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading">Numerical</h2>
<h3 class="section-subheading text-muted">modernizing Haskell numbers</h3>
</div>
</div>
<div class="row text-center">
<div class="col-md-6">
<span class="fa-stack fa-4x">
<i class="fa fa-circle fa-stack-2x text-primary"></i>
<i class="fa fa-briefcase fa-stack-1x fa-inverse"></i>
</span>
<h4 class="service-heading">Better Classes</h4>
<p class="text-muted">No more hard-to-fit Num class, replaced by Additive, Subtractive, Multiplicative ...</p>
</div>
<div class="col-md-6">
<span class="fa-stack fa-4x">
<i class="fa fa-circle fa-stack-2x text-primary"></i>
<i class="fa fa-bar-chart fa-stack-1x fa-inverse"></i>
</span>
<h4 class="service-heading">More APIs</h4>
<p class="text-muted"></p>
</div>
</div>
</div>
</section>

<section id="SelfSuccient">
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading">Self Sufficient</h2>
<h3 class="section-subheading text-muted">No dependencies, better support, battery included</h3>
</div>
</div>
<div class="row text-center">
<div class="col-md-4">
<span class="fa-stack fa-4x">
<i class="fa fa-circle fa-stack-2x text-primary"></i>
<i class="fa fa-battery-full fa-stack-1x fa-inverse"></i>
</span>
<h4 class="service-heading">No dependencies</h4>
<p class="text-muted">Apart from Haskell base (and its core libraries like ghc-prim)</p>
</div>
<div class="col-md-4">
<span class="fa-stack fa-4x">
<i class="fa fa-circle fa-stack-2x text-primary"></i>
<i class="fa fa-cogs fa-stack-1x fa-inverse"></i>
</span>
<h4 class="service-heading">Easier to change</h4>
<p class="text-muted">A common place to fix bug and add feature</p>
</div>
<div class="col-md-4">
<span class="fa-stack fa-4x">
<i class="fa fa-circle fa-stack-2x text-primary"></i>
<i class="fa fa-eye fa-stack-1x fa-inverse"></i>
</span>
<h4 class="service-heading">Easier to track</h4>
<p class="text-muted">Simpler versioning for everyone, less independent bits to track</p>
</div>
</div>
</div>
</section>


<footer>
<div class="container">
<div class="row">
<hr>
<div class="col-md-8">
<span class="copyright">Copyright &copy; Foundation 2016 -- generated by <a href>hakyll</a></span>
<span class="copyright text-muted">Copyright &copy; <a href="https://github.com/haskell-foundation/">Haskell Foundation</a> 2016</span>
</div>
</div>
</div>
Expand All @@ -98,7 +203,7 @@
<script src="js/jqBootstrapValidation.js"></script>

<!-- Theme JavaScript -->
<script src="js/agency.min.js"></script>
<script src="js/agency.js"></script>



Expand Down
41 changes: 23 additions & 18 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<meta name="description" content>
<meta name="author" content="haskell foundation">

<!-- theme tweaked from https://blackrockdigital.github.io/startbootstrap-agency/ -->

<title>Home</title>

<!-- Bootstrap Core CSS -->
Expand Down Expand Up @@ -38,7 +40,7 @@
<body id="page-top" class="index">

<!-- Navigation -->
<nav id="mainNav" class="navbar navbar-default navbar-custom navbar-fixed-top">
<nav id="mainNav" class="navbar navbar-default navbar-custom navbar-fixed-top bignav">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header page-scroll">
Expand All @@ -57,9 +59,11 @@
<li>
<a href="./features.html">Features</a>
</li>
<!--
<li>
<a href="./documentation.html">Documentation</a>
<a href="/documentation.html">Documentation</a>
</li>
-->
<li>
<a href="./bench.html">Benchmarks</a>
</li>
Expand All @@ -75,9 +79,9 @@
<header>
<div class="container">
<div class="intro-text">
<div class="intro-lead-in">Foundation</div>
<div class="intro-heading">Haskell ++</div>
<a href="#services" class="page-scroll btn btn-xl">Tell Me More</a>
<div class="intro-lead-in">A new modern Haskell basis</div>
<div class="intro-heading">Foundation</div>
<a href="#goals" class="page-scroll btn btn-xl">Tell Me More</a>
</div>
</div>
</header>
Expand All @@ -87,45 +91,46 @@
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading">Goals</h2>
<h3 class="section-subheading text-muted">Lorem ipsum dolor sit amet consectetur.</h3>
<h3 class="section-subheading text-muted">A modern respin of Haskell base and other common libraries,
integrated in a common engineering effort.</h3>
</div>
</div>
<div class="row text-center">
<div class="col-md-4">
<span class="fa-stack fa-4x">
<i class="fa fa-circle fa-stack-2x text-primary"></i>
<i class="fa fa-shopping-cart fa-stack-1x fa-inverse"></i>
<i class="fa fa-briefcase fa-stack-1x fa-inverse"></i>
</span>
<h4 class="service-heading">Goal1</h4>
<p class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minima maxime quam architecto quo inventore harum ex magni, dicta impedit.</p>
<h4 class="service-heading">Framework</h4>
<p class="text-muted">More than just a library, providing an evolving toolkit to build libraries and programs efficiently.</p>
</div>
<div class="col-md-4">
<span class="fa-stack fa-4x">
<i class="fa fa-circle fa-stack-2x text-primary"></i>
<i class="fa fa-laptop fa-stack-1x fa-inverse"></i>
<i class="fa fa-bank fa-stack-1x fa-inverse"></i>
</span>
<h4 class="service-heading">Goal2</h4>
<p class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minima maxime quam architecto quo inventore harum ex magni, dicta impedit.</p>
<h4 class="service-heading">Foundational</h4>
<p class="text-muted">Focusing on solving practical issue, performance focus, and a foundation that anyone can build upon</p>
</div>
<div class="col-md-4">
<span class="fa-stack fa-4x">
<i class="fa fa-circle fa-stack-2x text-primary"></i>
<i class="fa fa-lock fa-stack-1x fa-inverse"></i>
<i class="fa fa-users fa-stack-1x fa-inverse"></i>
</span>
<h4 class="service-heading">Goal3</h4>
<p class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minima maxime quam architecto quo inventore harum ex magni, dicta impedit.</p>
<h4 class="service-heading">Together</h4>
<p class="text-muted">Openly design, community built, friendly environment</p>
</div>
</div>
</div>
</section>



<footer>
<div class="container">
<div class="row">
<hr>
<div class="col-md-8">
<span class="copyright">Copyright &copy; Foundation 2016 -- generated by <a href>hakyll</a></span>
<span class="copyright text-muted">Copyright &copy; <a href="https://github.com/haskell-foundation/">Haskell Foundation</a> 2016</span>
</div>
</div>
</div>
Expand All @@ -144,7 +149,7 @@ <h4 class="service-heading">Goal3</h4>
<script src="js/jqBootstrapValidation.js"></script>

<!-- Theme JavaScript -->
<script src="js/agency.min.js"></script>
<script src="js/agency.js"></script>



Expand Down
9 changes: 4 additions & 5 deletions js/agency.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@
});

// Offset for Main Navigation
$('#mainNav').affix({
offset: {
top: 100
}
})
var mainNav = $('#mainNav');
if (mainNav.attr("class").indexOf("bignav") !== -1) {
mainNav.affix({ offset: { top: 100 } });
}

})(jQuery); // End of use strict

0 comments on commit bbf4873

Please sign in to comment.