Skip to content

Commit 1f750f8

Browse files
heathermillerheathermiller
committed
Fixing a merge conflict
2 parents 930b327 + ae15d72 commit 1f750f8

File tree

7 files changed

+148
-6
lines changed

7 files changed

+148
-6
lines changed

‎2.9.1/glossary/index.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
layout: index
3+
title: Glossary
4+
---
5+
6+
This is the stuff!!
7+

‎2.9.1/overviews/index.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
layout: index
3+
title: Guides and Overviews
4+
---
5+
6+
This is the stuff!!
7+

‎2.9.1/tutorials/index.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
layout: index
3+
title: Tutorials
4+
---
5+
6+
This is the stuff!!
7+

‎_includes/frontpage-content.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
<img class="slide_thumb" alt="Thumbnail" src="{{ site.baseurl }}/resources/images/slide1.jpg" />
99
<p class="slide_title"><strong>Overviews and Guides</strong></p>
1010
<p class="slide_content">Collections, Actors, Swing, and more.</p>
11-
<p class="slide_button"><a href="#">Go there</a></p>
11+
<p class="slide_button"><a href="{{ site.baseurl}}/2.9.1/overviews">Go there</a></p>
1212
</li>
1313
<li>
1414
<img class="slide_thumb" alt="Thumbnail" src="{{ site.baseurl }}/resources/images/slide2.jpg" />
1515
<p class="slide_title"><strong>Tutorials</strong></p>
1616
<p class="slide_content">Coming from Java? Python? Ruby? Tutorials which help the transition from language XYZ to Scala.</p>
17-
<p class="slide_button"><a href="#">Go there</a></p>
17+
<p class="slide_button"><a href="{{ site.baseurl}}/2.9.1/tutorials">Go there</a></p>
1818
</li>
1919
<li>
2020
<img class="slide_thumb" alt="Thumbnail" src="{{ site.baseurl }}/resources/images/slide3.jpg" />
2121
<p class="slide_title"><strong>Glossary</strong></p>
2222
<p class="slide_content">Lost on some terminology? Check the glossary, direct from the book, <em>Programming in Scala</em>. </p>
23-
<p class="slide_button"><a href="#">Go there</a></p>
23+
<p class="slide_button"><a href="{{ site.baseurl}}/2.9.1/glossary">Go there</a></p>
2424
</li>
2525
</ul>
2626
</header>
@@ -37,13 +37,13 @@
3737
<h3><a href="{{ site.baseurl }}/sips">Scala Improvement Process</a> <span class="label success">Available</span></h3>
3838
<p>Read language improvement proposals, participate in discussions surrounding submitted proposals, or submit your own improvement proposal.</p>
3939

40-
<h3>Guides and Overviews <span class="label success">Some Available</span></h3>
40+
<h3><a href="{{ site.baseurl }}/2.9.1/overviews">Guides and Overviews</a> <span class="label success">Some Available</span></h3>
4141
<p>Some guides, such as Martin Odersky's Collections Overview are already available. Others are currently being converted to markdown markup for inclusion here.</p>
4242

43-
<h3>Tutorials <span class="label success">Some Available</span></h3>
43+
<h3><a href="{{ site.baseurl }}/2.9.1/tutorials">Tutorials</a> <span class="label success">Some Available</span></h3>
4444
<p>Some tutorials, such as the <em>Scala for Java Programmers</em> guide is already available. Others are currently being converted to markdown markup for inclusion here.</p>
4545

46-
<h3>Glossary <span class="label warning">Pending Permission</span></h3>
46+
<h3><a href="{{ site.baseurl }}/2.9.1/glossary">Glossary</a> <span class="label warning">Pending Permission</span></h3>
4747
<p>Pending permission from Artima Inc., we'd like to include the glossary from <em>Programming in Scala</em> here, for quick and easy reference.</p>
4848

4949
<h3>Cheatsheets <span class="label important">In Progress</span></h3>

