Skip to content

Commit

Permalink
Merge branch 'origin/development'
Browse files Browse the repository at this point in the history
  • Loading branch information
leigeber committed Jan 9, 2014
2 parents 8e6b326 + e6b56ab commit badcdac
Show file tree
Hide file tree
Showing 17 changed files with 1,414 additions and 845 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# 1.1.2

2014-01-09

- FIXED: .background(none); will now compile correctly
- ADDED: Added comment to empty reponsive files to resolve LESS 1.6 compile issue
- ADDED: Added new baseColor, resize, and display mixins
- UPDATED: Slight cosmetic updates to the base index
- UPDATED: Updated LESS version in lib to 1.6.0

# 1.1.1

2013-12-22
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [Wee 1.1.1](https://github.com/weepower/wee)
# [Wee 1.1.2](https://github.com/weepower/wee)

Wee is a lightweight, extensible bootstrap for rapidly building responsive, semantic web projects. To read more, visit [http://www.weepower.com](http://www.weepower.com).

Expand Down
28 changes: 20 additions & 8 deletions assets/css/core/mixins.less
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,10 @@
.background-color (@color: @bodyBackground) {
background-color: @color;
}
.background-image (@filename) {
.background-image (@value) when (iskeyword(@value)) {
background-image: @value;
}
.background-image (@filename) when not (iskeyword(@filename)) {
background-image: url('@{imagePath}@{filename}');
}
.background-image (retina; @filename; @width: auto; @height: auto) {
Expand Down Expand Up @@ -1154,6 +1157,9 @@
.color (@color) {
color: @color;
}
.baseColor () {
.color(@baseColor);
}
.white () {
.color(@white);
}
Expand Down Expand Up @@ -1519,9 +1525,12 @@

// Other

.resizable (@value: both) {
.resize (@value) {
resize: @value;
}
.resizable (@value: both) {
.crop();
.resize(@value);
}
.hide-text () {
.crop();
Expand Down Expand Up @@ -1676,8 +1685,8 @@
clear: both;
&:after
&:before {
display: table;
.content();
.display(table);
}
&:after {
clear: both;
Expand Down Expand Up @@ -1739,11 +1748,14 @@
.align (top) {
.align-top();
}
.display (@value) {
display: @value;
}
.inline () {
display: inline;
.display(inline);
}
.inline-block () {
display: inline-block;
.display(inline-block);
}
.inline-block (@width) {
.inline-block();
Expand Down Expand Up @@ -1771,13 +1783,13 @@
visibility: visible;
}
.hide {
display: none;
.display(none);
}
.show {
display: inherit;
.display(inherit);
}
.block {
display: block;
.display(block);
}
.block (@width) {
.block();
Expand Down
1 change: 1 addition & 0 deletions assets/css/custom/breakpoints/desktop-large.less
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// Breakpoint rules
1 change: 1 addition & 0 deletions assets/css/custom/breakpoints/desktop-medium.less
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// Breakpoint rules
4 changes: 2 additions & 2 deletions assets/css/custom/screen.less
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ header[role='banner'] {
}
}
nav[role='navigation'] {
@blue: #006e89;
@blue: @linkColor;
@lightBlue: mix(@blue, #fff, 20%);
@darkBlue: darken(@blue, 5%);
.align(center);
Expand Down Expand Up @@ -94,9 +94,9 @@ footer[role='contentinfo'] {
.padding(vertical; 10; 8);
.container {
p {
.bold();
.centered-block(800px);
.spaced(2.8);
.text-shadow();
.white();
}
}
Expand Down
2 changes: 1 addition & 1 deletion assets/css/custom/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
// Headings //
//////////////

@headingColor: @linkColorHover; // Color
@headingColor: @linkColor; // Color
@headingFont: 'Noto Sans', sans-serif; // Font family
@headingFontWeight: 400; // Font weight
@headingLineHeight: 1.4em; // Line height
Expand Down
2 changes: 1 addition & 1 deletion assets/css/legacy.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/css/legacy.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 1.1.1 (weepower.com)
// Wee 1.1.2 (weepower.com)
// Licensed under the Apache License v2
// http://www.apache.org/licenses/LICENSE-2.0

Expand Down
2 changes: 1 addition & 1 deletion assets/css/style.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/style.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Wee 1.1.1 (weepower.com)
// Wee 1.1.2 (weepower.com)
// Licensed under the Apache License v2
// http://www.apache.org/licenses/LICENSE-2.0

Expand Down
3 changes: 0 additions & 3 deletions assets/js/lib/less-1.5.1.min.js

This file was deleted.

Loading

0 comments on commit badcdac

Please sign in to comment.