Skip to content

Commit 9a5838e

Browse files
author
Matthew Morek
authored
Merge pull request #115 from wfp/release-v0.12.0
Release v0.12.0 Fix #113 Fix #87
2 parents 3652077 + 896c1f7 commit 9a5838e

62 files changed

Lines changed: 251 additions & 288 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

dist/css/bootstrap-theme.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/wfpui+grid.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/wfpui.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "WFP UI Guidelines"
33
email: "me@matthewmorek.com"
44
description: ""
55
url: "https://cdn.wfp.org" # WFP CDN
6-
version: "v0.11.0"
6+
version: "v0.12.0"
77
quiet: true
88

99
exclude: ["*.sublime-*", "*.sh", "*.yml", "*.DS_*"]

docs/_sass/_mixins.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
// Mixins
22
// Project: WFPUI Guide
3-
// Author: Matthew Morek (me@matthewmorek.com)
4-
// URL: http://matthewmorek.com
3+

docs/_sass/_vars.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// Project Variables
22
// Project: WFPUI Guide
3-
// Author: Matthew Morek (me@matthewmorek.com)
4-
// URL: http://matthewmorek.com
3+
4+

docs/bootstrap.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
8-
<title>Theme Template for Bootstrap</title>
9-
7+
<title>WFP UI Bootstrap Theme</title>
108
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
119
<link rel="shortcut icon" href="http://cdn.wfp.org/favicon.ico">
1210
<link rel="stylesheet" href="http://cdn.wfp.org/libraries/webfonts/lato/lato.css">
@@ -58,7 +56,7 @@
5856

5957
<!-- Main jumbotron for a primary marketing message or call to action -->
6058
<div class="jumbotron">
61-
<h1>Theme example</h1>
59+
<h1>Bootstrap Theme Example</h1>
6260
<p>This is a template showcasing the optional theme stylesheet included in Bootstrap. Use it as a starting point to create something more unique by building on or modifying it.</p>
6361
</div>
6462

docs/example.html

Lines changed: 42 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ <h2 class="menu--heading">Menu</h2>
6262

6363
<section class="wfp-box">
6464

65-
<h1 id="home">Header One</h1>
66-
<h2>Header Two</h2>
67-
<h3>Header Three</h3>
68-
<h4>Header Four</h4>
69-
<h5>Header Five</h5>
70-
<h6>Header Six</h6>
65+
<h1 id="home">Header #1</h1>
66+
<h2>Header #2</h2>
67+
<h3>Header #3</h3>
68+
<h4>Header #4</h4>
69+
<h5>Header #5</h5>
70+
<h6>Header #6</h6>
7171
<p>The Zero Hunger Challenge, launched by UN Secretary General Ban Ki-moon, encourages everyone - whether in government, business or civil society - to focus their energies on ending hunger in our lifetimes. By <a href="#">partnering with WFP</a> and supporting its work, major global companies such as Unilever, DSM and MasterCard have already started to do this, joining with governments and civil society in the quest for zero hunger.</p>
7272

7373
<blockquote>The Zero Hunger Challenge, launched by UN Secretary General Ban Ki-moon, encourages everyone - whether in government, business or civil society - to focus their energies on ending hunger in our lifetimes. By partnering with WFP and supporting its work, major global companies such as Unilever, DSM and MasterCard have already started to do this, joining with governments and civil society in the quest for zero hunger.</blockquote>
@@ -270,14 +270,44 @@ <h2 class="section-title"><code>.wfp-seg-control</code></h2>
270270
</ul>
271271
</div>
272272

273-
<h2 class="section-title"><code>.wfp-breadcrumbs</code></h2>
273+
<h2 class="section-title"><code>.wfp-breadcrumbs-light</code></h2>
274274

