Skip to content

Unfork bootstrap CSS file #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions _layouts/frontpage.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
<div class="darkblue-overlay">&nbsp;</div>
<div class="container">
<div class="row">
<div class="span12">
<div class="span10 offset1">
<div class="scala-logo">
<img src="{{ site.baseurl }}/resources/img/scala-logo-white.png" alt="Scala Logo" />
</div>
{% include navbar.html %}
</div>
</div>
<div class="row">
<div class="span12">
<div class="span10 offset1">
<div class="splash-text ontop">
<h2 style="font-weight: 700;">Object-Oriented Meets Functional</h2>
<p class="splash-pitch">
Expand Down Expand Up @@ -69,7 +69,7 @@ <h2 style="font-weight: 700;">Object-Oriented Meets Functional</h2>
<div class="bullet-row-1-wrap">
<div class="container">
<div class="row">
<div class="span12 bullet-point">
<div class="span10 offset1 bullet-point">
<h2><span>Scala in a Nutshell</span></h2>
<p class="click">&nbsp;click the boxes below to see Scala in action!&nbsp;</p>
</div>
Expand Down Expand Up @@ -129,7 +129,7 @@ <h3>Higher-Order Functions</h3>
<div class="where-to-learn-more">
<div class="container">
<div class="row">
<div class="span12">
<div class="span10 offset1">
<a class="learn-more-btn" href="{{ site.baseurl }}/what-is-scala.html">Learn More</a>
<p>or visit the <a class="italicize" href="{{ site.baseurl }}/documentation">Scala Documentation</a></p>
</div>
Expand All @@ -150,11 +150,11 @@ <h3>Higher-Order Functions</h3>
<div class="events">
<div class="container">
<div class="row">
<div class="span12 upcoming-events">
<div class="span10 offset1 upcoming-events">
<h2><span>Upcoming Events</span></h2>
</div>

<div class="span12" id="eventspane">
<div class="span10 offset1" id="eventspane">
</div>
</div>
</div>
Expand All @@ -166,10 +166,10 @@ <h2><span>Upcoming Events</span></h2>
<div class="training">
<div class="container">
<div class="row">
<div class="span12 upcoming-training">
<div class="span10 offset1 upcoming-training">
<h2><span>Upcoming Training</span></h2>
</div>
<div class="span12" id="trainingspane">
<div class="span10 offset1" id="trainingspane">
<div class="add-training"><a href="{{ site.baseurl }}/training">See more trainings</a> or <a href="https://github.com/scala/scala-lang/tree/master/training">add one to our feed</a>
</div>

Expand All @@ -181,7 +181,7 @@ <h2><span>Upcoming Training</span></h2>
<div class="news">
<div class="container">
<div class="row">
<div class="span12">
<div class="span10 offset1">
</div>
</div>
<div class="row">
Expand All @@ -193,12 +193,12 @@ <h2><span>Upcoming Training</span></h2>
<div class="twitter">
<div class="container">
<div class="row">
<div class="span12">
<div class="span10 offset1">
<h2 class="twitterhdr"><span>Scala on Twitter</span></h2>
</div>
</div>
<div class="row">
<div class="span12">
<div class="span10 offset1">
<div id="tweets" class="tweets">
<a class="twitter-timeline" data-tweet-limit="4" data-chrome="noheader nofooter noborders" data-width="520" href="https://twitter.com/scala_lang">Tweets by scala_lang</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
</div>
Expand Down
Loading