Merge branch 'release-v0.7.0'

# Conflicts: # docs/_layouts/default.html # docs/component-2-navigation.md
wfp · Feb 5, 2016 · 8cded99 · 8cded99
2 parents 6ccea10 + b816c90
commit 8cded99
Show file tree

Hide file tree

Showing 51 changed files with 1,959 additions and 687 deletions.
diff --git a/dist/assets/favicons/192x192.png b/dist/assets/favicons/192x192.png
diff --git a/dist/assets/favicons/apple-touch-icon-120x120-precomposed.png b/dist/assets/favicons/apple-touch-icon-120x120-precomposed.png
diff --git a/dist/assets/favicons/apple-touch-icon-152-precomposed.png b/dist/assets/favicons/apple-touch-icon-152-precomposed.png
diff --git a/dist/assets/favicons/apple-touch-icon-180-precomposed.png b/dist/assets/favicons/apple-touch-icon-180-precomposed.png
diff --git a/dist/assets/favicons/apple-touch-icon-76-precomposed.png b/dist/assets/favicons/apple-touch-icon-76-precomposed.png
diff --git a/dist/assets/favicons/favicon.ico b/dist/assets/favicons/favicon.ico
diff --git a/dist/css/bootstrap-theme.css b/dist/css/bootstrap-theme.css
diff --git a/dist/css/wfpui+grid.css b/dist/css/wfpui+grid.css
diff --git a/dist/css/wfpui.css b/dist/css/wfpui.css
diff --git a/docs/_config.yml b/docs/_config.yml
@@ -4,7 +4,7 @@ email: "[email protected]"
 description: ""
 # baseurl: "/guides/ui/v0.5.0" # WFP CDN
 url: "https://cdn.wfp.org" # WFP CDN
-version: "v0.6.0"
+version: "v0.7.0"
 quiet: true
 
 exclude: ["*.sublime-*", "*.sh", "*.yml", "*.DS_*"]

diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
@@ -1,10 +1,10 @@
     <footer class="wfp-footer--mini">
       <div class="wfp-grid wfp-wrapper">
         <div class="wfp-u-1 wfp-u-md-2-3 footer--panel left">
-          <h4 class="footer--label">{{ site.time | date: '%Y' }} &copy; World Food Programme</h4>
+          <h3 class="footer--label">{{ site.time | date: '%Y' }} &copy; World Food Programme</h3>
         </div>
         <div class="wfp-u-1 wfp-u-md-1-3 footer--panel right">
-          <h4 class="footer--label">WFP UI {{ site.version }}</h4>
+          <h3 class="footer--label">WFP UI {{ site.version }}</h3>
         </div>
       </div>
     </footer>
diff --git a/docs/_includes/head.html b/docs/_includes/head.html
@@ -1,15 +1,16 @@
 <head>
   <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <title>{% if page.title %}{{ site.title }} {{ site.version }} &mdash; {{ page.title }}{% else %}{{ site.title }} {{ site.version }}{% endif %}</title>
   <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
   <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-  <link rel="apple-touch-icon-precomposed" sizes="http://cdn.wfp.org/apple-touch-icon-152x152-precomposed.png">
-  <link rel="apple-touch-icon-precomposed" sizes="http://cdn.wfp.org/apple-touch-icon-144x144-precomposed.png">
-  <link rel="apple-touch-icon-precomposed" sizes="http://cdn.wfp.org/apple-touch-icon-120x120-precomposed.png">
-  <link rel="apple-touch-icon-precomposed" sizes="http://cdn.wfp.org/apple-touch-icon-114x114-precomposed.png">
-  <link rel="apple-touch-icon-precomposed" sizes="http://cdn.wfp.org/apple-touch-icon-76x76-precomposed.png">
-  <link rel="apple-touch-icon-precomposed" sizes="http://cdn.wfp.org/apple-touch-icon-72x72-precomposed.png">
+  <link rel="apple-touch-icon-precomposed" href="http://cdn.wfp.org/apple-touch-icon-152x152-precomposed.png">
+  <link rel="apple-touch-icon-precomposed" href="http://cdn.wfp.org/apple-touch-icon-144x144-precomposed.png">
+  <link rel="apple-touch-icon-precomposed" href="http://cdn.wfp.org/apple-touch-icon-120x120-precomposed.png">
+  <link rel="apple-touch-icon-precomposed" href="http://cdn.wfp.org/apple-touch-icon-114x114-precomposed.png">
+  <link rel="apple-touch-icon-precomposed" href="http://cdn.wfp.org/apple-touch-icon-76x76-precomposed.png">
+  <link rel="apple-touch-icon-precomposed" href="http://cdn.wfp.org/apple-touch-icon-72x72-precomposed.png">
   <link rel="apple-touch-icon-precomposed" href="http://cdn.wfp.org/apple-touch-icon-precomposed.png">
   <link rel="shortcut icon" href="http://cdn.wfp.org/favicon.ico">
   <link rel="stylesheet" href="http://cdn.wfp.org/libraries/webfonts/lato/lato.css">

