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 22, 2014
2 parents 578f251 + 59bfaff commit df11c15
Show file tree
Hide file tree
Showing 20 changed files with 189 additions and 52 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@ Thumbs.db
.jshintrc
mixture.json
prepros.json
codekit-config.json

# Compile
package.json
project.json
Gruntfile.js
node_modules/
bower_components/

# Wee
project.json

# Source Maps
.map
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
# 1.1.4

2014-01-20

- FIXED: Resolved issue with columns wrapping occasionally in some versions of Chrome and Firefox
- ADDED: Added new options to variables.less for border width or disabled borders on inputs
- ADDED: Added final touches to the module loading files
- UPDATED: Full compliance with strictMath option

# 1.1.3

2014-01-13

- FIXED: resolved problem with .right() mixin
- FIXED: Resolved problem with .right() mixin
- UPDATED: Updated LESS lib to 1.6.1
- UPDATED: Updated holder.js to 2.3
- UPDATED: Tweaked gitignore to exclude sourcemap .map files
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.3](https://github.com/weepower/wee)
# [Wee 1.1.4](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
51 changes: 37 additions & 14 deletions assets/css/core/base.less
Original file line number Diff line number Diff line change
Expand Up @@ -526,16 +526,11 @@ dd {
.input () {
.background(@inputBackground);
.background-clip();
.border(@inputBorderColor);
.color(@inputColor);
.fill();
.padding(@inputPaddingVertical; @inputPaddingHorizontal);
.spaced(@inputMarginBottom);
&:hover {
.border(@inputBorderColorHover);
}
&:focus {
.border(@inputBorderColorFocus);
&:required {
&:invalid {
.background(@inputBackgroundInvalid);
Expand All @@ -546,27 +541,55 @@ dd {
}
&:invalid {
.background(@inputBackgroundInvalid);
.border(@inputBorderColorInvalid);
.color(@inputColorInvalid);
&:hover {
.border(@inputBorderColorInvalidHover);
.border () when not (@inputBorderWidthInvalid = 0)
and not (@inputBorderWidthInvalid = false) {
.border(@inputBorderColorInvalid; @inputBorderWidthInvalid);
&:hover {
.border(@inputBorderColorInvalidHover);
}
&:focus {
.border(@inputBorderColorInvalidFocus);
}
}
&:focus {
.border(@inputBorderColorInvalidFocus);
.border () when (@inputBorderWidthInvalid = 0), (@inputBorderWidthInvalid = false) {
.border-width(0);
}
.border();
}
&:required {
.background(@inputBackgroundRequired);
.border(@inputBorderColorRequired);
.color(@inputColorRequired);
&:hover {
.border(@inputBorderColorRequiredHover);
.border () when not (@inputBorderWidthRequired = 0)
and not (@inputBorderWidthRequired = false) {
.border(@inputBorderColorRequired; @inputBorderWidthRequired);
&:hover {
.border(@inputBorderColorRequiredHover);
}
&:focus {
.border(@inputBorderColorRequiredFocus);
}
}
&:focus {
.border(@inputBorderColorRequiredFocus);
.border () when (@inputBorderWidthRequired = 0), (@inputBorderWidthRequired = false) {
.border-width(0);
}
.border();
}
}
.input () when not (@inputBorderWidth = 0)
and not (@inputBorderWidth = false) {
.border(@inputBorderColor; @inputBorderWidth);
&:hover {
.border(@inputBorderColorHover);
}
&:focus {
.border(@inputBorderColorFocus);
}
}
.input () when (@inputBorderWidth = 0), (@inputBorderWidth = false) {
.border-width(0);
}
.input () when not (@inputMinHeight = 0)
and not (@inputMinHeight = false) {
.min-height(@inputMinHeight);
Expand Down
10 changes: 5 additions & 5 deletions assets/css/core/mixins.less
Original file line number Diff line number Diff line change
Expand Up @@ -1594,7 +1594,7 @@
.padding(horizontal; @padding);
}
.wee-row-spacing (@spaceless) when not (@spaceless = true) {
.letter-spacing(-.31em);
.letter-spacing(-.32em);
}
.row (@margin: @gridMargin; @spaceless: @gridSpaceless) {
.margin(left; (@margin * -1));
Expand All @@ -1610,7 +1610,7 @@
.wee-column-reset(@spaceless);
}
.wee-column-spacing (@spaceless) when not (@spaceless = true) {
.margin(right; -.31em);
.margin(right; -.32em);
}
.wee-column-reset (@spaceless) when not (@gridSpaceless = true) {
.letter-spacing(normal);
Expand Down Expand Up @@ -1651,7 +1651,7 @@
.margin(left; ((100% / @columns) * @share));
}
.offset (spaced; @share; @columns: @gridColumns; @margin: (@gridMargin / 2)) {
.margin(left; ((100% / @columns) * @share) + (@margin * 2));
.margin(left; (((100% / @columns) * @share) + (@margin * 2)));
}
.pull (@share; @columns: @gridColumns) {
.relative();
Expand Down Expand Up @@ -1694,10 +1694,10 @@
}
.img-left {
.left();
.margin(.31em; @imageMarginSide; @imageMarginBottom; 0);
.margin(.32em; @imageMarginSide; @imageMarginBottom; 0);
}
.img-right {
.margin(.31em; 0; @imageMarginBottom; @imageMarginSide);
.margin(.32em; 0; @imageMarginBottom; @imageMarginSide);
.right();
}
.align-center {
Expand Down
89 changes: 89 additions & 0 deletions assets/css/core/module-legacy.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
// Module IE Compatability

@legacyMode: true;

@import (reference) '../core/variables.less'; // Core configuration
@import (reference) '../custom/variables.less'; // Custom configuration
@import (reference) '../../modules/@{module}/css/core/variables.less'; // Module base configuration
@import (reference) '../../modules/@{module}/css/custom/variables.less'; // Module custom configuration
@import (reference) '../core/mixins.less'; // Mixins
@import (reference) 'module-responsive.less'; // Responsive components

// Override Component Output

@tableEnabled: false;
@formEnabled: false;
@buttonEnabled: false;

@import (reference) '../../modules/@{module}/css/core/base.less'; // Baseline

.responsiveTesting () when (@responsiveTestMode = true) {
body {
.padding(bottom; 0);
&:after {
.hide();
}
}
}

.responsiveTesting();

// Normalization

table {
white-space: normal;
}
button,
input,
select,
textarea {
.align-middle();
}
.inline-block () {
*display: inline;
zoom: 1;
}
.clear () {
*zoom: 1;
}

///////////////////
// Media Queries //
///////////////////

html {
font-family: "'@{ieBreakpoint}'";
}

.ie-body (@width) {
body {
.min-width(@width);
}
}

.fallback (@ieBreakpoint) when (@ieBreakpoint > 1) {
.ie-body(@mobileLandscapeWidth);
.mobile-landscape();
}
.fallback (@ieBreakpoint) when (@ieBreakpoint > 2) {
.ie-body(@tabletPortraitWidth);
.tablet-portrait();
}
.fallback (@ieBreakpoint) when (@ieBreakpoint > 3) {
.ie-body(@desktopSmallWidth);
.desktop-small();
}
.fallback (@ieBreakpoint) when (@ieBreakpoint > 4) {
.ie-body(@desktopMediumWidth);
.desktop-medium();
}
.fallback (@ieBreakpoint) when (@ieBreakpoint > 5) {
.ie-body(@desktopLargeWidth);
.desktop-large();
}

.responsive () when (@responsiveEnabled = true) {
.fallback(@ieBreakpoint);
}

.responsive();
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
////////////////
// Responsive //
////////////////
///////////////////////
// Module Responsive //
///////////////////////

// Import Breakpoints

.mobile-landscape () when not (@mobileLandscapeWidth = false) {
@import '../../modules/@{module}/css/breakpoints/mobile-landscape.less';
@import '../../modules/@{module}/css/core/breakpoints/mobile-landscape.less';
@import '../../modules/@{module}/css/custom/breakpoints/mobile-landscape.less';
}
.tablet-portrait () when not (@tabletPortraitWidth = false) {
@import '../../modules/@{module}/css/breakpoints/tablet-portrait.less';
@import '../../modules/@{module}/css/core/breakpoints/tablet-portrait.less';
@import '../../modules/@{module}/css/custom/breakpoints/tablet-portrait.less';
}
.desktop-small () when not (@desktopSmallWidth = false) {
@import '../../modules/@{module}/css/breakpoints/desktop-small.less';
@import '../../modules/@{module}/css/core/breakpoints/desktop-small.less';
@import '../../modules/@{module}/css/custom/breakpoints/desktop-small.less';
}
.desktop-medium () when not (@desktopMediumWidth = false) {
@import '../../modules/@{module}/css/breakpoints/desktop-medium.less';
@import '../../modules/@{module}/css/core/breakpoints/desktop-medium.less';
@import '../../modules/@{module}/css/custom/breakpoints/desktop-medium.less';
}
.desktop-large () when not (@desktopLargeWidth = false) {
@import '../../modules/@{module}/css/breakpoints/desktop-large.less';
@import '../../modules/@{module}/css/core/breakpoints/desktop-large.less';
@import '../../modules/@{module}/css/custom/breakpoints/desktop-large.less';
}

// Components
Expand Down
15 changes: 8 additions & 7 deletions assets/css/core/variables.less
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
////////////
// Custom //
////////////

// Add custom global variables here

////////////
// Layout //
////////////
Expand Down Expand Up @@ -74,7 +68,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 All @@ -100,6 +94,8 @@
@imagePath: '../img/'; // Image path (absolute|relative)
@spriteFilename: 'sprite.png'; // Sprite filename, relative to imagePath

// Margin applied when using img-left and img-right classes

@imageMarginBottom: 2; // Vertical margin
@imageMarginSide: 2; // Horizontal margin

Expand Down Expand Up @@ -303,6 +299,7 @@
@inputBorderColor: @lightGray; // Border color
@inputBorderColorHover: darken(@inputBorderColor, 10%); // Hover border color
@inputBorderColorFocus: darken(@inputBorderColor, 20%); // Focus border color
@inputBorderWidth: 1px; // Border width (false to disable)
@inputRounded: false; // Border radius or false to disable

@inputMinWidth: 200px; // Minimum width or false for no minimum
Expand All @@ -324,6 +321,7 @@
@inputBorderColorInvalid: #a41818; // Border color
@inputBorderColorInvalidHover: darken(@inputBorderColorInvalid, 10%); // Hover border color
@inputBorderColorInvalidFocus: darken(@inputBorderColorInvalid, 20%); // Focus border color
@inputBorderWidthInvalid: 1px; // Border width (false to disable)

// Required Inputs

Expand All @@ -334,13 +332,16 @@
@inputBorderColorRequired: @darkGray; // Border color
@inputBorderColorRequiredHover: darken(@inputBorderColorRequired, 10%); // Hover border color
@inputBorderColorRequiredFocus: darken(@inputBorderColorRequired, 20%); // Focus border color
@inputBorderWidthRequired: 1px; // Border width (false to disable)

// Disabled Inputs

@inputColorDisabled: @darkGray; // Font color

@inputBackgroundDisabled: @lightestGray; // Background color

@inputBorderWidthDisabled: false; // Border width (false to disable)

@inputCursorDisabled: not-allowed; // Cursor style

// Selects
Expand Down
2 changes: 1 addition & 1 deletion assets/css/custom/modules.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Module Loading

//@import '../../modules/forms/css/screen.less';
//@import '../../modules/module-name/css/style.less';
Loading

0 comments on commit df11c15

Please sign in to comment.