Skip to content

Commit

Permalink
Merge pull request twitter#190 from garciparedes/master
Browse files Browse the repository at this point in the history
Added responsive behavior
  • Loading branch information
benpence authored May 2, 2017
2 parents eea50d3 + b0507e3 commit b271f28
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 81 deletions.
35 changes: 35 additions & 0 deletions web/_includes/footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!-- Footer -->
<div id="footer">
<div class="inner">
<div class="container-fluid">
<div class="row">
<div class="span16">
<p>
Built at <a href="http://twitter.com/twitter"
target="_blank">@twitter</a> by
<a href="http://twitter.com/stevej" target="_blank">@stevej</a>,
<a href="http://twitter.com/marius" target="_blank">@marius</a>, and
<a href="http://twitter.com/lahosken" target="_blank">@lahosken</a>
with much help from
<a href="http://twitter.com/evanm" target="_blank">@evanm</a>,
<a href="http://twitter.com/sprsquish" target="_blank">@sprsquish</a>,
<a href="http://twitter.com/kevino" target="_blank">@kevino</a>,
<a href="http://twitter.com/zuercher" target="_blank">@zuercher</a>,
<a href="http://twitter.com/timtrueman" target="_blank">@timtrueman</a>,
<a href="http://twitter.com/wickman" target="_blank">@wickman</a>,
<a href="http://twitter.com/mccv" target="_blank">@mccv</a>
and <a href="https://github.com/garciparedes" target="_blank">@garciparedes</a>;
Russian translation by
<a href="https://github.com/appigram">appigram</a>;
Chinese simple translation by
<a href="https://github.com/jasonqu">jasonqu</a>;
Korean translation by
<a href="https://github.com/enshahar">enshahar</a>;<br />
<br />
Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>.
</p>
</div>
</div>
</div>
</div>
</div>
43 changes: 6 additions & 37 deletions web/_layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
<![endif]-->

<!-- Le styles -->
<link rel="stylesheet" href="bootstrap-1.1.0.min.css">
<link rel="stylesheet" href="small-screens.css">
<link rel="stylesheet" href="/bootstrap-1.1.0.min.css">
<link rel="stylesheet" href="/style.css">
<link rel="stylesheet" href="/small-screens.css">

<style>
h2 { padding-top: 0px; }
Expand All @@ -31,44 +32,12 @@
</head>

<body>
<div class="container">
<div class="container-fluid">

{{ content }}

</div> <!-- /container -->
Built at <a href="http://twitter.com/twitter"
target="_blank">@twitter</a> by
<a href="http://twitter.com/stevej" target="_blank">@stevej</a>,
<a href="http://twitter.com/marius" target="_blank">@marius</a>, and
<a href="http://twitter.com/lahosken" target="_blank">@lahosken</a>
with much help from
<a href="http://twitter.com/evanm" target="_blank">@evanm</a>,
<a href="http://twitter.com/sprsquish"
target="_blank">@sprsquish</a>,
<a href="http://twitter.com/kevino" target="_blank">@kevino</a>,
<a href="http://twitter.com/zuercher" target="_blank">@zuercher</a>,
<a href="http://twitter.com/timtrueman"
target="_blank">@timtrueman</a>,
<a href="http://twitter.com/wickman" target="_blank">@wickman</a>,
and <a href="http://twitter.com/mccv" target="_blank">@mccv</a>;
Russian translation by
<a href="https://github.com/appigram">appigram</a>;
Chinese simple translation by
<a href="https://github.com/jasonqu">jasonqu</a>;
Korean translation by
<a href="https://github.com/enshahar">enshahar</a>;<br />
<br />
<div id="footer">
<div class="inner">
<div class="container">
<p>

Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>.
</p>
</div>
</div>
</div>

</div> <!-- /container-fluid -->

{% include footer.html %}
</body>
</html>
48 changes: 8 additions & 40 deletions web/_layouts/post.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
<![endif]-->

