From 6f2e669873366c37503631b801f1fcb105e37e39 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Sat, 12 Jul 2014 21:22:47 +0200 Subject: [PATCH] MEGA COMMIT, final stylus refactoring --- Gruntfile.js | 11 +- _config.yml | 4 +- _src/_includes/articles.html | 30 +- _src/_includes/comments.html | 2 +- _src/_includes/featured.html | 13 + _src/_includes/footer.html | 12 +- _src/_includes/header.html | 22 +- _src/_includes/sticky.html | 13 - _src/_layouts/link.html | 4 +- _src/_posts/2008-04-04-aperture-file-types.md | 2 +- _src/_posts/2008-06-01-chives.md | 2 +- ...and-the-history-of-the-first-photograph.md | 2 +- ...3-niepces-camera-obscura-wallpaper-pack.md | 2 +- ...mac-file-server-and-time-machine-volume.md | 6 +- _src/_posts/2008-08-26-icy-box-icons.md | 4 +- ...9-23-futurama-mars-university-wallpaper.md | 4 +- _src/_posts/2008-10-23-coffee-cup-icon.md | 4 +- _src/_posts/2009-02-17-out-of-whale-oil.md | 2 +- ...imate-coda-wordpress-share-link-bonanza.md | 22 +- _src/_posts/2009-06-04-twitter-crisp.md | 2 +- _src/_posts/2009-06-24-adiumeetie.md | 2 +- _src/_posts/2009-09-05-delibar.md | 2 +- _src/_posts/2010-02-04-ipixelpad.md | 2 +- _src/_posts/2010-07-03-momcorp.md | 4 +- _src/_posts/2011-12-15-badged.md | 4 +- _src/_posts/2012-05-15-wp-icons-template.md | 2 +- ...2012-07-16-using-kbd-for-fun-and-profit.md | 4 +- _src/_posts/2012-08-07-projectpurple.md | 4 +- _src/assets/less/alerts.less | 41 --- _src/assets/less/animations.less | 52 ---- _src/assets/less/buttons.less | 137 ---------- _src/assets/less/code.less | 55 ---- _src/assets/less/comments.less | 17 -- _src/assets/less/content-link.less | 27 -- _src/assets/less/content-photo.less | 77 ------ _src/assets/less/content-related.less | 37 --- _src/assets/less/content.less | 191 ------------- _src/assets/less/forms.less | 48 ---- _src/assets/less/grid.less | 78 ------ _src/assets/less/icons.less | 115 -------- _src/assets/less/kremalicious3.less | 72 ----- _src/assets/less/media.less | 53 ---- _src/assets/less/mixins.less | 258 ------------------ _src/assets/less/navigation.less | 246 ----------------- _src/assets/less/page-404.less | 73 ----- _src/assets/less/page-about.less | 41 --- _src/assets/less/poststyle-2300.less | 102 ------- _src/assets/less/print.less | 65 ----- _src/assets/less/scaffolding.less | 252 ----------------- _src/assets/less/sticky.less | 40 --- _src/assets/less/syntax.less | 66 ----- _src/assets/less/tables.less | 47 ---- _src/assets/less/typography.less | 226 --------------- _src/assets/less/utilities.less | 105 ------- _src/assets/less/variables.less | 68 ----- _src/assets/styl/alerts.styl | 26 +- _src/assets/styl/animations.styl | 44 +++ _src/assets/styl/buttons.styl | 142 +++++----- _src/assets/styl/code.styl | 6 +- _src/assets/styl/comments.styl | 21 ++ _src/assets/styl/content-featured.styl | 33 +++ _src/assets/styl/content-link.styl | 19 ++ _src/assets/styl/content-photo.styl | 73 +++++ _src/assets/styl/content-related.styl | 35 +++ _src/assets/styl/content.styl | 83 +++--- _src/assets/styl/footer.styl | 76 ++++++ _src/assets/styl/forms.styl | 2 +- _src/assets/styl/grid.styl | 70 +++-- _src/assets/styl/header.styl | 75 +++++ _src/assets/styl/icons.styl | 82 +++--- _src/assets/styl/kremalicious3.styl | 56 ++-- _src/assets/styl/media.styl | 30 +- _src/assets/styl/mixins.styl | 110 +++++--- _src/assets/styl/navigation.styl | 148 ++++++++++ _src/assets/styl/page-404.styl | 68 +++++ _src/assets/styl/page-about.styl | 44 +++ _src/assets/styl/poststyle-2300.styl | 73 +++++ _src/assets/styl/print.styl | 80 ++++++ _src/assets/styl/scaffolding.styl | 198 +------------- _src/assets/styl/search.styl | 62 +++++ _src/assets/styl/tables.styl | 26 +- _src/assets/styl/typography.styl | 139 +++++----- _src/assets/styl/variables.styl | 16 +- _src/index.html | 8 +- 84 files changed, 1353 insertions(+), 3268 deletions(-) create mode 100644 _src/_includes/featured.html delete mode 100644 _src/_includes/sticky.html delete mode 100644 _src/assets/less/alerts.less delete mode 100644 _src/assets/less/animations.less delete mode 100644 _src/assets/less/buttons.less delete mode 100644 _src/assets/less/code.less delete mode 100644 _src/assets/less/comments.less delete mode 100644 _src/assets/less/content-link.less delete mode 100644 _src/assets/less/content-photo.less delete mode 100644 _src/assets/less/content-related.less delete mode 100644 _src/assets/less/content.less delete mode 100644 _src/assets/less/forms.less delete mode 100644 _src/assets/less/grid.less delete mode 100644 _src/assets/less/icons.less delete mode 100644 _src/assets/less/kremalicious3.less delete mode 100644 _src/assets/less/media.less delete mode 100644 _src/assets/less/mixins.less delete mode 100644 _src/assets/less/navigation.less delete mode 100644 _src/assets/less/page-404.less delete mode 100644 _src/assets/less/page-about.less delete mode 100644 _src/assets/less/poststyle-2300.less delete mode 100644 _src/assets/less/print.less delete mode 100644 _src/assets/less/scaffolding.less delete mode 100644 _src/assets/less/sticky.less delete mode 100644 _src/assets/less/syntax.less delete mode 100644 _src/assets/less/tables.less delete mode 100644 _src/assets/less/typography.less delete mode 100644 _src/assets/less/utilities.less delete mode 100644 _src/assets/less/variables.less create mode 100644 _src/assets/styl/animations.styl create mode 100644 _src/assets/styl/comments.styl create mode 100644 _src/assets/styl/content-featured.styl create mode 100644 _src/assets/styl/content-link.styl create mode 100644 _src/assets/styl/content-photo.styl create mode 100644 _src/assets/styl/content-related.styl create mode 100644 _src/assets/styl/footer.styl create mode 100644 _src/assets/styl/header.styl create mode 100644 _src/assets/styl/navigation.styl create mode 100644 _src/assets/styl/page-404.styl create mode 100644 _src/assets/styl/page-about.styl create mode 100644 _src/assets/styl/poststyle-2300.styl create mode 100644 _src/assets/styl/print.styl create mode 100644 _src/assets/styl/search.styl diff --git a/Gruntfile.js b/Gruntfile.js index 97bfc6b3..a027f26e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -66,13 +66,14 @@ module.exports = function(grunt){ stylus: { compile: { options: { - include css: true - } + 'include css': true, + compress: false + }, files: { '<%= config.site %>/<%= config.assets.css %>/kremalicious3.min.css' : '<%= config.src %>/<%= config.assets.stylus %>/kremalicious3.styl', '<%= config.site %>/<%= config.assets.css %>/poststyle-2300.min.css' : '<%= config.src %>/<%= config.assets.stylus %>/poststyle-2300.styl' - }, - }, + } + } }, // combine css media queries @@ -167,7 +168,7 @@ module.exports = function(grunt){ }, stylus: { files: ['<%= config.src %>/<%= config.assets.stylus %>/*.styl'], - tasks: ['stylus','cmq','cssmin'] + tasks: ['stylus', 'cmq', 'cssmin'] }, js: { files: ['<%= config.src %>/<%= config.assets.js %>/*.js'], diff --git a/_config.yml b/_config.yml index 295cd82c..181abe6b 100644 --- a/_config.yml +++ b/_config.yml @@ -68,10 +68,10 @@ picture: width: "480" source_default: width: "320" - sticky: + featured: ppi: [1, 2] attr: - class: "sticky-image" + class: "featured-image" itemprop: "image" source_default: width: "190" \ No newline at end of file diff --git a/_src/_includes/articles.html b/_src/_includes/articles.html index 3a2bb875..9489a6a7 100644 --- a/_src/_includes/articles.html +++ b/_src/_includes/articles.html @@ -5,7 +5,7 @@

