Adjust base font size
authorJoerg Jaspert <joerg@debian.org>
Mon, 29 Feb 2016 17:03:40 +0000 (18:03 +0100)
committerJoerg Jaspert <joerg@debian.org>
Sun, 6 Mar 2016 13:29:58 +0000 (14:29 +0100)
Rakefile
_config.yml
_layouts/_post.txt [new file with mode: 0644]
_layouts/default.html
_layouts/post.html
_rakeconfig.yml
_redirects.htaccess
_scss/base.scss

index f7e8dba..532687c 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -85,25 +85,31 @@ end
 
 # rake post["Title"]
 desc "Create a post in _posts"
-task :post, :title do |t, args|
-  title = args[:title]
+task :post, [:title] do |t, args|
+  args.with_defaults(:title => "Forgot to enter a title")
   template = CONFIG["post"]["template"]
   extension = CONFIG["post"]["extension"]
   editor = CONFIG["editor"]
-  check_title(title)
-  filename = "#{DATE}-#{transform_to_slug(title, extension)}"
+  check_title(:title)
+  filename = "#{DATE}-#{transform_to_slug(:title, extension)}"
   content = read_file(template)
-  create_file(POSTS, filename, content, title, editor)
+  create_file(POSTS, filename, content, :title, editor)
 end
 
 # rake draft["Title"]
 desc "Create a post in _drafts"
-task :draft, :title do |t, args|
-  title = args[:title]
+task :draft, [:title, :category, :content] do |t, args|
+  if args.title == nil then
+    puts "Error! title is empty"
+    puts "Usage: draft[title,category,content]"
+    puts "Category and conten are optional"
+    puts "Category is a string; nil or empty for no category"
+    exit 1
+  end
   template = CONFIG["post"]["template"]
   extension = CONFIG["post"]["extension"]
   editor = CONFIG["editor"]
-  check_title(title)
+  title = args.title || "No title set"
   filename = transform_to_slug(title, extension)
   content = read_file(template)
   create_file(DRAFTS, filename, content, title, editor)
@@ -195,21 +201,3 @@ task :preview do
   end
   Rake::Task[:watch].invoke
 end
-
-# rake deploy["Commit message"]
-desc "Deploy the site to a remote git repo"
-task :deploy, :message do |t, args|
-  message = args[:message]
-  branch = CONFIG["git"]["branch"]
-  if message.nil? or message.empty?
-    raise "Please add a commit message."
-  end
-  if branch.nil? or branch.empty?
-    raise "Please add a branch."
-  else
-    Rake::Task[:build].invoke
-    execute("git add .")
-    execute("git commit -m \"#{message}\"")
-    execute("git push origin #{branch}")
-  end
-end
index b46eacd..8a79ff5 100644 (file)
@@ -6,6 +6,13 @@ author:
   email: joerg@ganneff.de
   uri: https://blog.ganneff.de/
 
+defaults:
+  -
+  scope:
+    path: ""
+  values:
+    layout: post
+
 gems:
   - jekyll-srcset-tag
   - jekyll-seo-tag
diff --git a/_layouts/_post.txt b/_layouts/_post.txt
new file mode 100644 (file)
index 0000000..c2a1143
--- /dev/null
@@ -0,0 +1,14 @@
+---
+title:
+subtitle:
+description:
+image:
+layout: post
+permalink:
+published: false
+categories:
+-
+tags:
+-
+date:
+---
index 4aca6d3..f7cac7c 100644 (file)
@@ -8,7 +8,7 @@ layout: compress
   <meta name='author' content="{{site.author.name}}">
   <meta name='viewport' content='width=device-width, height=device-height, initial-scale=1.0, minimum-scale=1.0, user-scalable=yes'>
   <link type="application/atom+xml" rel="alternate" href="/atom.xml" title="{{site.name}}" />
