Permalink
Browse files

ENH: Design changes. Bootstrap menu bar.

  • Loading branch information...
1 parent f3e5ad8 commit 49698d948c592fd2315bac3ab2c646ce274ee29e @Debilski committed Jul 29, 2014
Showing with 118 additions and 94 deletions.
  1. +0 −32 css/default.css
  2. +0 −4 debilski-de.hs
  3. +6 −6 index.html
  4. +32 −3 scss/styles.scss
  5. +79 −48 templates/default.html
  6. +1 −1 templates/history.html
View
@@ -1,32 +0,0 @@
-div#header {
- border-bottom: 2px solid black;
- margin-bottom: 30px;
- padding: 12px 0px 12px 0px;
-}
-
-div#logo a {
- color: black;
- float: left;
- font-size: 18px;
- font-weight: bold;
- text-decoration: none;
-}
-
-div#header #navigation {
- text-align: right;
-}
-
-div#header #navigation a {
- color: black;
- font-size: 18px;
- font-weight: bold;
- margin-left: 12px;
- text-decoration: none;
- text-transform: uppercase;
-}
-
-div.info {
- color: #555;
- font-size: 14px;
- font-style: italic;
-}
View
@@ -19,10 +19,6 @@ main = hakyll $ do
route idRoute
compile copyFileCompiler
- match "css/*" $ do
- route idRoute
- compile compressCssCompiler
-
match "css/fonts/**" $ do
route idRoute
compile copyFileCompiler
View
@@ -2,13 +2,13 @@
title: rike-benjamin schuppner
---
-<h2>// rike-benjamin schuppner</h2>
+<h2 style="margin-top: 0.5em;">// rike-benjamin schuppner</h2>
-<p>
- <a href="https://twitter.com/debilski" class="btn btn-default"><i class="fa fa-twitter"></i> @debilski</a>
- <a href="http://last.fm/user/Meloria" class="btn btn-default"><i class="bf-lastfm"></i> last.fm</a>
- <a href="http://instagram.com/debilski" class="btn btn-default"><i class="fa fa-instagram"></i> instagram</a>
- <a href="http://github.com/debilski" class="btn btn-default"><i class="fa fa-github"></i> github</a>
+<p id="social-icons">
+ <a href="https://twitter.com/debilski" class="btn btn-default btn-twitter"><i class="fa fa-twitter"></i> @debilski</a>
+ <a href="http://last.fm/user/Meloria" class="btn btn-default btn-lastfm"><i class="bf-lastfm"></i> last.fm</a>
+ <a href="http://instagram.com/debilski" class="btn btn-default btn-instagram"><i class="fa fa-instagram"></i> instagram</a>
+ <a href="http://github.com/debilski" class="btn btn-default btn-github"><i class="fa fa-github"></i> github</a>
</p>
<h3>Articles</h3>
View
@@ -9,27 +9,56 @@
::-moz-selection { background: #fe57a1; text-shadow: none; }
::selection { background: #fe57a1; text-shadow: none; }
-#header {
+header#main-header {
@extend .container;
+ margin-bottom: 30px;
+ padding: 12px 0px 0px 0px;
+ border-bottom: 2px solid black;
+
+ nav {
+ a { font-family: $headings-font-family;
+ font-weight: normal; letter-spacing: 2px; text-transform: uppercase; font-size: 100%; margin-bottom: 0;
+ }
+ }
+}
+
+div#header #navigation a {
+ color: black;
+ font-size: 18px;
+ font-weight: bold;
+ margin-left: 12px;
+ text-decoration: none;
+ text-transform: uppercase;
}
footer#main-footer {
@extend .container;
+ #inner-footer {
+ @extend .container-fluid;
+ }
+
border-top: solid 2px #555;
color: #555;
font-size: 12px;
margin-top: 30px;
padding: 12px 0px 12px 0px;
- text-align: right;
+ div.pull-right { font-family: $headings-font-family; font-weight: normal; letter-spacing: 2px; text-transform: uppercase; font-size: 100%; margin: 0; }
}
#page-history {
- h2 { font-weight: normal; letter-spacing: 2px; text-transform: uppercase; font-size: 100%; margin-bottom: 0; }
+ h2 { font-weight: normal; letter-spacing: 2px; text-transform: uppercase; font-size: 100%; margin: 0; }
ul { @extend .list-unstyled; }
li { @extend small; }
.history-hash {}
.history-date {}
.history-log {}
}
+#social-icons {
+ margin: 0em 0em;
+}
+
+.btn-twitter, .btn-lastfm, .btn-instagram, .btn-github {
+}
+
View
@@ -1,49 +1,80 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>:: // $title$</title>
- <link rel="stylesheet" type="text/css" href="/css/default.css" />
- <link rel="stylesheet" type="text/css" href="/css/styles.css" />
- <link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.css" rel="stylesheet" />
-
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
- <!-- Latest compiled and minified JavaScript -->
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-
- $if(mathjax)$
- <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
- $endif$
- </head>
- <body>
- <div id="header">
- </div>
-
- <div id="content" class="container">
- $body$
- </div>
- <footer id="main-footer">
- Built with <a href="http://jaspervdj.be/hakyll">Hakyll</a> | Hosting: <a href="https://uberspace.de">Uberspace</a> | <a href="/about.html">Impressum</a>
- $partial("templates/history.html")$
- </footer>
-
-<!-- Piwik -->
-<script type="text/javascript">
- var _paq = _paq || [];
- _paq.push(["trackPageView"]);
- _paq.push(["enableLinkTracking"]);
-
- (function() {
- var u=(("https:" == document.location.protocol) ? "https" : "http") + "://stats.debilski.de/piwik/";
- _paq.push(["setTrackerUrl", u+"piwik.php"]);
- _paq.push(["setSiteId", "1"]);
- var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
- g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
- })();
-</script>
-<!-- End Piwik Code -->
-
- </body>
+<!doctype html>
+<html lang=en-us>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>// $title$</title>
+ <link rel="stylesheet" type="text/css" href="/css/styles.css" />
+ <link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.css" rel="stylesheet" />
+
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+ <!-- Latest compiled and minified JavaScript -->
+ <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+
+ $if(mathjax)$
+ <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+ $endif$
+ </head>
+ <body>
+ <header id="main-header">
+
+ <nav class="navbar navbar-default" role="navigation">
+
+ <div class="container-fluid">
+ <!-- Brand and toggle get grouped for better mobile display -->
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/">debilski.de</a>
+ </div>
+
+
+ <!-- Collect the nav links, forms, and other content for toggling -->
+ <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+
+
+ <ul class="nav navbar-nav navbar-right">
+ <li><a href="#">Articles</a></li>
+ <li><a href="#">Talks</a></li>
+ <li><a href="http://github.com/debilski">Github</a></li>
+ <li><a href="https://twitter.com/debilski">Twitter</a></li>
+ </ul>
+
+
+ </div><!-- /.navbar-collapse -->
+ </div><!-- /.container-fluid -->
+
+ </nav>
+
+ </header>
+
+ <div id="content" class="container">
+ $body$
+ </div>
+
+ <footer id="main-footer">
+ <div class="pull-left container-fluid">$partial("templates/history.html")$</div>
+ <div class="pull-right container-fluid">Built with <a href="http://jaspervdj.be/hakyll">Hakyll</a> | Hosting: <a href="https://uberspace.de">Uberspace</a> | <a href="/about.html">Impressum</a></div>
+ </footer>
+
+ <!-- Piwik -->
+ <script type="text/javascript">
+ var _paq = _paq || [];
+ _paq.push(["trackPageView"]);
+ _paq.push(["enableLinkTracking"]);
+
+ (function() {
+ var u=(("https:" == document.location.protocol) ? "https" : "http") + "://stats.debilski.de/piwik/";
+ _paq.push(["setTrackerUrl", u+"piwik.php"]);
+ _paq.push(["setSiteId", "1"]);
+ var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+ g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+ })();
+ </script>
+ <!-- End Piwik Code -->
+
+ </body>
</html>
@@ -1,5 +1,5 @@
<aside id="page-history">
- <h2><a href="#page-history-list" data-toggle="collapse" data-target="#page-history-list">Page history</a></h2>
+ <h2><a href="#page-history-list" data-toggle="collapse" data-target="#page-history-list">Edit history</a></h2>
<ul id="page-history-list" class="collapse">
$for(history)$
<li>

0 comments on commit 49698d9

Please sign in to comment.