- {{ post.title | titlecase }} + {{ post.title | titlecase }} {{ post.linkurl | remove:'http://' | remove:'https://' | remove:'www.' | split:'/' | first }}

@@ -14,7 +14,7 @@
{{ post.content | markdownify }}

- Go to source + Go to source

@@ -26,58 +26,58 @@
- + {% picture {{ post.image }} %} - +
{{ post.title | titlecase }}
-{% else %} - +{% else %} +

{{ post.title | titlecase }}

- + {% if post.image %} {% picture {{ post.image }} class="teaser" %} {% endif %} - + {% capture has_more %}{{ post.content | has_more }}{% endcapture %} - + {% if has_more == 'true' %} - {{ post.content | post.excerpt | excerpt | markdownify }} + {{ post.content | post.excerpt | excerpt | markdownify }} {% else %} {% unless post.categories contains "goodies" and page.path contains "goodies" %} {{ post.excerpt | markdownify }} {% endunless %} {% endif %} - + {% if post.categories contains "goodies" and page.path contains "goodies" %} {% endif %} - + {% unless page.path contains "goodies" %} - Continue reading + Continue reading {% endunless %}
diff --git a/_src/_includes/comments.html b/_src/_includes/comments.html index cb5a96da..ed924a9e 100644 --- a/_src/_includes/comments.html +++ b/_src/_includes/comments.html @@ -2,6 +2,6 @@ \ No newline at end of file diff --git a/_src/_includes/featured.html b/_src/_includes/featured.html new file mode 100644 index 00000000..9a49a0f7 --- /dev/null +++ b/_src/_includes/featured.html @@ -0,0 +1,13 @@ + + \ No newline at end of file diff --git a/_src/_includes/footer.html b/_src/_includes/footer.html index efa91d73..c48c128b 100644 --- a/_src/_includes/footer.html +++ b/_src/_includes/footer.html @@ -1,7 +1,7 @@