From 881aa082c63c025fcf2e48f018b66e70b23f9594 Mon Sep 17 00:00:00 2001
From: Jon Schlinkert <dev@sellside.com>
Date: Wed, 5 Feb 2014 04:40:14 -0500
Subject: [PATCH] a number of updates to styles, data and docs

---
 CONTRIBUTING.md                    |  4 +--
 Gruntfile.js                       |  6 ++--
 LICENSE-MIT                        |  2 +-
 README.md                          |  2 +-
 _config.yml                        | 38 ++++++++++++++++++------
 data/less.json                     |  8 ++---
 data/translations.yml              |  1 +
 package.json                       |  6 +---
 styles/docs.css                    | 24 ---------------
 styles/site.less                   |  7 +++++
 styles/variables.less              |  4 +--
 templates/functions.hbs            | 47 ++++++++++++++++++------------
 templates/helpers/sidenav.js       |  5 ++--
 templates/includes/head.hbs        |  2 +-
 templates/includes/nav-main.hbs    |  2 +-
 templates/includes/source-link.hbs |  2 +-
 16 files changed, 85 insertions(+), 75 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 749c70c8..737b65f3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,8 +1,8 @@
-## Contributing to the Wiki
+## Contributing to the Documentation
 
 **Formatting Standards**
 
-For consistency across all examples in the wiki and to ensure that our code examples are readable, we ask that you please follow these guidelines when contributing to the wiki:
+For consistency across all examples in the docs and to ensure that our code examples are readable, please follow these guidelines when contributing:
 
 * Four spaces for indentation, and always use proper indentation
 * Multiple-line formatting (one property and value per line)