<!-- Le styles -->
<link rel="stylesheet" href="/scala_school/bootstrap-1.1.0.min.css">
<link rel="stylesheet" href="/bootstrap-1.1.0.min.css">
<link rel="stylesheet" href="/style.css">
<link rel="stylesheet" href="/small-screens.css">
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
Expand All @@ -26,10 +28,10 @@
</head>

<body>

<div class="topbar">
<div class="fill">
<div class="container fixed">
<div class="container-fluid fixed">
<h3><a href="index.html">{{ page.title }}</a></h3>
<ul class="nav secondary-nav">
{% if page.prev %}
Expand All @@ -44,43 +46,9 @@ <h3><a href="index.html">{{ page.title }}</a></h3>
</div>
</div>

<div class="container" style="padding-top: 60px;">
<div class="container-fluid" style="padding-top: 60px;">
{{ content }}
</div> <!-- /container -->

<div id="footer">
<div class="inner">
<div class="container">
<p>

Built at <a href="http://twitter.com/twitter"
target="_blank">@twitter</a> by
<a href="http://twitter.com/stevej" target="_blank">@stevej</a>,
<a href="http://twitter.com/marius" target="_blank">@marius</a>, and
<a href="http://twitter.com/lahosken" target="_blank">@lahosken</a>
with much help from
<a href="http://twitter.com/evanm" target="_blank">@evanm</a>,
<a href="http://twitter.com/sprsquish"
target="_blank">@sprsquish</a>,
<a href="http://twitter.com/kevino" target="_blank">@kevino</a>,
<a href="http://twitter.com/zuercher" target="_blank">@zuercher</a>,
<a href="http://twitter.com/timtrueman"
target="_blank">@timtrueman</a>,
<a href="http://twitter.com/wickman" target="_blank">@wickman</a>,
and <a href="http://twitter.com/mccv" target="_blank">@mccv</a>;
Russian translation by
<a href="https://github.com/appigram">appigram</a>;
Chinese simple translation by
<a href="https://github.com/jasonqu">jasonqu</a>;
Korean translation by
<a href="https://github.com/enshahar">enshahar</a>;<br />
<br />

Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>.
</p>
</div>
</div>
</div>

</div> <!-- /container-fluid -->
{% include footer.html %}
</body>
</html>
2 changes: 1 addition & 1 deletion web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h2>Lessons</h2>
</dl>
</div>
</div>
</div> <!-- /container -->
</div> <!-- /container-fluid -->

<!-- banner -->
<a href="https://github.com/twitter/scala_school"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"></a>
Expand Down
2 changes: 1 addition & 1 deletion web/ko/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ <h2>Lessons</h2>
</dl>
</div>
</div>
</div> <!-- /container -->
</div> <!-- /container-fluid -->

<!-- banner -->
<a href="https://github.com/twitter/scala_school"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"></a>
Expand Down
2 changes: 1 addition & 1 deletion web/ru/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h2>Уроки</h2>
</dl>
</div>
</div>
</div> <!-- /container -->
</div> <!-- /container-fluid -->
<!-- banner -->
<a href="https://github.com/twitter/scala_school"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"></a>
</body>
Expand Down
1 change: 1 addition & 0 deletions web/small-screens.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
div.container {
width: 90%;
}
.row .span16,
.row .span8,
.row .span6 {
float: none;
Expand Down
5 changes: 5 additions & 0 deletions web/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
body {
max-width: 940px;
margin-right: auto;
margin-left: auto;
}
2 changes: 1 addition & 1 deletion web/zh_cn/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h2>课程</h2>
</dl>
</div>
</div>
</div> <!-- /container -->
</div> <!-- /container-fluid -->

<!-- banner -->
<a href="https://github.com/twitter/scala_school"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"></a>
Expand Down

0 comments on commit b271f28

Please sign in to comment.