-  <style>@font-face{font-family:'Yellowtail';font-style:normal;font-weight:400;src:local("Yellowtail"),url(/assets/fonts/yellowtail.woff2) format("woff2");unicode-range:U+0000-00FF,U+0131,U+0152-0153,U+02C6,U+02DA,U+02DC,U+2000-206F,U+2074,U+20AC,U+2212,U+2215,U+E0FF,U+EFFD,U+F000}@font-face{font-family:'Droid Sans';font-style:normal;font-weight:400;src:local("Droid Sans"),local("DroidSans"),url(/assets/fonts/droidsans.woff) format("woff")}@font-face{font-family:'Droid Sans Mono';font-style:normal;font-weight:400;src:local("Droid Sans Mono"),local("DroidSansMono"),url(/assets/fonts/droidsansmono.woff) format("woff")}@viewport{width:device-width;height:device-height;zoom:1;min-zoom:1.0;max-zoom:3;user-zoom:zoom}@-ms-viewport{width:device-width;height:device-height;zoom:1;min-zoom:1.0;max-zoom:3;user-zoom:zoom}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,sup,sub,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:inherit;vertical-align:baseline;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:disc}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}table{border-collapse:collapse}body{background-color:#002b36;color:#839496;font-size:calc(1rem + 0.15vw + 0.15vh);font-family:"Droid Sans","Lucida Bright",Georgia,"Hoefler Text","Baskerville Old Face",Garamond,"Times New Roman",serif;font-variant-ligatures:common-ligatures;font-kerning:normal;font-weight:normal;font-smoothing:antialiased;text-rendering:optimizeLegibility;line-height:1.7;hyphens:auto;ms-hyphens:auto;webkit-hyphens:auto}h1,h2,h3{color:#b58900}h1{font-size:2.7em;margin:0 0 0.625em 0}h2{font-size:1.8em;margin:0 0 0.625em 0}h3{font-size:1.4em;margin:0 0 0.625em 0}a{text-decoration:none;padding-bottom:0.125em;color:#2aa198;border-color:#073642}a:active,a:visited{border-color:#073642;text-decoration:none;padding-bottom:0.125em}a:hover{background-color:#073642;border-color:#073642}a.year-link{color:#b58900;border-bottom:0.0625em solid #586e75}h1>a{color:#dc2b27}h1>a:visited,h1>a:active{color:#dc2b27}h1>a:hover{background-color:#073642;border-color:#073642;color:#dc2b27}p,pre{margin-bottom:1vh}.mono{font-family:"Droid Sans Mono","Lucida Console","Lucida Sans Typewriter",monaco,"Bitstream Vera Sans Mono",monospace;font-size:.98rem}pre{font-family:"Droid Sans Mono","Lucida Console","Lucida Sans Typewriter",monaco,"Bitstream Vera Sans Mono",monospace;font-size:.98rem;border:0.0313em solid #586e75;padding:1vmax;overflow:auto;margin-right:0.5em}ol,ul{padding:0 0 1.125em 1.875em;padding:0 0 1.5vw 1.7vmax}ol li,ul li{margin-top:0.625em;margin-bottom:0.625em;margin-top:1vw;margin-bottom:1vw}table td.postdate{width:15vw}table td.postlink{width:75vw}table td.categoryposts{width:10vw;text-align:right}table td.yearcell{color:#b58900;text-align:center}table td.gutter.gl{vertical-align:top}table td.code{float:right}table tr.even{background-color:#26424e}table tr.yearline{font-size:1.8em;margin:0 0 0.625em 0}table thead{text-align:right}em,i{font-style:italic}strong,b{font-weight:bold}small,sup,sub{font-size:calc( .85remem + 0.15vw + 0.15vh)}sup{vertical-align:super}sub{vertical-align:sub}blockquote{margin:1.375em 1.375em;padding:0 1.25em;border-left:0.125em solid #000;font-size:calc(1.2rem + 0.15vw + 0.15vh);font-style:italic;line-height:1.5rem;border-color:#dc2b27}acronym,abbr{cursor:help;letter-spacing:0.0625em;border-bottom:0.0625em dashed}#header{background-color:#002b36;font-family:Yellowtail,"Brush Script MT",cursive;width:100vw;position:fixed;top:0;bottom:auto;text-align:center}#header h1{color:#ff8900;font-size:calc(3.5rem + 0.15vw + 0.15vh);margin-bottom:4px}#header h2{color:#3ae25c;font-size:calc(1.952rem + 0.15vw + 0.15vh)}@media all and (max-height: 500px){#header{position:relative;float:none;margin-left:initial}}@media all and (max-width: 49.991em){#header{position:static;float:none;margin-left:initial}}#footer{width:75vw;margin:3.125em auto 1.25em  auto;text-align:center}@media all and (max-width: 49.991em){#footer{width:100vw}}#license{display:inline-block}#license p{display:inline-block}#content{min-width:45ch;max-width:95ch;margin-top:calc(11rem + 1vw + 1vh);margin-left:11%}@media all and (max-width: 49.991em){#content{margin-top:auto;margin-left:initial;width:98vw}}@media all and (max-height: 500px){#content{position:static;float:none;width:98vw;margin-top:auto}}@media all and (min-width: 87.5101em){#content{margin-left:auto;margin-right:auto}}#sidebar{position:fixed;text-align:right;margin-top:5vmin;width:20%;left:-10%}#sidebar li{list-style:none;margin:2px 0}#sidebar a{border:none;padding:2px 4px}#sidebar a:hover{color:#2aa198;background-color:#073642}#sidebar nav select.mnav{display:none}@media all and (max-width: 49.991em){#sidebar{position:relative;text-align:left;width:100vw;left:0;margin-top:0;float:none;overflow:auto}#sidebar li{float:left;margin:2px 0}#sidebar nav select.mnav{display:block;margin-bottom:15px}}@media all and (min-width: 87.5101em){#sidebar{left:auto}}article{margin-bottom:40px}article h1{color:#2aa198;font-size:calc(1.6rem + 0.15vw + 0.15vh);margin:0 0 10px 0}article h1 a{border:none}article h1 a.anchor{margin-left:8px;color:#2aa198}article .meta{font-size:calc(.7rem + 0.15vw + 0.15vh);font-style:italic}img{max-width:100vw}img.left{float:left;margin:1em 1em 1em 1em}img.right{float:right;margin:1em 1em 1em 1em}img.center{display:block;text-align:center;margin:1em auto 1em auto}figure.left{float:left;display:inline-block}figure.right{float:right;display:inline-block}figure.center{margin-left:auto;margin-right:auto}figcaption{text-align:center}.postnavigation{text-align:center}.postnavigation .left{float:left}.postnavigation .right{float:right}.highlight{background-color:#002b36;color:#839496;border:solid 1px;padding:1vmax;overflow:auto;font-family:"Droid Sans Mono","Lucida Console","Lucida Sans Typewriter",monaco,"Bitstream Vera Sans Mono",monospace;font-size:.98rem}.highlight p,.highlight pre{margin-bottom:0}.highlight .lineno{color:#ccc;display:inline-block;padding:0 5px;border-right:1px solid #ccc}.highlight pre code{display:block;white-space:pre;overflow-x:auto;word-wrap:normal}.highlight .c{color:#586e75}.highlight .err{color:#839496}.highlight .g{color:#839496}.highlight .k{color:#3ae25c}.highlight .l{color:#839496}.highlight .n{color:#839496}.highlight .o{color:#3ae25c}.highlight .x{color:#ff8900}.highlight .p{color:#839496}.highlight .cm{color:#586e75}.highlight .cp{color:#3ae25c}.highlight .c1{color:#586e75}.highlight .cs{color:#3ae25c}.highlight .gd{color:#2aa198}.highlight .ge{color:#839496;font-style:italic}.highlight .gr{color:#dc2b27}.highlight .gh{color:#ff8900}.highlight .gi{color:#3ae25c}.highlight .go{color:#839496}.highlight .gp{color:#839496}.highlight .gs{color:#839496;font-weight:bold}.highlight .gu{color:#ff8900}.highlight .gt{color:#839496}.highlight .kc{color:#ff8900}.highlight .kd{color:#268bd2}.highlight .kn{color:#3ae25c}.highlight .kp{color:#3ae25c}.highlight .kr{color:#268bd2}.highlight .kt{color:#dc2b27}.highlight .ld{color:#839496}.highlight .m{color:#2aa198}.highlight .s{color:#2aa198}.highlight .na{color:#839496}.highlight .nb{color:#ff8900}.highlight .nc{color:#268bd2}.highlight .no{color:#ff8900}.highlight .nd{color:#268bd2}.highlight .ni{color:#ff8900}.highlight .ne{color:#ff8900}.highlight .nf{color:#268bd2}.highlight .nl{color:#839496}.highlight .nn{color:#839496}.highlight .nx{color:#839496}.highlight .py{color:#839496}.highlight .nt{color:#268bd2}.highlight .nv{color:#268bd2}.highlight .ow{color:#3ae25c}.highlight .w{color:#839496}.highlight .mf{color:#2aa198}.highlight .mh{color:#2aa198}.highlight .mi{color:#2aa198}.highlight .mo{color:#2aa198}.highlight .sb{color:#586e75}.highlight .sc{color:#2aa198}.highlight .sd{color:#839496}.highlight .s2{color:#2aa198}.highlight .se{color:#ff8900}.highlight .sh{color:#839496}.highlight .si{color:#2aa198}.highlight .sx{color:#2aa198}.highlight .sr{color:#dc2b27}.highlight .s1{color:#2aa198}.highlight .ss{color:#2aa198}.highlight .bp{color:#268bd2}.highlight .vc{color:#268bd2}.highlight .vg{color:#268bd2}.highlight .vi{color:#268bd2}.highlight .il{color:#2aa198}</style>
+  <link href="/assets/css/style.css" rel="stylesheet" />
   <!--[if lt IE 9]>
     <script src="/assets/js/html5shiv.js"></script>
   <![endif]-->
index db80f5c..c78666c 100644 (file)
@@ -2,7 +2,6 @@
 layout: default
 ---
 <article itemscope itemtype="http://schema.org/BlogPosting" class="post" >
-
   {% if page.external-url %}
   <h1 itemProp="headline">
     <a href="{{ page.external-url }}" title="External post {{ page.title | markdownify | remove: '<p>' | remove: '</p>' }}">{{ page.title | markdownify | remove: '<p>' | remove: '</p>' }}</a> 
@@ -11,8 +10,6 @@ layout: default
   {% else %}
   <h1 itemProp="headline"><a href="{{ page.url }}" title="Post {{ page.title | markdownify | remove: '<p>' | remove: '</p>' }}">{{ page.title | markdownify | remove: '<p>' | remove: '</p>' }}</a></h1>
   {% endif %}
-
   <p class="meta">Posted on <span class="postdate">{{ page.date | date: "%d %b %Y, %H:%M" }}</span></p>
-
   <div class="post-content">{{ content }}</div>
 </article>
\ No newline at end of file
index eaf4d81..a496509 100644 (file)
@@ -1,14 +1,9 @@
 post:
-  template: _post.txt
+  template: _layouts/_post.txt
   extension: md
 page:
-  template: _page.txt
+  template: _layouts/_page.txt
   extension: md
 editor: emacsclient
 git:
   branch: master
-transfer:
-  command: rsync
-  settings: -av
-  source: _site/
-  destination: ~/Git/username.github.com/
\ No newline at end of file
index 36111c9..a359ae0 100644 (file)
@@ -17,5 +17,34 @@ Redirect /assets/images/2014/index.html /index.html
 Redirect /assets/images/2015/index.html /index.html
 Redirect /assets/images/2016/index.html /index.html
 Redirect /assets/images/2017/index.html /index.html
+Redirect /assets/images/2018/index.html /index.html
+Redirect /assets/images/2019/index.html /index.html
+Redirect /assets/images/2020/index.html /index.html
+Redirect /assets/images/2021/index.html /index.html
+Redirect /assets/images/2022/index.html /index.html
+Redirect /assets/images/fullsize/2007/index.html /index.html
+Redirect /assets/images/fullsize/2008/index.html /index.html
+Redirect /assets/images/fullsize/2009/index.html /index.html
+Redirect /assets/images/fullsize/2010/index.html /index.html
+Redirect /assets/images/fullsize/2011/index.html /index.html
+Redirect /assets/images/fullsize/2016/index.html /index.html
+Redirect /assets/images/fullsize/2017/index.html /index.html
+Redirect /assets/images/fullsize/2018/index.html /index.html
+Redirect /assets/images/fullsize/2019/index.html /index.html
+Redirect /assets/images/fullsize/2020/index.html /index.html
+Redirect /assets/images/fullsize/2021/index.html /index.html
+Redirect /assets/images/fullsize/2022/index.html /index.html
+Redirect /assets/images/resized/2007/index.html /index.html
+Redirect /assets/images/resized/2008/index.html /index.html
+Redirect /assets/images/resized/2009/index.html /index.html
+Redirect /assets/images/resized/2010/index.html /index.html
+Redirect /assets/images/resized/2011/index.html /index.html
+Redirect /assets/images/resized/2016/index.html /index.html
+Redirect /assets/images/resized/2017/index.html /index.html
+Redirect /assets/images/resized/2018/index.html /index.html
+Redirect /assets/images/resized/2019/index.html /index.html
+Redirect /assets/images/resized/2020/index.html /index.html
+Redirect /assets/images/resized/2021/index.html /index.html
+Redirect /assets/images/resized/2022/index.html /index.html
 Redirect /assets/js/index.html /index.html
 Redirect /assets/randomfiles/index.html /index.html
index ba4f492..02f25cb 100644 (file)
@@ -20,7 +20,7 @@
 $font-family: 'Droid Sans', 'Lucida Bright', Georgia, 'Hoefler Text', 'Baskerville Old Face', Garamond, 'Times New Roman', serif;
 $font-family-mono: 'Droid Sans Mono', 'Lucida Console', 'Lucida Sans Typewriter', monaco, 'Bitstream Vera Sans Mono', monospace;
 $font-family-header: Yellowtail, 'Brush Script MT', cursive;
-$base-font-rel: 0.8rem;
+$base-font-rel: 1rem;
 
 $breakpoints: (
     'phone': 22.5001em,
@@ -339,7 +339,6 @@ acronym, abbr {
 }
 
 #content {
-    //width: 75%;
     min-width: 45ch;
     max-width: 95ch;
     margin: {