diff --git a/Gruntfile.js b/Gruntfile.js
index 2de9cdeb..eb67b1e7 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -14,7 +14,7 @@ module.exports = function(grunt) {
   grunt.initConfig({
 
     // Project metadata
-    pkg : grunt.file.readJSON('package.json'),
+    pkg: grunt.file.readJSON('package.json'),
     site: grunt.file.readYAML('_config.yml'),
 
     jshint: {
@@ -69,9 +69,9 @@ module.exports = function(grunt) {
       site: {
         options: {
           partials: ['content/**/*.md'],
-          permalinks: {preset: 'pretty'}
+          // permalinks: {preset: 'pretty'}
         },
-        src: '<%= site.pages %>/*.hbs',
+        src: '<%= site.pages %>/functions.hbs',
         dest: '<%= site.dest %>/'
       },
       feed: {
diff --git a/LICENSE-MIT b/LICENSE-MIT
index 4739f8d0..82be6e8d 100644
--- a/LICENSE-MIT
+++ b/LICENSE-MIT
@@ -1,4 +1,4 @@
-Copyright (c) 2013 Jon Schlinkert
+Copyright (c) 2014 Alexis Sellier, LESS Core Team, Contributors.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
diff --git a/README.md b/README.md
index 6da8326a..404de80d 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ node data/utils/pkg && grunt
 ```
 
 ## License
-Copyright (c) 2013, Less.js Core Team, Contributors
+Copyright (c) 2014, Alexis Sellier, LESS Core Team, Contributors
 Documentation released under [Creative Commons](./LICENSE-CC).
 Documentation source code released under the [MIT License](./LICENSE-MIT).
 Less.js source code is released under the [Apache 2 License](https://github.com/less/less.js/blob/master/LICENSE).
diff --git a/_config.yml b/_config.yml
index 714dd1b7..e0e2135b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -19,15 +19,25 @@ layouts:          <%= site.templates %>/layouts
 layoutext:        .hbs
 layout:           default
 
-# Extensions
+# Styles
+styles:           styles
+components:       <%= site.styles %>/components
+
+
+# =============================================
+# EXTENSIONS
+# =============================================
+
 helpers:          <%= site.templates %>/helpers
 plugins:
   # - assemble-contrib-permalinks
   # - assemble-contrib-anchors
   # - assemble-contrib-toc
 
-# Less.js metadata
-current_version:   <%= less.version %>
+
+# =============================================
+# PROJECT METADATA
+# =============================================
 
 # Site metadata
 brand:             lesscss.org
@@ -41,23 +51,33 @@ description: >
 homepage:          http://lesscss.org
 repo:              <%= pkg.repository.url %>
 issues:            <%= pkg.bugs.url %>?&state=open
+
+# Download links
 download:
   source:          <%= pkg.homepages %>/archive/master.zip
   latest:          https://raw.github.com/less/less.js/master/dist/less-<%= less.version %>.min.js
 
-cdn:
-  cloudflare:      //cdnjs.cloudflare.com/ajax/libs/less.js/1.5.0/less.min.js
 
+# =============================================
 # SEO/SEM
+# =============================================
+
 analytics:
   alexa:           lpTeh1awA400OE
-  google:          false
-  google_site_id:  false
+  google:
+    id:             UA-XXXXXXXX-YY
+    domain:         lesscss.org
+    siteid:
+    tags:           FOO-012345 # Google Tags (see: https://www.google.com/tagmanager/)
 
 
+# =============================================
+# SOCIAL / SHARING
+# =============================================
+
 # Comments
 disqus:
-  enabled:        true
+  enabled:        false
   shortname:      <%= pkg.name %>
 
 # Social
@@ -77,4 +97,4 @@ sharing:
   facebook:       false
   gplus:          false
   hn:             false
-  google:         false
\ No newline at end of file
+  google:         false
diff --git a/data/less.json b/data/less.json
index e94588af..6902f49b 100644
--- a/data/less.json
+++ b/data/less.json
@@ -1,7 +1,4 @@
 {
-  "repo": "https://github.com/less/less.js.git",
-  "issues": "https://github.com/less/less.js/issues",
-  "master": "https://github.com/less/less.js/blob/master/",
   "name": "less",
   "version": "1.6.1",
   "description": "Leaner CSS",
@@ -87,5 +84,8 @@
     "stylesheet",
     "variables in css",
     "css less"
-  ]
+  ],
+  "repo": "https://github.com/less/less.js.git",
+  "issues": "https://github.com/less/less.js/issues",
+  "master": "https://github.com/less/less.js/blob/master/"
 }
\ No newline at end of file
diff --git a/data/translations.yml b/data/translations.yml
index 84be63aa..2278e9f9 100644
--- a/data/translations.yml
+++ b/data/translations.yml
@@ -34,5 +34,6 @@
 
 - language: Belarusian
   url: Out of date) <http://www.designcontest.com/show/lesscss-be
+
 - language: Iranian
   url: http://less-css.ir
diff --git a/package.json b/package.json
index e2ec819b..57808370 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
   "devDependencies": {
     "assemble": "~0.4.34",
     "assemble-contrib-anchors": "~0.1.1",
-    "assemble-contrib-navigation": "~0.1.0",
     "assemble-contrib-permalinks": "~0.2.0",
     "assemble-contrib-toc": "~0.1.2",
     "assemble-less": "~0.7.0",
@@ -54,12 +53,10 @@
     "handlebars-helper-eachitems": "~0.1.2",
     "handlebars-helper-feed": "~0.1.0",
     "handlebars-helper-md": "~0.1.2",
-    "handlebars-helper-nav": "~0.1.0",
     "handlebars-helper-partial": "~0.1.1",
     "handlebars-helper-rel": "~0.1.0",
     "handlebars-helper-slugify": "~0.2.0",
-    "lodash": "~2.4.1",
-    "yfm": "~0.1.0"
+    "lodash": "~2.4.1"
   },
   "keywords": [
     "handlebars-helper-compose",
@@ -67,7 +64,6 @@
     "handlebars-helper-eachitems",
     "handlebars-helper-feed",
     "handlebars-helper-md",
-    "handlebars-helper-nav",
     "handlebars-helper-partial",
     "handlebars-helper-rel",
     "handlebars-helper-slugify",
diff --git a/styles/docs.css b/styles/docs.css
index 2a2f7264..4f276857 100644
--- a/styles/docs.css
+++ b/styles/docs.css
@@ -214,30 +214,6 @@ body {
 
 
 
-/*
- * Docs sections
- *
- * Content blocks for each component or feature.
- */
-
-/* Space things out */
-.docs-section + .docs-section {
-  padding-top: 10px;
-}
-
-/* Janky fix for preventing navbar from overlapping */
-h1[id] {
-  padding-top: 80px;
-  margin-top: -45px;
-}
-h2[id], h3[id] {
-  padding-top: 80px;
-  margin-top: -60px;
-}
-
-
-
-
 
 
 /*
diff --git a/styles/site.less b/styles/site.less
index cfa2d845..ed676f11 100644
--- a/styles/site.less
+++ b/styles/site.less
@@ -38,6 +38,13 @@ body {
   padding-top: 40px;
 }
 
+// Prevent navbar from overlapping
+h1[id] {
+  padding-top: 80px;
+  margin-top: -45px;
+}
+
+
 
 
 
diff --git a/styles/variables.less b/styles/variables.less
index 17b16589..3eeb409f 100644
--- a/styles/variables.less
+++ b/styles/variables.less
@@ -48,8 +48,8 @@
 @font-size-large:         ceil(@font-size-base * 1.25); // ~18px
 @font-size-small:         ceil(@font-size-base * 0.85); // ~12px
 
-@font-size-h1:            floor(@font-size-base * 2.6); // ~36px
-@font-size-h2:            floor(@font-size-base * 2.15); // ~30px
+@font-size-h1:            floor(@font-size-base * 2.75); // ~36px
+@font-size-h2:            floor(@font-size-base * 2.25); // ~30px
 @font-size-h3:            ceil(@font-size-base * 1.7); // ~24px
 @font-size-h4:            ceil(@font-size-base * 1.25); // ~18px
 @font-size-h5:            @font-size-base;
diff --git a/templates/functions.hbs b/templates/functions.hbs
index 232af7e5..452e4511 100644
--- a/templates/functions.hbs
+++ b/templates/functions.hbs
@@ -20,65 +20,74 @@ sidenav: nav-<%= slug %>
   {{/unpublished}}
 </div>
 
-
+<!-- String -->
 <div class="docs-section">
-  <h1 id="string-functions">String Functions</h1>
+  <div class="page-header">
+    <h1 id="string-functions">String Functions</h1>
+  </div>
   {{md 'string'}}
 </div>
 
-
+<!-- Misc -->
 <div class="docs-section">
-  <h1 id="misc-functions">Misc Functions</h1>
+  <div class="page-header">
+    <h1 id="misc-functions">Misc Functions</h1>
+  </div>
   {{md 'misc'}}
   {{md 'default-function'}}
 </div>
 
-
+<!-- List -->
 <div class="docs-section">
-  <h1 id="list-functions">List Functions</h1>
+  <div class="page-header">
+    <h1 id="list-functions">List Functions</h1>
+  </div>
   {{md 'list'}}
 </div>
 
-
+<!-- Math -->
 <div class="docs-section">
-  <h1 id="math-functions">Math Functions</h1>
+  <div class="page-header">
+    <h1 id="math-functions">Math Functions</h1>
+  </div>
   {{md 'math'}}
 </div>
 
-
+<!-- Type -->
 <div class="docs-section">
-  <h1 id="type-functions">Type Functions</h1>
+  <div class="page-header">
+    <h1 id="type-functions">Type Functions</h1>
+  </div>
   {{md 'type'}}
 </div>
 
 
-<!-- Section -->
+
+<!-- Color -->
 <div class="docs-section">
   <div class="page-header">
     <h1 id="color-functions">Color Functions</h1>
   </div>
 </div>
 
-
 <div class="docs-section">
-  <h1 id="color-definition">Color Definition</h1>
+  <h2 id="color-definition">Color Definition</h2>
   {{md 'color-definition'}}
 </div>
 
-
 <div class="docs-section">
-  <h1 id="color-channel">Color Channel</h1>
+  <h2 id="color-channel">Color Channel</h2>
   {{md 'color-channel'}}
 </div>
 
-
 <div class="docs-section">
-  <h1 id="color-operations">Color Operations</h1>
+  <h2 id="color-operations">Color Operations</h2>
   {{md 'color-operations'}}
 </div>
 
-
 <div class="docs-section">
-  <h1 id="color-blending">Color Blending</h1>
+  <h2 id="color-blending">Color Blending</h2>
   {{md 'color-blending'}}
 </div>
+
+
diff --git a/templates/helpers/sidenav.js b/templates/helpers/sidenav.js
index 81dc1d66..03a45d5c 100644
--- a/templates/helpers/sidenav.js
+++ b/templates/helpers/sidenav.js
@@ -8,7 +8,8 @@
 // Node.js
 var path = require('path');
 var _ = require('lodash');
-var yfm = require('yfm');
+var matter = require('gray-matter');
+
 
 // Export helpers
 module.exports.register = function (Handlebars, options, params) {
@@ -30,7 +31,7 @@ module.exports.register = function (Handlebars, options, params) {
 
       // Process context, using YAML front-matter,
       // grunt config and Assemble options.data
-      var pageObj = yfm(filepath) || {};
+      var pageObj = matter.read(filepath) || {};
       var metadata = pageObj.context || {};
 
       context = _.extend(this, opts.data[page.sidenav], metadata, context);
diff --git a/templates/includes/head.hbs b/templates/includes/head.hbs
index e27b086e..6183d426 100644
--- a/templates/includes/head.hbs
+++ b/templates/includes/head.hbs
@@ -28,7 +28,7 @@
 <!-- Google Analytics -->
 <script>
   var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '{{site.analytics.google}}']);
+  _gaq.push(['_setAccount', '{{site.analytics.google.id}}']);
   _gaq.push(['_trackPageview']);
   (function() {
     var ga = document.createElement('script'); ga.async = true;
diff --git a/templates/includes/nav-main.hbs b/templates/includes/nav-main.hbs
index c3ad96ad..88e235d5 100644
--- a/templates/includes/nav-main.hbs
+++ b/templates/includes/nav-main.hbs
@@ -53,4 +53,4 @@
       </ul>
     </nav>
   </div>
-</header>
+</header>
\ No newline at end of file
diff --git a/templates/includes/source-link.hbs b/templates/includes/source-link.hbs
index 505a34bc..2890e181 100644
--- a/templates/includes/source-link.hbs
+++ b/templates/includes/source-link.hbs
@@ -1,3 +1,3 @@
 <div class="source-link">
-  <a href="https://github.com/less/less-docs/tree/master/{{@filepath}}">Improve this page.</a>
+  <a href="https://github.com/less/less-docs/tree/master/{{@filepath}}">Improve this section.</a>
 </div>
\ No newline at end of file