diff options
| author | Lars Henrik Mai <lars.mai@kontinui.de> | 2014-04-08 17:48:16 +0200 |
|---|---|---|
| committer | Lars Henrik Mai <lars.mai@kontinui.de> | 2014-04-08 17:48:23 +0200 |
| commit | 229976c9833a86996de25c5fcf3ac626ded57fc1 (patch) | |
| tree | 02b881d6547c2185491f3c403c8d849f0894d0fd | |
| parent | 616254eecd891d63c9e7ede94227b7e1c84e985c (diff) | |
super basic 3 column layout
| -rw-r--r-- | source/_navigation.html.erb | 4 | ||||
| -rw-r--r-- | source/_status.html.erb | 2 | ||||
| -rw-r--r-- | source/layouts/layout.erb | 34 |
3 files changed, 32 insertions, 8 deletions
diff --git a/source/_navigation.html.erb b/source/_navigation.html.erb index 64af50e..d75f40b 100644 --- a/source/_navigation.html.erb +++ b/source/_navigation.html.erb @@ -1,6 +1,6 @@ <div id="nav"> - <ul> - <li> + <ul class="nav nav-pills nav-stacked"> + <li class="active"> <a href="/">Home</a> </li> <li> diff --git a/source/_status.html.erb b/source/_status.html.erb index 9ad5fbf..07f4e74 100644 --- a/source/_status.html.erb +++ b/source/_status.html.erb @@ -1,4 +1,4 @@ -<div> +<div id="status"> <h4> Statusdisplay diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb index 7338ea2..a88ab54 100644 --- a/source/layouts/layout.erb +++ b/source/layouts/layout.erb @@ -6,16 +6,40 @@ <!-- Always force latest IE rendering engine or request Chrome Frame --> <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible"> + <!-- For proper display on mobile --> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <!-- Use title if it's in the page YAML frontmatter --> - <title><%= current_page.data.title || "The Middleman" %></title> + <title><%= current_page.data.title || "sublab" %></title> - <%= stylesheet_link_tag "normalize", "all", "bootstrap", "bootstrap-theme" %> + <%= stylesheet_link_tag "all", "bootstrap", "bootstrap-theme" %> <%= javascript_include_tag "all", "bootstrap" %> </head> <body class="<%= page_classes %>"> - <%= partial "navigation" %> - <%= yield %> - <%= partial "status" %> + + <div class="container"> + + <div class="header"> + <h1>sublab</h1> + </div> + + <div class="row"> + + <div class="col-md-2"> + <%= partial "navigation" %> + </div> + + <div class="col-md-7"> + <%= yield %> + </div> + + <div class="col-md-3"> + <%= partial "status" %> + </div> + + </div> <!-- end main row --> + + </div> <!-- end container --> </body> </html> |