Skip to content

Commit

Permalink
Merge branch 'hotfix-v0.6.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Morek committed Feb 3, 2016
2 parents 8e303d7 + a5336d6 commit 6ccea10
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions docs/basics-2-branding.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ permalink: /basics/branding/
resource: true
categories: Basics
---

{% include base.html %}

### Logo
WFP logo is available in three versions: _emblem_, _standard_, and _full_. Each has its own purpose and should be used appropriately, as per [official branding guidelines](wfp.org/branding), depending on available screen space and target audience.
WFP logo is available in three versions: _emblem_, _standard_, and _full_. Each has its own purpose and should be used appropriately, as per [official branding guidelines](http://wfp.org/branding), depending on available screen space and target audience.

<figure class="picture">
<img src="{{ base }}/img/logo-versions.png" srcset="{{ base }}/img/logo-versions.png 1x, {{ base }}/img/[email protected] 2x">
Expand Down
2 changes: 1 addition & 1 deletion docs/component-0-header.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: page
title: Header
permalink: /component/header/
permalink: /components/header/
resource: true
categories: Components
---
Expand Down
2 changes: 1 addition & 1 deletion docs/component-1-footer.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: page
title: Footer
permalink: /component/footer/
permalink: /components/footer/
resource: true
categories: Components
---
Expand Down
2 changes: 1 addition & 1 deletion docs/resources-4-icons-thematic.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Each icon is available in either a positive (transparent) or a negative (solid)
### Usage
First thing to do, is to load the icons to your web site or application, by referencing it in `<head>` section. There are three stylesheets to choose from, depending on what browsers you intend on supporting. Two primary files use `base64` encoded SVGs and PNGs, while the third file relies on old-school `background-image: url()` fallback to PNGs available from the filesystem.

You can check [support for `base64`](http://caniuse.com/#feat=atob-btoa) and [SVG in CSS support](http://caniuse.com/#feat=svg-css) on [caniuse.com](caniuse.com).
You can check [support for `base64`](http://caniuse.com/#feat=atob-btoa) and [SVG in CSS support](http://caniuse.com/#feat=svg-css) on [caniuse.com](http://caniuse.com).

{% highlight html %}
<!-- For modern browsers with SVG support -->
Expand Down
2 changes: 1 addition & 1 deletion docs/resources-5-icons-ui.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Each icon is available in either a dark or a light fill.
### Usage
First thing to do, is to load the icons to your web site or application, by referencing it in `<head>` section. There are three stylesheets to choose from, depending on what browsers you intend on supporting. Two primary files use `base64` encoded SVGs and PNGs, while the third file relies on old-school `background-image: url()` fallback to PNGs available from the filesystem.

You can check [support for `base64`](http://caniuse.com/#feat=atob-btoa) and [SVG in CSS support](http://caniuse.com/#feat=svg-css) on [caniuse.com](caniuse.com).
You can check [support for `base64`](http://caniuse.com/#feat=atob-btoa) and [SVG in CSS support](http://caniuse.com/#feat=svg-css) on [caniuse.com](http://caniuse.com).

{% highlight html %}
<!-- For modern browsers with SVG support -->
Expand Down

0 comments on commit 6ccea10

Please sign in to comment.