Commitdc59f29

committed

fixing merge conflicts

2 parents2476e68 +91dd7ff commitdc59f29Copy full SHA for dc59f29

File tree

10 files changed

+53

-269

lines changed

_includes
- header.txt
_layouts
- overview-large.html
overviews
- core/_posts
  - 2012-09-20-futures.md
  - 2012-10-8-macros.md
- parallel-collections
  - architecture.md
- reflection
style
- scaladoc.md

10 files changed

+53

-269

lines changed

`‎_includes/header.txt`

Lines changed: 21 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`<html>`
`3`	`3`	`<head>`
`4`	`4`
`5`		`- <title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title>`
	`5`	`+ <title>{% if page.partof %}{{ page.partof \| replace: '-',' ' \| split:" " \| capitalize \| join:" " }} - {% endif %}{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title>`
`6`	`6`	`{% if page.description %}`
`7`	`7`	`<meta name="description" content="{{ page.description }}" />`
`8`	`8`	`{% endif %}`
`@@ -24,7 +24,7 @@`
`24`	`24`	`<!-- Bootstrap JS and CSS -->`
`25`	`25`	`<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/bootstrap.css" type="text/css" />`
`26`	`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>`
	`27`	`+<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown-app.js" type="text/javascript" ></script>`
`28`	`28`
`29`	`29`	`<!-- Base stylesheet for all pages -->`
`30`	`30`	`<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/base.css" type="text/css" />`
`@@ -49,29 +49,29 @@`
`49`	`49`
`50`	`50`	`<!-- prettyprint js to prepend generated pre/code tags -->`
`51`	`51`	`<script type="text/javascript">`
`52`		`- function styleCode()`
	`52`	`+ function styleCode()`
`53`	`53`	`{`
`54`		`- if (typeof disableStyleCode != "undefined")`
	`54`	`+ if (typeof disableStyleCode != "undefined")`
`55`	`55`	`{`
`56`	`56`	`return;`
`57`	`57`	`}`
`58`	`58`	`var a = false;`
`59`		`- $("pre code").parent().each(function()`
	`59`	`+ $("pre code").parent().each(function()`
`60`	`60`	`{`
`61`		`- if (!$(this).hasClass("prettyprint"))`
	`61`	`+ if (!$(this).hasClass("prettyprint"))`
`62`	`62`	`{`
`63`	`63`	`$(this).addClass("prettyprint lang-scala linenums");`
`64`	`64`	`a = true`
`65`	`65`	`}`
`66`	`66`	`});`
`67`		`- if (a) { prettyPrint() }`
	`67`	`+ if (a) { prettyPrint() }`
`68`	`68`	`}`
`69`	`69`	`</script>`
`70`	`70`
`71`	`71`	`<script type="text/javascript">`
`72`	`72`	`jQuery(document).ready(function($) {`
`73`		`-`
`74`		`- $(".scroll").click(function(event){`
	`73`	`+`
	`74`	`+ $(".scroll").click(function(event){`
`75`	`75`	`event.preventDefault();`
`76`	`76`	`$('html,body').animate({scrollTop:$(this.hash).offset().top}, 500);`
`77`	`77`	`$('html,body').animate({scrollTop:$(this.hash).offset().top-=50}, 500);`
`@@ -82,11 +82,11 @@`
`82`	`82`
`83`	`83`	`<script type="text/javascript">`
`84`	`84`	`$(window).ready(function goToSubsection() {`
`85`		`- if (window.location.hash)`
	`85`	`+ if (window.location.hash)`
`86`	`86`	`{`
`87`	`87`	`$('html,body').animate({scrollTop:$(window.location.hash).offset().top}, 500);`
`88`	`88`	`$('html,body').animate({scrollTop:$(window.location.hash).offset().top-=50}, 500);`
`89`		`- $(window.location.hash).effect("highlight", {color: "#FFCC85"}, 3000);`
	`89`	`+ $(window.location.hash).effect("highlight", {color: "#FFCC85"}, 3000);`
`90`	`90`	`}`
`91`	`91`	`});`
`92`	`92`	`</script>`
`@@ -134,9 +134,18 @@`
`134`	`134`	`width: inherit;`
`135`	`135`	`}`
`136`	`136`
	`137`	`+ div#guide-title {`
	`138`	`+ text-transform: capitalize;`
	`139`	`+ font-size: 16px;`
	`140`	`+ padding-bottom: 6px;`
	`141`	`+ color: #BFBFBF;`
	`142`	`+ text-transform: uppercase;`
	`143`	`+ font-weight: bold;`
	`144`	`+ }`
	`145`	`+`