‎_includes/index-header.txt

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
5+
<title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title>
6+
{% if page.description %}
7+
<meta name="description" content="{{ page.description }}" />
8+
{% endif %}
9+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
10+
11+
<link rel="icon" type="image/png" href="{{ site.baseurl }}/resources/favicon.ico">
12+
13+
<!-- prettify js and CSS -->
14+
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/prettify.css" type="text/css" />
15+
<script src="{{ site.baseurl }}/resources/javascript/prettify/prettify.js" type="text/javascript" ></script>
16+
17+
<!-- jquery js -->
18+
<script src="{{ site.baseurl }}/resources/javascript/jquery.js" type="text/javascript" ></script>
19+
20+
<!-- Bootstrap JS and CSS -->
21+
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/bootstrap.css" type="text/css" />
22+
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown.js" type="text/javascript" ></script>
23+
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown-app.js" type="text/javascript" ></script>
24+
25+
<!-- You may want to change the paths below, according to your own CSS and JavaScript setup -->
26+
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/resources/stylesheets/frontpage.css" />
27+
<script type="text/javascript" src="{{ site.baseurl }}/resources/javascript/jquery.js"></script>
28+
<script type="text/javascript" src="{{ site.baseurl }}/resources/javascript/jquery.easing.js"></script>
29+
<script type="text/javascript" src="{{ site.baseurl }}/resources/javascript/jquery.accordionza.js"></script>
30+
<script src="{{ site.baseurl }}/resources/javascript/frontpage.js" type="text/javascript" ></script>
31+
32+
<!-- prettyprint js to prepend generated pre/code tags -->
33+
<script type="text/javascript">
34+
function styleCode()
35+
{
36+
if (typeof disableStyleCode != "undefined")
37+
{
38+
return;
39+
}
40+
var a = false;
41+
$("pre code").parent().each(function()
42+
{
43+
if (!$(this).hasClass("prettyprint"))
44+
{
45+
$(this).addClass("prettyprint lang-scala linenums");
46+
a = true
47+
}
48+
});
49+
if (a) { prettyPrint() }
50+
}
51+
</script>
52+
53+
<style type="text/css">
54+
html, body {
55+
padding-top: 36px;
56+
height: 100%;
57+
background:url({{ site.baseurl }}/resources/images/bg-short.jpg) no-repeat top center #310808;
58+
-webkit-box-shadow: inset 0 10px 50px rgba(0,0,0,.6);
59+
-moz-box-shadow: inset 0 10px 50px rgba(0,0,0,.6);
60+
/* box-shadow: inset 0 10px 30px rgba(0,0,0,.3);*/
61+
}
62+
.scrollingmenu {
63+
width: 940px;
64+
margin-left: auto;
65+
margin-right: auto;
66+
height: 70px;
67+
zoom: 1;
68+
}
69+
.scrollingmenu h2 {
70+
padding-bottom: 30px;
71+
color: #ffffff;
72+
font-size: 42px;
73+
line-height: 1;
74+
text-shadow: 0 1px 2px rgba(0,0,0,.5);
75+
}
76+
.bottom {
77+
height: 100%;
78+
background-color: #bcbcbc;
79+
padding-top: 20px;
80+
border-top: 1px solid #8e397d;
81+
}
82+
.bottom h1,h2,h3 {
83+
text-shadow: 0 1px 2px rgba(255,255,255,.5);
84+
}
85+
.bottom h1,h2,h3 a {
86+
color: #404040;
87+
text-shadow: 0 1px 2px rgba(255,255,255,.5);
88+
}
89+
90+
91+
</style>
92+
93+
</head>
94+
<body>

‎_layouts/index.html

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
layout: default
3+
---
4+
5+
{% include index-header.txt %}
6+
{% include topbar.txt %}
7+
8+
<header class="scrollingmenu">
9+
<h2>{{ page.title }}</h2>
10+
</header>
11+
12+
<div class="bottom">
13+
<div class="container">
14+
<div class="row">
15+
16+
<div class="span8">
17+
{{ content }}
18+
</div>
19+
<div class="span8">
20+
Right sidebar.
21+
</div>
22+
23+
</div>
24+
</div>
25+
</div>
26+
27+
{% include frontpage-footer.txt %}

‎resources/images/bg-short.jpg

23.3 KB
Loading

0 commit comments

Comments
 (0)