Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
leigeber committed Sep 25, 2014
2 parents 11406d6 + d8974f6 commit 7eb39c8
Show file tree
Hide file tree
Showing 27 changed files with 99 additions and 89 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# 2.0.1

2014-09-24

- FIXED: Resolve issue with module watch task configuration
- FIXED: Update core font-family mixin to accommodate fonts encapsulated in quotes
- FIXED: Allow style build directory to import raw CSS files
- UPDATED: Remove stray stylesheet reference in samples index.html
- UPDATED: Update browser-sync dependency to 1.5.2
- UPDATED: Update mixins with various tweaks and efficiencies

# 2.0.0

2014-09-19
Expand Down
8 changes: 4 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ module.exports = function(grunt) {
]
});

// Create uglify task
// Create Less task
grunt.config.set('less.' + taskName, {
files: [{
dest: Wee.buildPath(target, style.rootPath),
Expand Down Expand Up @@ -549,7 +549,7 @@ module.exports = function(grunt) {
}
});

// Initialize modules
// Initialize modules
grunt.registerTask('configModules', function() {
// Set global config
modules = {
Expand Down Expand Up @@ -683,7 +683,7 @@ module.exports = function(grunt) {
grunt.config.set('watch.' + name + '-style', {
files: path + '/**/*.less',
tasks: [
'less:' + name + '-style',
'less:' + name,
'concat:style'
]
});
Expand Down Expand Up @@ -842,7 +842,7 @@ module.exports = function(grunt) {
legacyBuild.push(Wee.buildPath(legacy.build[i], styleRoot));
}

// LESS config update
// Less config update
grunt.config.merge({
less: {
legacy: {
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [Wee 2.0.0](https://github.com/weepower/wee)
# [Wee 2.0.1](https://github.com/weepower/wee)

Your blueprint for modern web development. To read more, visit [weepower.com](http://www.weepower.com).

Expand Down Expand Up @@ -28,7 +28,7 @@ JavaScript toolset to build scalable, well-organized browser functionality < 8KB
* **Polyfill support** for HTML5, SVG images, input placeholders, and ES5
* **Sourcemap output** to line match against unminified code

Structure baseline of markup, icons, and files to serve as a frontend roadmap
Structure baseline of markup, icons, and files to serve as a frontend roadmap
Grunt build process configured through a simple JSON file to compile, optimize, and minify your source

## Quick Start
Expand All @@ -40,7 +40,7 @@ Get started with Wee using one of these methods:

## Bugs

Have a bug or a feature request? [Open a new issue](https://github.com/weepower/wee/issues).
Have a bug or a feature request? [Open a new issue](https://github.com/weepower/wee/issues).
To view the working Wee todo list check out our public [Trello board](https://trello.com/b/7KbnQra9/wee).

#### Minimum browser support
Expand Down
2 changes: 1 addition & 1 deletion public/assets/js/polyfill/wee.placeholder.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand Down
2 changes: 1 addition & 1 deletion public/assets/js/polyfill/wee.slice.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand Down
2 changes: 1 addition & 1 deletion public/assets/js/polyfill/wee.svg.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand Down
2 changes: 1 addition & 1 deletion public/assets/wee/script/wee.assets.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand Down
2 changes: 1 addition & 1 deletion public/assets/wee/script/wee.chain.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand Down
2 changes: 1 addition & 1 deletion public/assets/wee/script/wee.data.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand Down
4 changes: 2 additions & 2 deletions public/assets/wee/script/wee.dom.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand Down Expand Up @@ -507,7 +507,7 @@ Wee.fn.extend({
case Wee._win:
return el.innerHeight;
case Wee._doc:
return Math.max(Wee._body.scrollHeight, Wee._body.offsetHeight,
return Math.max(Wee._body.scrollHeight, Wee._body.offsetHeight,
Wee._html.clientHeight, Wee._html.scrollHeight, Wee._html.offsetHeight);
default:
var height = el.offsetHeight;
Expand Down
2 changes: 1 addition & 1 deletion public/assets/wee/script/wee.events.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand Down
2 changes: 1 addition & 1 deletion public/assets/wee/script/wee.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand Down
4 changes: 2 additions & 2 deletions public/assets/wee/script/wee.routes.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand All @@ -13,7 +13,7 @@ Wee.fn.make('routes', {
},
// Retrieve or add route endpoints to route storage
// Optionally run the rules by setting init to true
// Returns
// Returns
map: function(routes, init) {
var curr = this.$get('routes', {});

Expand Down
2 changes: 1 addition & 1 deletion public/assets/wee/script/wee.screen.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand Down
2 changes: 1 addition & 1 deletion public/assets/wee/style/components/wee.buttons.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand Down
2 changes: 1 addition & 1 deletion public/assets/wee/style/components/wee.code.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand Down
2 changes: 1 addition & 1 deletion public/assets/wee/style/components/wee.forms.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand Down
2 changes: 1 addition & 1 deletion public/assets/wee/style/components/wee.tables.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand Down
2 changes: 1 addition & 1 deletion public/assets/wee/style/wee.legacy.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand Down
2 changes: 1 addition & 1 deletion public/assets/wee/style/wee.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 2.0.0 (weepower.com)
// Wee 2.0.1 (weepower.com)
// Licensed under Apache 2 (http://www.apache.org/licenses/LICENSE-2.0)
// DO NOT MODIFY THIS FILE

Expand Down
Loading

0 comments on commit 7eb39c8

Please sign in to comment.