Skip to content

Commit 1fff7dd

Browse files
committed
Merge pull request #153 from Debilski/typography
Enhancing the typography on frontpage.html
2 parents 74e89d2 + cd2f19b commit 1fff7dd

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

_layouts/frontpage.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ <h3>Seamless Java Interop</h3>
8080
</div>
8181
<div class="span4 bullet-point">
8282
<h3>Type Inference</h3>
83-
<p>So the type system doesn't feel so static.</p>
83+
<p>So the type system doesnt feel so static.</p>
8484
</div>
8585
<div class="span4 bullet-point">
8686
<h3>Parallelism/Distribution</h3>
@@ -94,7 +94,7 @@ <h3>Traits</h3>
9494
</div>
9595
<div class="span4 bullet-point">
9696
<h3>Pattern Matching</h3>
97-
<p>Think "switch" on steroids. Match against class hierarchies, sequences, and more.</p>
97+
<p>Think switch on steroids. Match against class hierarchies, sequences, and more.</p>
9898
</div>
9999
<div class="span4 bullet-point">
100100
<h3>Higher-Order Functions</h3>
@@ -117,7 +117,7 @@ <h2><span>Scala in Action</span></h2>
117117
<div class="container">
118118
<div class="carousel-caption">
119119
<h1>Concise and powerful. Higher-order functions on collections.</h1>
120-
<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>
120+
<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>
121121
<img src="{{ site.baseurl }}/resources/img/hof-code.png"/>
122122
</div>
123123
</div>
@@ -127,7 +127,7 @@ <h1>Concise and powerful. Higher-order functions on collections.</h1>
127127
<div class="container">
128128
<div class="carousel-caption">
129129
<h1 style="margin-left: 20px">Pattern matching.</h1>
130-
<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)".
130+
<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).
131131
</p>
132132
<img src="{{ site.baseurl }}/resources/img/patmat-code.png" style="float: right; margin-top: -36px;"/>
133133
</div>
@@ -138,7 +138,7 @@ <h1 style="margin-left: 20px">Pattern matching.</h1>
138138
<div class="container">
139139
<div class="carousel-caption">
140140
<h1 style="margin-left: 20px">Type Inference, Class Parameters, and String Interpolation.</h1>
141-
<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".
141+
<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.
142142
</p>
143143
<img src="{{ site.baseurl }}/resources/img/type-inf-code.png" style="float: right; margin-top: -36px;"/>
144144
</div>
@@ -159,7 +159,7 @@ <h1 style="margin-left: 20px">Type Inference, Class Parameters, and String Inter
159159
<div class="row">
160160
<div class="span12 happening">
161161
<p>&nbsp;</p><p>&nbsp;</p>
162-
<h2><span>What's going on with Scala</span></h2>
162+
<h2><span>Whats going on with Scala</span></h2>
163163
<p>&nbsp;</p>
164164
</div>
165165
</div>

_layouts/frontpage2.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ <h3>Seamless Java Interop</h3>
8585
</div>
8686
<div class="span4 bullet-point" id="type-inference">
8787
<h3>Type Inference</h3>
88-
<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>
88+
<p>So the type system doesnt feel so static. Dont work for the type system. Let the type system work for you!</p>
8989
</div>
9090
<div class="span4 bullet-point" id="concurrency-distribution">
9191
<h3>Concurrency<br>& Distribution</h3>
@@ -112,7 +112,7 @@ <h3>Traits</h3>
112112
</div>
113113
<div class="span4 bullet-point" id="pattern-matching">
114114
<h3>Pattern Matching</h3>
115-
<p>Think "switch" on steroids. Match against class hierarchies, sequences, and more.</p>
115+
<p>Think switch on steroids. Match against class hierarchies, sequences, and more.</p>
116116
</div>
117117
<div class="span4 bullet-point" id="higher-order-functions">
118118
<h3>Higher-Order Functions</h3>

0 commit comments

Comments
 (0)