Skip to content

Commit 010170c

Browse files
heathermillerheathermiller
committed
Progress on front page, and navigation.
1 parent 77ffd5a commit 010170c

24 files changed

+1024
-42
lines changed

‎_includes/frontpage-content.txt

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
2+
<header class="scrollingmenu">
3+
<!--<h2>Here is some type of meaningful headline.</h2>-->
4+
<h2>Community-driven documentation for Scala.</h2>
5+
6+
<ul id="accordion2">
7+
<li>
8+
<img class="slide_thumb" alt="Thumbnail" src="{{ site.baseurl }}/resources/images/slide1.jpg" />
9+
<p class="slide_title"><strong>Overviews and Guides</strong></p>
10+
<p class="slide_content">Collections, Actors, Swing, and more.</p>
11+
<p class="slide_button"><a href="#">Go there</a></p>
12+
</li>
13+
<li>
14+
<img class="slide_thumb" alt="Thumbnail" src="{{ site.baseurl }}/resources/images/slide2.jpg" />
15+
<p class="slide_title"><strong>Tutorials</strong></p>
16+
<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>
18+
</li>
19+
<li>
20+
<img class="slide_thumb" alt="Thumbnail" src="{{ site.baseurl }}/resources/images/slide3.jpg" />
21+
<p class="slide_title"><strong>Glossary</strong></p>
22+
<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>
24+
</li>
25+
</ul>
26+
</header>
27+
28+
<div class="bottom">
29+
<div class="container">
30+
<div class="row">
31+
32+
<div class="span8">
33+
"Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?"
34+
</div>
35+
<div class="span8">
36+
"Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?"
37+
</div>
38+
39+
</div>
40+
</div>
41+
</div>
42+
43+

‎_includes/frontpage-footer.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
</body>
2+
</html>
3+

‎_includes/frontpage-header.txt

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
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.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: 280px;
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: 30px;
80+
border-top: 1px solid #8e397d;
81+
}
82+
</style>
83+
84+
</head>
85+
<body>

‎_includes/header.txt

+6-3
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,22 @@
1010

1111
<link rel="icon" type="image/png" href="{{ site.baseurl }}/resources/favicon.ico">
1212

13-
<!-- Bootstrap CSS -->
14-
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/bootstrap.css" type="text/css" />
15-
1613
<!-- prettify js and CSS -->
1714
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/prettify.css" type="text/css" />
1815
<script src="{{ site.baseurl }}/resources/javascript/prettify/prettify.js" type="text/javascript" ></script>
1916

17+
2018
<!-- jquery js -->
2119
<script src="{{ site.baseurl }}/resources/javascript/jquery.js" type="text/javascript" ></script>
2220
<script src="{{ site.baseurl }}/resources/javascript/effects.core.js" type="text/javascript" ></script>
2321
<script src="{{ site.baseurl }}/resources/javascript/effects.highlight.js" type="text/javascript" ></script>
2422
<script src="{{ site.baseurl }}/resources/javascript/moveScroller.js" type="text/javascript" ></script>
2523

24+
<!-- Bootstrap JS and CSS -->
25+
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/bootstrap.css" type="text/css" />
26+
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown.js" type="text/javascript" ></script>
27+
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown-app.js" type="text/javascript" ></script>
28+
2629
<!-- table of contents js -->
2730
<script src="{{ site.baseurl }}/resources/javascript/toc.js" type="text/javascript" ></script>
2831

‎_includes/topbar.txt

+25-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,31 @@
11
<!-- Topbar
22
================================================== -->
3-
<div class="topbar" >
4-
<div class="topbar-inner">
3+
<div class="topbar">
4+
<div class="topbar-inner">
55
<div class="container">
6-
<a class="brand" href="{{ site.baseurl }}/index.html"><img src="{{ site.baseurl }}/resources/images/scala-logo.png"> Documentation</a>
7-
<ul class="nav">
8-
<li class="active"><a href="#overview">Empty</a></li>
9-
<li><a href="#grid-system">Empty</a></li>
10-
<li><a href="#layouts">Empty</a></li>
6+
<a class="brand" href="{{ site.baseurl }}/index.html"><img src="{{ site.baseurl }}/resources/images/scala-logo.png"> Documentation</a>
7+
<ul class="nav">
8+
9+
<li class="menu">
10+
<a href="#" class="menu">API</a>
11+
<ul class="menu-dropdown">
12+
<li><a href="http://www.scala-lang.org/api/current/">Current</a></li>
13+
<li><a href="http://www.scala-lang.org/archives/downloads/distrib/files/nightly/docs/library/index.html">Nightly</a></li>
14+
<li class="divider"></li>
15+
<li><a href="#">Previous Versions</a></li>
16+
</ul>
17+
</li>
18+
19+
<li><a href="#">Guides</a></li>
20+
<li><a href="#">Tutorials</a></li>
21+
<li><a href="#">Glossary</a></li>
22+
<li><a href="#">Cheatsheets</a></li>
23+
</ul>
24+
<form action="">
25+
<input type="text" placeholder="Search" />
26+
</form>
27+
</li>
1128
</ul>
1229
</div>
13-
</div>
1430
</div>
31+
</div>