diff --git a/docs/_includes/header.html b/docs/_includes/header.html
@@ -4,21 +4,21 @@
       <h1 class="header--title"><a href="{{ base }}/" class="header--logo">{{ site.title }}</a></h1>
     </div>
     <div class="wfp-u-2-5 wfp-u-md-2-3 header--nav">
-      <button class="header--btn pure-button small" id="js-nav-trigger">Menu</button>
+      <button class="header--btn small" id="js-nav-trigger">Menu</button>
       <div class="main-nav flyout closed">
         <button class="nav-close" id="js-nav-close"><span class="close-icon">&#x2715;</span>Close</button>
         <nav class="wfp-menu-inverse">
         {% for category in site.category-list %}
           <div class="menu--group">
-            <h6 class="menu--heading">{{ category }}</h6>
+            <h2 class="menu--heading">{{ category }}</h2>
             <ul class="menu--wrapper">
             {% for link in site.pages %}
             {% if link.resource == true %}
               {% for cat in link.categories %}
               {% if cat == category %}
               {% assign current = nil %}
-              {% if page.url == link.url %}{% assign current = ' class="current"' %}{% endif %}
-              <li><a class="menu--item" href="{{ base }}{{ link.url }}"{{current}}>{{ link.title }}</a></li>
+              {% if page.url == link.url %}{% assign current = ' current' %}{% endif %}
+              <li><a class="menu--item{{current}}" href="{{ base }}{{ link.url }}">{{ link.title }}</a></li>
               {% endif %}
               {% endfor %}
             {% endif %}

diff --git a/docs/_includes/sidebar.html b/docs/_includes/sidebar.html
@@ -1,15 +1,15 @@
 <nav class="wfp-menu">
 {% for category in site.category-list %}
   <div class="menu--group">
-    <h6 class="menu--heading">{{ category }}</h6>
+    <h2 class="menu--heading">{{ category }}</h2>
     <ul class="menu--wrapper">
     {% for link in site.pages %}
     {% if link.resource == true %}
       {% for cat in link.categories %}
       {% if cat == category %}
       {% assign current = nil %}
-      {% if page.url == link.url %}{% assign current = ' class="current"' %}{% endif %}
-      <li class="menu--item"><a class="menu--link" href="{{ base }}{{ link.url }}"{{current}}>{{ link.title }}</a></li>
+      {% if page.url == link.url %}{% assign current = ' current' %}{% endif %}
+      <li class="menu--item"><a class="menu--link{{current}}" href="{{ base }}{{ link.url }}">{{ link.title }}</a></li>
       {% endif %}
       {% endfor %}
     {% endif %}

diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
   {% include base.html %}
   {% include head.html %}
   <body class="wfp-header-spacer--narrow">
 
     {% include header.html %}
 
-    <section class="wfp-grid wfp-wrapper">
-      <div class="wfp-u-1 wfp-u-md-1-4 wfp-box side-nav">
+    <div class="wfp-grid wfp-wrapper" role="main">
+      <aside class="wfp-u-1 wfp-u-md-1-4 wfp-u-xl-1-4 wfp-box--flat side-nav">
         {% include sidebar.html %}
-      </div>
-      <div class="wfp-u-1 wfp-u-md-3-4 wfp-box">
+      </aside>
+      <article class="wfp-u-1 wfp-u-md-3-4 wfp-u-xl-5-8 wfp-box--flat">
         {{ content }}
-      </div>
-    </section>
+      </article>
+    </div>
 
     {% include footer.html %}