Permalink
Browse files

Now with responsive

  • Loading branch information...
1 parent 14e8bdb commit 1135ac939e6575c25d1d7419d115343eb850bde8 @spockz spockz committed Aug 29, 2012
Showing with 388 additions and 272 deletions.
  1. +19 −10 _layouts/default.html
  2. +24 −18 _site/index.html
  3. +0 −226 _site/style.css
  4. +332 −2 css/application.css
  5. +9 −0 css/bootstrap-responsive.min.css
  6. +4 −16 index.md
View
@@ -5,7 +5,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>{{ page.title }}</title>
<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css" media="all" />
- <link rel="stylesheet" type="text/css" href="css/application.css" media="all" />
+ <link rel="stylesheet" type="text/css" href="css/bootstrap-responsive.min.css" media="all" />
+ <link rel="stylesheet" type="text/css" href="css/application.css" media="all" />
<!-- <link rel="stylesheet" type="text/css" href="syntax.css" media="all" /> -->
<!-- <link rel="stylesheet" type="text/css" href="style.css" media="all" /> -->
</head>
@@ -15,19 +16,27 @@
<div class="container">
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
+ <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+
<a class="brand" href="#">UHC-JS</a>
- <ul class="nav">
- <li class="active"><a href="#a_short_introduction_how_to_get_started">Introduction</a></li>
- <li><a href="#demo">Demo</a></li>
- <li><a href="#resources">Resources</a></li>
- <li><a href="#installation_instructions">Installation instructions</a></li>
- </ul>
+ <div class="nav-collapse">
+ <ul class="nav">
+ <li class="active"><a href="#a_short_introduction_how_to_get_started">Introduction</a></li>
+ <li><a href="#demo">Demo</a></li>
+ <li><a href="#resources">Resources</a></li>
+ <li><a href="#installation_instructions">Installation instructions</a></li>
+ </ul>
+ </div>
</div>
</div>
- <div id="header">
- <h1>The Utrecht Haskell Compiler JavaScript Backend Page</h1>
- </div>
+ <div id="header"></div>
+ <h1>The Utrecht Haskell Compiler JavaScript Backend Page</h1>
<div id="body">
{{ content }}
</div>
View
@@ -5,7 +5,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>The Utrecht Haskell Compiler JavaScript Backend Page</title>
<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css" media="all" />
- <link rel="stylesheet" type="text/css" href="css/application.css" media="all" />
+ <link rel="stylesheet" type="text/css" href="css/bootstrap-responsive.min.css" media="all" />
+ <link rel="stylesheet" type="text/css" href="css/application.css" media="all" />
<!-- <link rel="stylesheet" type="text/css" href="syntax.css" media="all" /> -->
<!-- <link rel="stylesheet" type="text/css" href="style.css" media="all" /> -->
</head>
@@ -15,19 +16,27 @@
<div class="container">
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
+ <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+
<a class="brand" href="#">UHC-JS</a>
- <ul class="nav">
- <li class="active"><a href="#a_short_introduction_how_to_get_started">Introduction</a></li>
- <li><a href="#demo">Demo</a></li>
- <li><a href="#resources">Resources</a></li>
- <li><a href="#installation_instructions">Installation instructions</a></li>
- </ul>
+ <div class="nav-collapse">
+ <ul class="nav">
+ <li class="active"><a href="#a_short_introduction_how_to_get_started">Introduction</a></li>
+ <li><a href="#demo">Demo</a></li>
+ <li><a href="#resources">Resources</a></li>
+ <li><a href="#installation_instructions">Installation instructions</a></li>
+ </ul>
+ </div>
</div>
</div>
- <div id="header">
- <h1>The Utrecht Haskell Compiler JavaScript Backend Page</h1>
- </div>
+ <div id="header"></div>
+ <h1>The Utrecht Haskell Compiler JavaScript Backend Page</h1>
<div id="body">
<div class='alert'>
<p>
@@ -38,9 +47,8 @@
<a href='http://www.haskell.org/haskellwiki/The_JavaScript_Problem#UHC'>Haskell:
The JavaScript Problem</a>.
</p>
-</div><div class='two-column'>
- <div class='column'>
- <h2 id='a_short_introduction_how_to_get_started'>A short introduction: how to get started</h2>
+</div>
+<h2 id='a_short_introduction_how_to_get_started'>A short introduction: how to get started</h2>
<p>Please report bugs in the UHC-JS backend or in the UHC-JS library in the <a href='https://github.com/UU-ComputerScience/uhc-js/issues'>GitHub Issue Tracker</a>. Please note that UHC related issues will eventually get their own issue tracker once the UHC has been moved to GitHub. Also consider joining <a href='irc://irc.freenode.net/uhcjs'>#uhcjs</a> on FreeNode.</p>
@@ -49,9 +57,8 @@ <h2 id='demo'>Demo</h2>
<p>The JCU app discussed in &#8220;Getting Rid of JavaScript with Haskell&#8221; has been put online by <a href='http://chrisdone.com/'>Chris Done</a>.</p>
<p>Go to the <a href='http://jcu.chrisdone.com/login'>instance</a>. And log in with username &#8220;uhcjsdemo@example.com&#8221; and password &#8220;123456&#8221;. And check out the <a href='https://github.com/UU-ComputerScience/JCU'>source code</a>. For installation instructions please refer to the section &#8220;Locations and Setup&#8221; in &#8220;Getting Rid of JavaScript with Haskell&#8221;.</p>
- </div>
- <div class='column block'>
- <h2 id='resources'>Resources</h2>
+
+<h2 id='resources'>Resources</h2>
<ul>
<li><a href='http://www.norm2782.com/improving-uhc-js-report.pdf'>Improving the UHC JavaScript Backend</a> - Jurriën Stutterheim</li>
@@ -68,8 +75,7 @@ <h2 id='resources'>Resources</h2>
<li><a href='https://github.com/spockz/JCU/tree/master/resources/static/hjs'>Client-Side Haskell code</a> - Alessandro Vermeulen</li>
</ul>
- </div>
-</div><div style='clear:both' />
+
<h2 id='installation_instructions'>Installation instructions</h2>
<p>Checkout the latest version of the JavaScript branch of UHC. This is somewhat risky but new features will be found here first.</p>
View
@@ -1,226 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/
- v2.0 | 20110126
- License: none (public domain)
-*/
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
- margin: 0;
- padding: 0;
- border: 0;
- font-size: 100%;
- font: inherit;
- vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
- display: block;
-}
-body {
- line-height: 1;
-}
-ol, ul {
- list-style: none;
-}
-blockquote, q {
- quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
- content: '';
- content: none;
-}
-table {
- border-collapse: collapse;
- border-spacing: 0;
-}
-
-/*** Generic Text Markup ***/
-/*** Version: 0.2
- Date: 18-3-2011
- Author: Alessandro Vermeulen <alessandro@alessandrovermeulen.me>
- Licence:
- Copyright (c) 2011 Alessandro Vermeulen <alessandro@alessandrovermeulen.me>
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-***/
-h1, h2, h3, h4, h5, h6 {
- font-weight: bold;
-}
-
-p {
- text-align: justify;
-}
-
-a {
- text-decoration:none;
-}
-
-p a {
- font-weight: bold;
-}
-
-a:hover {
- text-decoration: underline;
-}
-
-h1 {
- font-size:14pt;
-}
-
-h2 {
- font-size: 13pt;
-}
-
-h3 {
- font-size: 12pt;
-}
-
-h4, h5, h6 {
- font-size: 11pt;
-}
-
-/* Give head space to text items */
-* + p, * + ul, * + ol, * + table {
- margin-top: 10px;
-}
-
-/* Give headers space from their preceeding text */
-* + h1, * + h2, * + h3, * + h4, * + h5, * + h6 {
- margin-top: 18px;
-}
-
-/* Align elements tightly to their headers, overriding previous statement
- of give elements head space. */
-h1 + *, h2 + *, h3 + *, h4 + *, h5 + *, h6 + * {
- margin-top:0;
-}
-
-ul {
- list-style-type: disc;
- list-style-position: inside;
-}
-
-ol {
- list-style-type: decimal;
- list-style-position: inside;
-}
-
-table {
- margin: 0 auto;
- width: 90%;
-}
-/*** End Generic Text Markup ***/
-
-/** Styles **/
-body {
- font-size: 1.2em;
- font-family: Arial, Sans-Serif;
- background-color: #EEE;
- color: #333;
-}
-
-a, a:visited {
- color: #144E96;
-}
-
-#container {
- width: 1000px;
- margin: 20px auto;
- background-color: #FEFEFE;
-}
-
-#container, .block {
- border:1px solid #333;
- box-shadow: 0 0 5px 5px #888;
- border-radius: 5px;
- padding: 8px;
-}
-
-.block {
- background-color: #EEE;
- padding: 8px;
-}
-
-#header {
- padding: 8px;
- background: transparent url('images/header.png') no-repeat 8px;
- height: 116px;
- text-align: right;
-}
-
-#body {
- padding: 8px;
-}
-
-p.note {
- background-color: #FCF0AD;
- padding: 8px;
-}
-
-/** Syntax overrides **/
-.highlight, .gist-highlight {
- margin-top: 1.2em;
- margin-bottom: 1.2em;
-}
-pre {
- line-height: 1.45em;
- font-size: 13px;
- color: #93A1A1;
-}
-
-div.column {
- margin: 10px 0;
-}
-
-div.two-column div.column {
- display: block;
- width: 48%;
- float: left;
-
-}
-
-div.column + div.column {
- margin-left: 20px;
- float: right;
-}
-
-h1 {
- font-size: 1.1em;
-}
-
-h2 {
- font-size: 1.2em;
-}
-
-h3 {
- font-size: 1.1em;
-}
Oops, something went wrong.

0 comments on commit 1135ac9

Please sign in to comment.