‎_layouts/default.html

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
{% include header.txt %}
21

3-
{{ content }}
4-
5-
{% include footer.txt %}
2+
{{ content }}

‎_layouts/front-page.html

-15
This file was deleted.

‎_layouts/frontpage.html

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
layout: default
3+
---
4+
5+
{% include frontpage-header.txt %}
6+
{% include topbar.txt %}
7+
8+
{% include frontpage-content.txt %}
9+
10+
{% include frontpage-footer.txt %}

‎_layouts/overview.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
22
layout: default
33
---
4-
4+
{% include header.txt %}
55
{% include topbar.txt %}
6+
67
<div class="container">
78
<div class="row">
89

@@ -27,3 +28,4 @@ <h1>{{ site.title }}</h1>
2728
</div>
2829
</div>
2930

31+
{% include footer.txt %}

‎_layouts/sip.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
22
layout: default
33
---
4-
4+
{% include header.txt %}
55
{% include sips-topbar.txt %}
6+
67
<div class="container">
78
<div class="row">
89

@@ -22,3 +23,4 @@ <h1>{{ site.title }}</h1>
2223
</div>
2324
</div>
2425

26+
{% include footer.txt %}

‎index.md

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
---
2-
layout: front-page
2+
layout: frontpage
33
title: Scala Documentation
44
---
5-
6-
## Welcome ##
7-
8-
Documentation will be added here as we acquire and organize old and new documents.
9-
10-
## SIPs ##
11-
12-
Check out the [SIP documents](sips.new/index.html)
13-

‎resources/images/bg.jpg

60.8 KB
Loading

‎resources/images/frontpage-bg.png

1.41 KB
Loading

‎resources/images/slide-bg.jpg

1.54 KB
Loading

‎resources/images/slide1.jpg

3.79 KB
Loading

‎resources/images/slide2.jpg

4.63 KB
Loading

‎resources/images/slide3.jpg

4.32 KB
Loading

‎resources/javascript/bootstrap-dropdown-app.js

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
$(document).ready(function(){
2+
$("body").bind("click", function (e) {
3+
$('a.menu').parent("li").removeClass("open");
4+
});
5+
6+
$("a.menu").click(function (e) {
7+
var $li = $(this).parent("li").toggleClass('open');
8+
return false;
9+
});
10+
});

‎resources/javascript/bootstrap-dropdown.js

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
/* ============================================================
2+
* bootstrap-dropdown.js v1.3.0
3+
* http://twitter.github.com/bootstrap/javascript.html#dropdown
4+
* ============================================================
5+
* Copyright 2011 Twitter, Inc.
6+
*
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* ============================================================ */
19+
20+
21+
!function( $ ){
22+
23+
/* DROPDOWN PLUGIN DEFINITION
24+
* ========================== */
25+
26+
$.fn.dropdown = function ( selector ) {
27+
return this.each(function () {
28+
$(this).delegate(selector || d, 'click', function (e) {
29+
var li = $(this).parent('li')
30+
, isActive = li.hasClass('open')
31+
32+
clearMenus()
33+
!isActive && li.toggleClass('open')
34+
return false
35+
})
36+
})
37+
}
38+
39+
/* APPLY TO STANDARD DROPDOWN ELEMENTS
40+
* =================================== */
41+
42+
var d = 'a.menu, .dropdown-toggle'
43+
44+
function clearMenus() {
45+
$(d).parent('li').removeClass('open')
46+
}
47+
48+
$(function () {
49+
$('html').bind("click", clearMenus)
50+
$('body').dropdown( '[data-dropdown] a.menu, [data-dropdown] .dropdown-toggle' )
51+
})
52+
53+
}( window.jQuery || window.ender );

‎resources/javascript/frontpage.js

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
$(document).ready(function() {
2+
3+
// Accordion Demo #2
4+
$('#accordion2').accordionza({
5+
autoPlay: true,
6+
autoRestartDelay: 4500,
7+
onSlideClose: function() {
8+
this.children('p').stop(true).animate({left: 470, opacity: 0}, 500);
9+
},
10+
onSlideOpen: function() {
11+
var properties = {left: 100, opacity: 1};
12+
var duration = 250;
13+
var easing = 'easeOutBack';
14+
this.children('p').stop(true)
15+
.filter(':eq(0)').animate({opacity: 0}, 000).animate(properties, duration, easing).end()
16+
.filter(':eq(1)').animate({opacity: 0}, 000).animate(properties, duration, easing).end()
17+
.filter(':eq(2)').animate({opacity: 0}, 000).animate(properties, duration, easing);
18+
},
19+
slideDelay: 3000,
20+
slideEasing: 'easeOutCirc',
21+
slideSpeed: 250,
22+
slideTrigger: 'mouseover',
23+
slideWidthClosed: 60
24+
});
25+
26+
});

0 commit comments

Comments
 (0)