Permalink
Browse files

Merge pull request #2050 from jglovier/master

* jglovier-master: (35 commits)
  Fix for menu at mobile again
  Fix site footer styles on mobile
  Fix for menu not working on mobile
  dat breathing room tho (expand site width slightly more)
  Replace footer github and twitter link text with inline SVG icons
  Post content styles for mobile
  Replace unicode menu icon with inline SVG
  Adds mobile styling for menu at sub 600px viewport widths
  🔥 permalink option so default date permalink method is left in tact
  For the love of perf, add syntax.css rules to main.css and call only one stylesheet
  Adds another placeholder post to illustrate post content styles
  Dem new styles tho
  Copy tweaks - brevity FTW
  Use class instead of id for CSS specificity ❤️
  Add link for RSS subscription
  Slightly friendlier and personal date formatting; classes for dem styles, yo
  Remove to avoid confusion with site.title
  demonstrate use of permalink settings
  Add site.url for use in head canonical meta and feed.xml template
  Add site.description for use in site head document meta, and feed.xml template
  ...
  • Loading branch information...
parkr committed Feb 24, 2014
2 parents 87a3208 + e2c67e0 commit b6f006c152e875aae37b8e68ccef79dd9eae69ae
@@ -1,3 +1,5 @@
-name: Your New Jekyll Site
+name: Dat site title tho
markdown: redcarpet
highlighter: pygments
+description: "Write an awesome description for your new site here. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
+url: "http://yourdomain.com"
@@ -0,0 +1,61 @@
+<footer class="site-footer">
+
+ <div class="wrap">
+
+ <h2 class="footer-heading">Bart Simpson</h2>
+
+ <div class="footer-col-1 column">
+ <ul>
+ <li>Chief Flatulence Officer</li>
+ <li><a href="mailto:bsimpson@flatulencehub.com">bsimpson@flatulencehub.com</a></li>
+ </ul>
+ </div>
+
+ <div class="footer-col-2 column">
+ <ul>
+ <li>
+ <a href="https://github.com/yourusername">
+ <span class="icon github">
+ <svg version="1.1" class="github-icon-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#C2C2C2" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761
+ c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32
+ c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472
+ c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037
+ C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65
+ c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261
+ c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082
+ c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129
+ c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/>
+ </svg>
+ </span>
+ <span class="username">bartrulez</span>
+ </a>
+ </li>
+ <li>
+ <a href="https://twitter.com/yourusername">
+ <span class="icon twitter">
+ <svg version="1.1" class="twitter-icon-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+ <path fill="#C2C2C2" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809
+ c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27
+ c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767
+ c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206
+ C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271
+ c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469
+ c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/>
+ </svg>
+ </span>
+ <span class="username">bartrulez</span>
+ </a>
+ </li>
+ </ul>
+ </div>
+
+ <div class="footer-col-3 column">
+ <p class="text">Any additional text you want to have here is totally cool for you to haz, yo.</p>
+ </div>
+
+ </div>
+
+</footer>
@@ -0,0 +1,12 @@
+<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>{% if page.title %}{{ page.title }}{% else %}{{ site.name }}{% endif %}</title>
+ <meta name="viewport" content="width=device-width">
+ <meta name="description" content="{{ site.description }}" />
+ <link rel="canonical" href="{{ site.url }}{{ page.url | replace:'index.html','' }}/" />
+
+ <!-- Custom CSS -->
+ <link rel="stylesheet" href="/css/main.css">
+
+</head>
@@ -0,0 +1,27 @@
+<header class="site-header">
+
+ <div class="wrap">
+
+ <a class="site-title" href="/">{{ site.name }}</a>
+
+ <nav class="site-nav">
+ <a href="#" class="menu-icon">
+ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 18 15" enable-background="new 0 0 18 15" xml:space="preserve">
+ <path fill="#505050" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0
+ h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
+ <path fill="#505050" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484
+ h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
+ <path fill="#505050" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0
+ c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
+ </svg>
+ </a>
+ <div class="trigger">
+ <a class="page-link" href="/about">About</a>
+ <a class="page-link" href="/projects">Projects</a>
+ </div>
+ </nav>
+
+ </div>
+
+</header>
@@ -1,44 +1,19 @@
<!DOCTYPE html>
<html>
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>{{ page.title }}</title>
- <meta name="viewport" content="width=device-width">
- <!-- syntax highlighting CSS -->
- <link rel="stylesheet" href="/css/syntax.css">
+ {% include head.html %}
- <!-- Custom CSS -->
- <link rel="stylesheet" href="/css/main.css">
-
- </head>
<body>
- <div class="site">
- <div class="header">
- <h1 class="title"><a href="/">{{ site.name }}</a></h1>
- <a class="extra" href="/">home</a>
- </div>
+ {% include header.html %}
- {{ content }}
+ <div class="page-content">
+ <div class="wrap">
+ {{ content }}
+ </div>
+ </div>
- <div class="footer">
- <div class="contact">
- <p>
- Your Name<br />
- What You Are<br />
- you@example.com
- </p>
- </div>
- <div class="contact">
- <p>
- <a href="https://github.com/yourusername">github.com/yourusername</a><br />
- <a href="https://twitter.com/yourusername">twitter.com/yourusername</a><br />
- </p>
- </div>
- </div>
- </div>
+ {% include footer.html %}
</body>
-</html>
+</html>
@@ -0,0 +1,14 @@
+---
+layout: default
+---
+<div class="post">
+
+ <header class="post-header">
+ <h1>{{ page.title }}</h1>
+ </header>
+
+ <article class="post-content">
+ {{ content }}
+ </article>
+
+</div>
@@ -1,9 +1,15 @@
---
layout: default
---
-<h2>{{ page.title }}</h2>
-<p class="meta">{{ page.date | date_to_string }}</p>
-
<div class="post">
-{{ content }}
-</div>
+
+ <header class="post-header">
+ <h1>{{ page.title }}</h1>
+ <p class="meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
+ </header>
+
+ <article class="post-content">
+ {{ content }}
+ </article>
+
+</div>
@@ -0,0 +1,88 @@
+---
+layout: post
+title: "This post demonstrates post content styles"
+categories: sample
+author: "Bart Simpson"
+meta: "Springfield"
+---
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce bibendum neque eget nunc mattis eu sollicitudin enim tincidunt. Vestibulum lacus tortor, ultricies id dignissim ac, bibendum in velit.
+
+## Some great heading (h2)
+
+Proin convallis mi ac felis pharetra aliquam. Curabitur dignissim accumsan rutrum. In arcu magna, aliquet vel pretium et, molestie et arcu.
+
+Mauris lobortis nulla et felis ullamcorper bibendum. Phasellus et hendrerit mauris. Proin eget nibh a massa vestibulum pretium. Suspendisse eu nisl a ante aliquet bibendum quis a nunc. Praesent varius interdum vehicula. Aenean risus libero, placerat at vestibulum eget, ultricies eu enim. Praesent nulla tortor, malesuada adipiscing adipiscing sollicitudin, adipiscing eget est.
+
+## Another great heading (h2)
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce bibendum neque eget nunc mattis eu sollicitudin enim tincidunt. Vestibulum lacus tortor, ultricies id dignissim ac, bibendum in velit.
+
+### Some great subheading (h3)
+
+Proin convallis mi ac felis pharetra aliquam. Curabitur dignissim accumsan rutrum. In arcu magna, aliquet vel pretium et, molestie et arcu. Mauris lobortis nulla et felis ullamcorper bibendum.
+
+Phasellus et hendrerit mauris. Proin eget nibh a massa vestibulum pretium. Suspendisse eu nisl a ante aliquet bibendum quis a nunc.
+
+### Some great subheading (h3)
+
+Praesent varius interdum vehicula. Aenean risus libero, placerat at vestibulum eget, ultricies eu enim. Praesent nulla tortor, malesuada adipiscing adipiscing sollicitudin, adipiscing eget est.
+
+> This quote will change your life. It will reveal the secrets of the universe, and all the wonders of humanity. Don't misuse it.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce bibendum neque eget nunc mattis eu sollicitudin enim tincidunt.
+
+### Some great subheading (h3)
+
+Vestibulum lacus tortor, ultricies id dignissim ac, bibendum in velit. Proin convallis mi ac felis pharetra aliquam. Curabitur dignissim accumsan rutrum.
+
+```html
+<html>
+ <head>
+ </head>
+ <body>
+ <p>Hello, World!</p>
+ </body>
+</html>
+```
+
+
+In arcu magna, aliquet vel pretium et, molestie et arcu. Mauris lobortis nulla et felis ullamcorper bibendum. Phasellus et hendrerit mauris.
+
+#### You might want a sub-subheading (h4)
+
+In arcu magna, aliquet vel pretium et, molestie et arcu. Mauris lobortis nulla et felis ullamcorper bibendum. Phasellus et hendrerit mauris.
+
+In arcu magna, aliquet vel pretium et, molestie et arcu. Mauris lobortis nulla et felis ullamcorper bibendum. Phasellus et hendrerit mauris.
+
+#### But it's probably overkill (h4)
+
+In arcu magna, aliquet vel pretium et, molestie et arcu. Mauris lobortis nulla et felis ullamcorper bibendum. Phasellus et hendrerit mauris.
+
+### Oh hai, an unordered list!!
+
+In arcu magna, aliquet vel pretium et, molestie et arcu. Mauris lobortis nulla et felis ullamcorper bibendum. Phasellus et hendrerit mauris.
+
+- First item, yo
+- Second item, dawg
+- Third item, what what?!
+- Fourth item, fo sheezy my neezy
+
+### Oh hai, an ordered list!!
+
+In arcu magna, aliquet vel pretium et, molestie et arcu. Mauris lobortis nulla et felis ullamcorper bibendum. Phasellus et hendrerit mauris.
+
+1. First item, yo
+2. Second item, dawg
+3. Third item, what what?!
+4. Fourth item, fo sheezy my neezy
+
+
+
+## Headings are cool! (h2)
+
+Proin eget nibh a massa vestibulum pretium. Suspendisse eu nisl a ante aliquet bibendum quis a nunc. Praesent varius interdum vehicula. Aenean risus libero, placerat at vestibulum eget, ultricies eu enim. Praesent nulla tortor, malesuada adipiscing adipiscing sollicitudin, adipiscing eget est.
+
+Praesent nulla tortor, malesuada adipiscing adipiscing sollicitudin, adipiscing eget est.
+
+Proin eget nibh a massa vestibulum pretium. Suspendisse eu nisl a ante aliquet bibendum quis a nunc.
@@ -0,0 +1,10 @@
+---
+layout: page
+title: About
+---
+
+This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/)
+
+You can find the source code for the Jekyll new theme at: [github.com/jglovier/jekyll-new](https://github.com/jglovier/jekyll-new)
+
+You can find the source code for Jekyll at [github.com/jekyll/jekyll](https://github.com/jekyll/jekyll)
Oops, something went wrong.

0 comments on commit b6f006c

Please sign in to comment.