`137`	`146`	`input, textarea, select, .uneditable-input {`
`138`	`147`	`width: 165px;`
`139`		`- }`
	`148`	`+}`
`140`	`149`
`141`	`150`	`</style>`
`142`	`151`

`‎_layouts/overview-large.html`

Lines changed: 9 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,10 @@`
`6`	`6`
`7`	`7`	`<divclass="container">`
`8`	`8`	`<divclass="row">`
`9`		`-`
	`9`	`+`
	`10`	`+ {% if page.partof %}<divclass="span10"><divid="guide-title">{{ page.partof \| replace: '-',' ' }}</div></div>{% endif %}`
`10`	`11`	`<divclass="span10">{% if page.title %}<h1>{{ page.title }}</h1>{% else %}<h1>{{ site.title }}</h1>{% endif %}</div>`
`11`		`-`
	`12`	`+`
`12`	`13`	`{% for pg in site.pages %}`
`13`	`14`	`{% if pg.partof == page.partof and pg.languages %}`
`14`	`15`	`{% assign languages = pg.languages %}`
`@@ -24,9 +25,9 @@`
`24`	`25`
`25`	`26`	`<divclass="span6">`
`26`	`27`	`{% if languages %}`
`27`		`-<ahref="{{ site.baseurl }}{{ rootTutorialURL }}"><imgsrc="{{ site.baseurl }}/resources/images/language/en.png"title="Language: en"/></a>`
	`28`	`+<ahref="{{ site.baseurl }}{{ rootTutorialURL }}"><imgsrc="{{ site.baseurl }}/resources/images/language/en.png"title="Language: en"/></a>`
`28`	`29`	`{% for l in languages %}`
`29`		`-<ahref="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}"><imgsrc="{{ site.baseurl }}/resources/images/language/{{ l }}.png"title="Language: {{ l }}"/></a>`
	`30`	`+<ahref="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}"><imgsrc="{{ site.baseurl }}/resources/images/language/{{ l }}.png"title="Language: {{ l }}"/></a>`
`30`	`31`	`{% endfor %}`
`31`	`32`	`{% endif %}`
`32`	`33`	`</div>`
`@@ -35,13 +36,13 @@`
`35`	`36`	`{{ content }}`
`36`	`37`	`{% if page.disqus == true %}{% include disqus.txt %}{% endif %}`
`37`	`38`	`</div>`
`38`		`-`
	`39`	`+`
`39`	`40`	`<divclass="span6">`
`40`	`41`	`{% include toc-large.txt %}`
`41`	`42`	`</div>`
`42`		`-`
`43`		`-`
	`43`	`+`
	`44`	`+`
`44`	`45`	`</div>`
`45`	`46`	`</div>`
`46`	`47`
`47`		`-{% include footer.txt %}`
	`48`	`+{% include footer.txt %}`

`‎overviews/core/_posts/2012-09-20-futures.md`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,7 @@ the exception from this future, as in the following example which`
`524`	`524`	`tries to print US dollar value, but prints the Swiss franc value in`
`525`	`525`	`the case it fails to obtain the dollar value:`
`526`	`526`
`527`		`-val usdQuote = future {`
	`527`	`+val usdQuote = future {`
`528`	`528`	`connection.getCurrentValue(USD)`
`529`	`529`	`} map {`
`530`	`530`	`usd => "Value: " + usd + "$"`
`@@ -544,7 +544,7 @@ the result of this future or the argument future, whichever completes`
`544`	`544`	`first, irregardless of success or failure. Here is an example in which`
`545`	`545`	`the quote which is returned first gets printed:`
`546`	`546`
`547`		`-val usdQuote = future {`
	`547`	`+val usdQuote = future {`
`548`	`548`	`connection.getCurrentValue(USD)`
`549`	`549`	`} map {`
`550`	`550`	`usd => "Value: " + usd + "$"`
`@@ -571,7 +571,7 @@ and then renders all the posts to the screen:`
`571`	`571`
`572`	`572`	`val allposts = mutable.Set[String]()`
`573`	`573`
`574`		`-future {`
	`574`	`+future {`
`575`	`575`	`session.getRecentPosts`
`576`	`576`	`} andThen {`
`577`	`577`	`posts => allposts ++= posts`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitdc59f29

File tree

10 files changed

10 files changed

`‎_includes/header.txt`

`‎_layouts/overview-large.html`

`‎overviews/core/_posts/2012-09-20-futures.md`

0 commit comments