8000 fixing merge conflicts · stephendrew/scala.github.com@dc59f29 · GitHub
[go: up one dir, main page]
Skip to content

Commit dc59f29

Browse files
heathermillerheathermiller
committed
fixing merge conflicts
2 parents 2476e68 + 91dd7ff commit dc59f29

File tree

10 files changed

+53
-269
lines changed
  • reflection
  • style

    • 10 files changed

    +53
    -269
    lines changed

    ‎_includes/header.txt

    Lines changed: 21 additions & 12 deletions
    Original file line numberDiff line numberDiff line change
    @@ -2,7 +2,7 @@
    22
    <html>
    33
    <head>
    44

    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>
    66
    {% if page.description %}
    77
    <meta name="description" content="{{ page.description }}" />
    88
    {% endif %}
    @@ -24,7 +24,7 @@
    2424
    <!-- Bootstrap JS and CSS -->
    2525
    <link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/bootstrap.css" type="text/css" />
    2626
    <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>
    2828

    2929
    <!-- Base stylesheet for all pages -->
    3030
    <link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/base.css" type="text/css" />
    @@ -49,29 +49,29 @@
    4949

    5050
    <!-- prettyprint js to prepend generated pre/code tags -->
    5151
    <script type="text/javascript">
    52-
    function styleCode()
    52+
    function styleCode()
    5353
    {
    54-
    if (typeof disableStyleCode != "undefined")
    54+
    if (typeof disableStyleCode != "undefined")
    5555
    {
    5656
    return;
    5757
    }
    5858
    var a = false;
    59-
    $("pre code").parent().each(function()
    59+
    $("pre code").parent().each(function()
    6060
    {
    61-
    if (!$(this).hasClass("prettyprint"))
    61+
    if (!$(this).hasClass("prettyprint"))
    6262
    {
    6363
    $(this).addClass("prettyprint lang-scala linenums");
    6464
    a = true
    6565
    }
    6666
    });
    67-
    if (a) { prettyPrint() }
    67+
    if (a) { prettyPrint() }
    6868
    }
    6969
    </script>
    7070

    7171
    <script type="text/javascript">
    7272
    jQuery(document).ready(function($) {
    73-
    74-
    $(".scroll").click(function(event){
    73+
    74+
    $(".scroll").click(function(event){
    7575
    event.preventDefault();
    7676
    $('html,body').animate({scrollTop:$(this.hash).offset().top}, 500);
    7777
    $('html,body').animate({scrollTop:$(this.hash).offset().top-=50}, 500);
    @@ -82,11 +82,11 @@
    8282

    8383
    <script type="text/javascript">
    8484
    $(window).ready(function goToSubsection() {
    85-
    if (window.location.hash)
    85+
    if (window.location.hash)
    8686
    {
    8787
    $('html,body').animate({scrollTop:$(window.location.hash).offset().top}, 500);
    8888
    $('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);
    9090
    }
    9191
    });
    9292
    </script>
    @@ -134,9 +134,18 @@
    134134
    width: inherit;
    135135
    }
    136136

    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+
    137146
    input, textarea, select, .uneditable-input {
    138147
    width: 165px;
    139-
    }
    148+
    }
    140149

    141150
    </style>
    142151

    ‎_layouts/overview-large.html

    Lines changed: 9 additions & 8 deletions
    Original file line numberDiff line numberDiff line change
    @@ -6,9 +6,10 @@
    66

    77
    << 6D40 span class=pl-ent>div class="container">
    88
    <div class="row">
    9-
    9+
    10+
    {% if page.partof %}<div class="span10"><div id="guide-title">{{ page.partof | replace: '-',' ' }}</div></div>{% endif %}
    1011
    <div class="span10">{% if page.title %}<h1>{{ page.title }}</h1>{% else %}<h1>{{ site.title }}</h1>{% endif %}</div>
    11-
    12+
    1213
    {% for pg in site.pages %}
    1314
    {% if pg.partof == page.partof and pg.languages %}
    1415
    {% assign languages = pg.languages %}
    @@ -24,9 +25,9 @@
    2425

    2526
    <div class="span6">
    2627
    {% if languages %}
    27-
    <a href="{{ site.baseurl }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/en.png" title="Language: en"/></a>
    28+
    <a href="{{ site.baseurl }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/en.png" title="Language: en"/></a>
    2829
    {% for l in languages %}
    29-
    <a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/{{ l }}.png" title="Language: {{ l }}"/></a>
    30+
    <a href="{{ site.baseurl }}/{{ l }}{{ rootTutorialURL }}"><img src="{{ site.baseurl }}/resources/images/language/{{ l }}.png" title="Language: {{ l }}"/></a>
    3031
    {% endfor %}
    3132
    {% endif %}
    3233
    </div>
    @@ -35,13 +36,13 @@
    3536
    {{ content }}
    3637
    {% if page.disqus == true %}{% include disqus.txt %}{% endif %}
    3738
    </div>
    38-
    39+
    3940
    <div class="span6">
    4041
    {% include toc-large.txt %}
    4142
    </div>
    42-
    43-
    43+
    44+
    4445
    </div>
    4546
    </div>
    4647

    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 numberDiff line numberDiff line change
    @@ -524,7 +524,7 @@ the exception from this future, as in the following example which
    524524
    tries to print US dollar value, but prints the Swiss franc value in
    525525
    the case it fails to obtain the dollar value:
    526526

    527-
    val usdQuote = future {
    527+
    val usdQuote = future {
    528528
    connection.getCurrentValue(USD)
    529529
    } map {
    530530
    usd => "Value: " + usd + "$"
    @@ -544,7 +544,7 @@ the result of this future or the argument future, whichever completes
    544544
    first, irregardless of success or failure. Here is an example in which
    545545
    the quote which is returned first gets printed:
    546546

    547-
    val usdQuote = future {
    547+
    val usdQuote = future {
    548548
    connection.getCurrentValue(USD)
    549549
    } map {
    550550
    usd => "Value: " + usd + "$"
    @@ -571,7 +571,7 @@ and then renders all the posts to the screen:
    571571

    572572
    val allposts = mutable.Set[String]()
    573573

    574-
    future {
    574+
    future {
    575575
    session.getRecentPosts
    576576
    } andThen {
    577577
    posts => allposts ++= posts

    0 commit comments

    Comments
     (0)
    0