Skip to content

Enhancing the typography on frontpage.html #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 13, 2014
Merged

Enhancing the typography on frontpage.html #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions _layouts/frontpage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ <h3>Seamless Java Interop</h3>
</div>
<div class="span4 bullet-point">
<h3>Type Inference</h3>
<p>So the type system doesn't feel so static.</p>
<p>So the type system doesn’t feel so static.</p>
</div>
<div class="span4 bullet-point">
<h3>Parallelism/Distribution</h3>
Expand All @@ -94,7 +94,7 @@ <h3>Traits</h3>
</div>
<div class="span4 bullet-point">
<h3>Pattern Matching</h3>
<p>Think "switch" on steroids. Match against class hierarchies, sequences, and more.</p>
<p>Think “switch” on steroids. Match against class hierarchies, sequences, and more.</p>
</div>
<div class="span4 bullet-point">
<h3>Higher-Order Functions</h3>
Expand All @@ -117,7 +117,7 @@ <h2><span>Scala in Action</span></h2>
<div class="container">
<div class="carousel-caption">
<h1>Concise and powerful. Higher-order functions on collections.</h1>
<p class="lead">Invoke the higher-order method "partition", which takes a predicate (a function returning a Boolean) as its sole argument, using infix syntax. The two components of the result pair are assigned simultaneously to two new local variables using a tuple pattern. No need for clunky intermediate collections and for-loops.</p>
<p class="lead">Invoke the higher-order method “partition”, which takes a predicate (a function returning a Boolean) as its sole argument, using infix syntax. The two components of the result pair are assigned simultaneously to two new local variables using a tuple pattern. No need for clunky intermediate collections and for-loops.</p>
<img src="{{ site.baseurl }}/resources/img/hof-code.png"/>
</div>
</div>
Expand All @@ -127,7 +127,7 @@ <h1>Concise and powerful. Higher-order functions on collections.</h1>
<div class="container">
<div class="carousel-caption">
<h1 style="margin-left: 20px">Pattern matching.</h1>
<p class="lead" style="float: left; width: 320px; margin-left: 20px;">Enable pattern matching on classes and singleton objects using the case modifier. Match against trees, extracting its fields using variables in a pattern like "Binary(e, l, r)".
<p class="lead" style="float: left; width: 320px; margin-left: 20px;">Enable pattern matching on classes and singleton objects using the case modifier. Match against trees, extracting its fields using variables in a pattern like “Binary(e, l, r)”.
</p>
<img src="{{ site.baseurl }}/resources/img/patmat-code.png" style="float: right; margin-top: -36px;"/>
</div>
Expand All @@ -138,7 +138,7 @@ <h1 style="margin-left: 20px">Pattern matching.</h1>
<div class="container">
<div class="carousel-caption">
<h1 style="margin-left: 20px">Type Inference, Class Parameters, and String Interpolation.</h1>
<p class="lead" style="float: left; width: 320px; margin-left: 20px;">The type "List[Int]" of "l" is inferred automatically. The primary constructor of class "Person" assigns its arguments to public fields "name" and "age".
<p class="lead" style="float: left; width: 320px; margin-left: 20px;">The type “List[Int]” of “l” is inferred automatically. The primary constructor of class “Person” assigns its arguments to public fields “name” and “age”.
</p>
<img src="{{ site.baseurl }}/resources/img/type-inf-code.png" style="float: right; margin-top: -36px;"/>
</div>
Expand All @@ -159,7 +159,7 @@ <h1 style="margin-left: 20px">Type Inference, Class Parameters, and String Inter
<div class="row">
<div class="span12 happening">
<p>&nbsp;</p><p>&nbsp;</p>
<h2><span>What's going on with Scala</span></h2>
<h2><span>What’s going on with Scala</span></h2>
<p>&nbsp;</p>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions _layouts/frontpage2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ <h3>Seamless Java Interop</h3>
</div>
<div class="span4 bullet-point" id="type-inference">
<h3>Type Inference</h3>
<p>So the type system doesn't feel so static. Don't work for the type system. Let the type system work for you!</p>
<p>So the type system doesn’t feel so static. Don’t work for the type system. Let the type system work for you!</p>
</div>
<div class="span4 bullet-point" id="concurrency-distribution">
<h3>Concurrency<br>& Distribution</h3>
Expand All @@ -112,7 +112,7 @@ <h3>Traits</h3>
</div>
<div class="span4 bullet-point" id="pattern-matching">
<h3>Pattern Matching</h3>
<p>Think "switch" on steroids. Match against class hierarchies, sequences, and more.</p>
<p>Think “switch” on steroids. Match against class hierarchies, sequences, and more.</p>
</div>
<div class="span4 bullet-point" id="higher-order-functions">
<h3>Higher-Order Functions</h3>
Expand Down