275275
<div class="wfp-content-wrapper wfp-text-center">
276-
<ul class="wfp-breadcrumbs">
277-
<li class="breadcrumbs--item"><a href="#home" class="breadcrumbs--link home"><span class="icon-home-dark"></span><span>Home</span></a></li>
278-
<li class="breadcrumbs--item"><a href="#email" class="breadcrumbs--link">Careers</a></li>
279-
<li class="breadcrumbs--item"><span class="breadcrumbs--last">Internships</span></li>
280-
</ul>
276+
<nav class="wfp-breadcrumbs">
277+
<ol class="breadcrumbs--wrapper">
278+
<li class="breadcrumbs--item">
279+
<a href="#home" class="breadcrumbs--link home">
280+
<span class="icon-home-dark xsmall"></span><span>Home</span>
281+
</a>
282+
</li>
283+
<li class="breadcrumbs--item">
284+
<a href="#email" class="breadcrumbs--link">Careers</a>
285+
</li>
286+
<li class="breadcrumbs--item">
287+
<span class="breadcrumbs--last">Internships</span>
288+
</li>
289+
</ol>
290+
</nav>
291+
</div>
292+
293+
<h2 class="section-title"><code>.wfp-breadcrumbs-dark</code></h2>
294+
295+
<div class="wfp-content-wrapper wfp-text-center">
296+
<nav class="wfp-breadcrumbs--dark">
297+
<ol class="breadcrumbs--wrapper">
298+
<li class="breadcrumbs--item">
299+
<a href="#home" class="breadcrumbs--link home">
300+
<span class="icon-home-light xsmall"></span><span>Home</span>
301+
</a>
302+
</li>
303+
<li class="breadcrumbs--item">
304+
<a href="#email" class="breadcrumbs--link">Careers</a>
305+
</li>
306+
<li class="breadcrumbs--item">
307+
<span class="breadcrumbs--last">Internships</span>
308+
</li>
309+
</ol>
310+
</nav>
281311
</div>
282312

283313
<h2 class="section-title"><code>.wfp-pagination</code></h2>

docs/js/lib/responsive-nav.min.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gruntfile.js

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,17 @@ module.exports = function(grunt) {
7272
},
7373
docs: {
7474
files: {
75-
'docs/css/main.css': 'docs/_sass/main.scss'
75+
'docs/css/main.css': 'docs/_sass/main.scss',
76+
'docs/css/bootstrap-theme.css': 'scss/bootstrap-theme.scss'
7677
}
7778
},
7879
docsDist: {
7980
options: {
8081
sourceMap: false
8182
},
8283
files: {
83-
'docs/css/main.css': 'docs/_sass/main.scss'
84+
'docs/css/main.css': 'docs/_sass/main.scss',
85+
'docs/css/bootstrap-theme.css': 'scss/bootstrap-theme.scss'
8486
}
8587
}
8688
},
@@ -112,6 +114,12 @@ module.exports = function(grunt) {
112114
src: 'dist/css/*.css'
113115
},
114116
docs: {
117+
options: {
118+
processors: [
119+
require('autoprefixer')({ browsers: ['last 2 version'] }),
120+
require('pixrem')()
121+
]
122+
},
115123
src: 'docs/css/*.css'
116124
},
117125
docsDist: {
@@ -280,9 +288,9 @@ module.exports = function(grunt) {
280288
htmlaudit: {
281289
default: {
282290
options: {
283-
baseUri: 'http://cdn.wfp.org/guides/ui/v0.8.0/'
291+
baseUri: 'http://cdn.wfp.org/guides/ui/v0.11.0/'
284292
},
285-
src: './dist/docs/**/*.html'
293+
src: './dist/docs/*.html'
286294
},
287295
ci: {
288296
options: {
@@ -297,9 +305,9 @@ module.exports = function(grunt) {
297305
}
298306
},
299307
copy: {
300-
docs: {
301-
src: './js/lib/responsive-nav.js',
302-
dest: './docs/js/lib/responsive-nav.js'
308+
docsJS: {
309+
src: './dist/js/responsive-nav.min.js',
310+
dest: './docs/js/lib/responsive-nav.min.js'
303311
}
304312
}
305313
});
@@ -324,11 +332,11 @@ module.exports = function(grunt) {
324332
// Build Grunticon Icons
325333
grunt.registerTask('gen-icons', ['clean:grunticon', 'grunticon']);
326334
// Build WFP UI Docs locally
327-
grunt.registerTask('docs', ['sass:docs', 'postcss:docs', 'uglify:docs', 'jekyll']);
335+
grunt.registerTask('docs', ['sass:docs', 'copy', 'postcss:docs', 'uglify:docs', 'jekyll']);
328336
// Build WFP UI Docs
329-
grunt.registerTask('docs-build', ['sasslint', 'sass:docs', 'copy:docs', 'uglify:docs', 'postcss:docs', 'jekyll']);
337+
grunt.registerTask('docs-build', ['sasslint', 'sass:docs', 'copy', 'uglify:docs', 'postcss:docs', 'jekyll']);
330338
// Build dist-ready WFP UI Docs
331-
grunt.registerTask('docs-dist', ['sass:docsDist', 'copy:docs', 'postcss:docsDist', 'uglify:docs', 'jekyll']);
339+
grunt.registerTask('docs-dist', ['sass:docsDist', 'copy', 'postcss:docsDist', 'uglify:docs', 'jekyll']);
332340
// Build WFP UI
333341
grunt.registerTask('build', ['eslint', 'sasslint', 'sass:dev', 'postcss:dev']);
334342
// Build a dist-ready WFP UI with all stati resources

0 commit comments

Comments
 (0)