diff --git a/bower.json b/bower.json index 9a28026..e8cc846 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "KNACSS", - "version": "3.0.3", + "version": "3.0.4", "homepage": "http://www.knacss.com/", "authors": [ "Raphaël GOETTER, Alsacreations" diff --git a/less/00-config.less b/less/_00-config.less similarity index 86% rename from less/00-config.less rename to less/_00-config.less index 32ad13b..f9a766e 100644 --- a/less/00-config.less +++ b/less/_00-config.less @@ -1,14 +1,5 @@ // Config file : variables, mixins, ... -// booleans -@enable-ie678 : true; // "true" to activate IE6/IE7/IE8 support -@enable-styling : true; // "true" to design basic elements like code, mark, blockquotes, etc. -@enable-gmaps : true; // if google maps is used -@enable-skip-links : true; // "true" to design skip links for accessibility concerns -@enable-hyphens : true; // activate automatic hyphens on small screens -@enable-helpers-width : true; // decide whether or not you need width helpers -@enable-helpers-spacing : true; // decide whether or not you need spacing helpers - // font sizes @base-font-size : 14px; // if "14px" then 1em = 14px @line-height : 1.5; // equiv line-height 1.5 @@ -21,16 +12,18 @@ // font stacks @font-stack-common : Helvetica, Arial, sans-serif; // common font +@font-stack-headings : Helvetica, Arial, sans-serif; // headings font @font-stack-monospace : Consolas, 'DejaVu Sans Mono', Courier, monospace; // monospace font @font-stack-universal : FreeSans, Arimo, "Droid Sans", Helvetica, Arial, sans-serif; // universal stack // font colors -@base-color : #000; // text color on body -@base-color-link : #333; // primary links color; -@base-color-link-hover : #000; // primary hovered/focused links color; +@primary-color : #000; // text color on body and content +@headings-color : #000; // text color on headings +@primary-color-link : #333; // primary links color +@primary-color-link-hover : #000; // primary hovered/focused links color // backgrounds -@base-background : #fff; // body background color +@primary-background : #fff; // body background color // spacings @tiny-value : 0.5em; // tiny value for margins / paddings @@ -51,6 +44,15 @@ // misc @gutter : 20px; // gutter value for grid layouts. Unit can be: %, px, em, rem +// booleans +@enable-ie678 : true; // "true" to activate IE6/IE7/IE8 support +@enable-styling : true; // "true" to design basic elements like code, mark, blockquotes, etc. +@enable-gmaps : true; // if google maps is used +@enable-skip-links : true; // "true" to design skip links for accessibility concerns +@enable-hyphens : true; // activate automatic hyphens on small screens +@enable-helpers-width : true; // decide whether or not you need width helpers +@enable-helpers-spacing : true; // decide whether or not you need spacing helpers + // LESS mixins : don't touch or you'll be banned ;) // px to em/rem .rem(@size, @bf: @base-font-size){ diff --git a/less/01-base.less b/less/_01-base.less similarity index 97% rename from less/01-base.less rename to less/_01-base.less index a4938e4..c9278ab 100644 --- a/less/01-base.less +++ b/less/_01-base.less @@ -1,6 +1,5 @@ -@import "00-config"; /*! -* www.KNACSS.com V3.0.3 (2014-05-19) @author: Raphael Goetter, Alsacreations +* www.KNACSS.com V3.0.4 (2014-06-30) @author: Raphael Goetter, Alsacreations * Licence WTFPL http://www.wtfpl.net/ */ @@ -69,12 +68,19 @@ body { /* set body font-size in em (1.4em equiv "14px") */ font-size: unit((@base-font-size / 10), em); - background-color: @base-background; - color: @base-color; + background-color: @primary-background; + color: @primary-color; font-family: @font-stack-common; line-height: @line-height; } +a { + color: @primary-color-link; + &:hover, &:focus, &:active { + color: @primary-color-link-hover; + } +} + /* font-sizing for content */ p, .p-like, diff --git a/less/02-grids.less b/less/_02-grids.less similarity index 99% rename from less/02-grids.less rename to less/_02-grids.less index 670c5da..6a38d3b 100644 --- a/less/02-grids.less +++ b/less/_02-grids.less @@ -1,5 +1,3 @@ -@import "00-config"; - /* ---------------------------------- */ /* ==classic grids */ /* .. use it when gutter size matters */ diff --git a/less/03-tables.less b/less/_03-tables.less similarity index 96% rename from less/03-tables.less rename to less/_03-tables.less index 0bff8a1..d83ffb5 100644 --- a/less/03-tables.less +++ b/less/_03-tables.less @@ -1,4 +1,3 @@ -@import "00-config"; /* ----------------------------- */ /* ==tables */ /* ----------------------------- */ diff --git a/less/04-forms.less b/less/_04-forms.less similarity index 98% rename from less/04-forms.less rename to less/_04-forms.less index 0235ca8..cd4a570 100644 --- a/less/04-forms.less +++ b/less/_04-forms.less @@ -1,4 +1,3 @@ -@import "00-config"; /* ----------------------------- */ /* ==forms */ /* ----------------------------- */ diff --git a/less/05-icons.less b/less/_05-icons.less similarity index 99% rename from less/05-icons.less rename to less/_05-icons.less index 071e404..e7721aa 100644 --- a/less/05-icons.less +++ b/less/_05-icons.less @@ -1,4 +1,3 @@ -@import "00-config"; /* ----------------------------- */ /* ==icons and bullets */ /* ----------------------------- */ diff --git a/less/06-rwd.less b/less/_06-rwd.less similarity index 99% rename from less/06-rwd.less rename to less/_06-rwd.less index 9da7e93..09e9dc6 100644 --- a/less/06-rwd.less +++ b/less/_06-rwd.less @@ -1,4 +1,3 @@ -@import "00-config"; /* ----------------------------- */ /* ==desktop and HD devices */ /* ----------------------------- */ diff --git a/less/07-flexbox.less b/less/_07-flexbox.less similarity index 93% rename from less/07-flexbox.less rename to less/_07-flexbox.less index 5b9ec03..dead3ad 100644 --- a/less/07-flexbox.less +++ b/less/_07-flexbox.less @@ -1,4 +1,3 @@ -@import "00-config"; /* flexbox layout Tutorial: http://knacss.com/demos/tutoriel.html#flex */ .flex { diff --git a/less/08-print.less b/less/_08-print.less similarity index 98% rename from less/08-print.less rename to less/_08-print.less index e735542..83f504e 100644 --- a/less/08-print.less +++ b/less/_08-print.less @@ -1,4 +1,3 @@ -@import "00-config"; /* quick print reset */ @media print { diff --git a/less/09-booleans.less b/less/_09-booleans.less similarity index 97% rename from less/09-booleans.less rename to less/_09-booleans.less index 67bab6f..39d0b90 100644 --- a/less/09-booleans.less +++ b/less/_09-booleans.less @@ -1,4 +1,3 @@ -@import "00-config"; /* ----------------------------- */ /* ==booleans */ /* ----------------------------- */ diff --git a/less/10-gmaps.less b/less/_10-gmaps.less similarity index 94% rename from less/10-gmaps.less rename to less/_10-gmaps.less index 15cfde4..2276f55 100644 --- a/less/10-gmaps.less +++ b/less/_10-gmaps.less @@ -1,4 +1,3 @@ -@import "00-config"; /* ----------------------------- */ /* ==gmaps support */ /* ----------------------------- */ diff --git a/less/11-ie.less b/less/_11-ie.less similarity index 99% rename from less/11-ie.less rename to less/_11-ie.less index 0774f94..366b8b8 100644 --- a/less/11-ie.less +++ b/less/_11-ie.less @@ -1,4 +1,3 @@ -@import "00-config"; /* ----------------------------- */ /* ==IE6, IE7, IE8 support */ /* ----------------------------- */ diff --git a/less/12-styling.less b/less/_12-styling.less similarity index 98% rename from less/12-styling.less rename to less/_12-styling.less index 25aca56..cdeecca 100644 --- a/less/12-styling.less +++ b/less/_12-styling.less @@ -1,4 +1,3 @@ -@import "00-config"; /* ----------------------------- */ /* ==minor stylings */ /* ----------------------------- */ diff --git a/less/knacss.less b/less/knacss.less index d7ea46f..0316715 100644 --- a/less/knacss.less +++ b/less/knacss.less @@ -1,21 +1,21 @@ // LESS config file -@import "00-config"; +@import "_00-config"; // LESS base styles -@import "01-base"; +@import "_01-base"; // LESS files : chose the ones you need -@import "02-grids"; -@import "03-tables"; -@import "04-forms"; -@import "05-icons"; -@import "06-rwd"; -@import "07-flexbox"; -@import "08-print"; -@import "09-booleans"; -@import "10-gmaps"; -@import "11-ie"; -@import "12-styling"; +@import "_02-grids"; +@import "_03-tables"; +@import "_04-forms"; +@import "_05-icons"; +@import "_06-rwd"; +@import "_07-flexbox"; +@import "_08-print"; +@import "_09-booleans"; +@import "_10-gmaps"; +@import "_11-ie"; +@import "_12-styling"; /* ----------------------------- */ /* ==own stylesheet */ diff --git a/sass/00-config.scss b/sass/_00-config.scss similarity index 84% rename from sass/00-config.scss rename to sass/_00-config.scss index 6032595..5b2a436 100644 --- a/sass/00-config.scss +++ b/sass/_00-config.scss @@ -1,15 +1,5 @@ // Config file : variables, mixins, ... - -// booleans -$enable-ie678 : true; // "true" to activate IE6/IE7/IE8 support -$enable-styling : true; // "true" to design basic elements like code, mark, blockquotes, etc. -$enable-gmaps : true; // if google maps is used -$enable-skip-links : true; // "true" to design skip links for accessibility concerns -$enable-hyphens : true; // activate automatic hyphens on small screens -$enable-helpers-width : true; // decide whether or not you need width helpers -$enable-helpers-spacing : true; // decide whether or not you need spacing helpers - // font sizes $base-font-size : 14px; // if "14px" then 1em = 14px $line-height : 1.5; // equiv line-height 1.5 @@ -22,16 +12,17 @@ $h6-size : 1.6rem; // equiv "16px" // font stacks $font-stack-common : Helvetica, Arial, sans-serif; // common font +$font-stack-headings : Helvetica, Arial, sans-serif; // headings font $font-stack-monospace : Consolas, 'DejaVu Sans Mono', Courier, monospace; // monospace font $font-stack-universal : FreeSans, Arimo, "Droid Sans", Helvetica, Arial, sans-serif; // universal stack // font colors -$base-color : #000; // text color on body -$base-color-link : #333; // primary links color; -$base-color-link-hover : #000; // primary hovered/focused links color; +$primary-color : #000; // text color on body +$primary-color-link : #333; // primary links color; +$primary-color-link-hover : #000; // primary hovered/focused links color; // backgrounds -$base-background : #fff; // body background color +$primary-background : #fff; // body background color // spacings $tiny-value : 0.5em; // tiny value for margins / paddings @@ -44,13 +35,22 @@ $ultra-large-value : 10em; // ultra large value for margins / paddings // breakpoints $tiny-screen : 320px; // tiny screens media query $small-screen : 480px; // small screens media query -$medium-screen : 768px; // small screens media query +$medium-screen : 768px; // medium screens media query $large-screen : 1024px; // large screens media query $extra-large-screen : 1280px; // extra large screens media query $ultra-large-screen : 1600px; // ultra large screens media query // misc -$gutter : 20px; // gutter value (%, px, em, rem) for grid layouts +$gutter : 20px; // gutter value for grid layouts. Unit can be: %, px, em, rem + +// booleans +$enable-ie678 : true; // "true" to activate IE6/IE7/IE8 support +$enable-styling : true; // "true" to design basic elements like code, mark, blockquotes, etc. +$enable-gmaps : true; // if google maps is used +$enable-skip-links : true; // "true" to design skip links for accessibility concerns +$enable-hyphens : true; // activate automatic hyphens on small screens +$enable-helpers-width : true; // decide whether or not you need width helpers +$enable-helpers-spacing : true; // decide whether or not you need spacing helpers // Sass mixins : don't touch or you'll be banned ;) diff --git a/sass/01-base.scss b/sass/_01-base.scss similarity index 98% rename from sass/01-base.scss rename to sass/_01-base.scss index 431bad6..d6a3da5 100644 --- a/sass/01-base.scss +++ b/sass/_01-base.scss @@ -1,6 +1,5 @@ -@import "00-config"; /*! -* www.KNACSS.com V3.0.3 (2014-05-19) @author: Raphael Goetter, Alsacreations (with help from Hugo Giraudel) +* www.KNACSS.com V3.0.4 (2014-06-30) @author: Raphael Goetter, Alsacreations (with help from Hugo Giraudel) * Licence WTFPL http://www.wtfpl.net/ */ @@ -68,8 +67,8 @@ body { /* set body font-size in em (1.4em equiv "14px") */ font-size: ($base-font-size / 10px) + em; - background-color: $base-background; - color: $base-color; + background-color: $primary-background; + color: $primary-color; font-family: $font-stack-common; line-height: $line-height; } diff --git a/sass/02-grids.scss b/sass/_02-grids.scss similarity index 99% rename from sass/02-grids.scss rename to sass/_02-grids.scss index 02ff6b8..3c4aea3 100644 --- a/sass/02-grids.scss +++ b/sass/_02-grids.scss @@ -1,5 +1,3 @@ -@import "00-config"; - /* ---------------------------------- */ /* ==classic grids */ /* .. use it when gutter size matters */ diff --git a/sass/03-tables.scss b/sass/_03-tables.scss similarity index 96% rename from sass/03-tables.scss rename to sass/_03-tables.scss index 9a0be4f..28e5e0f 100644 --- a/sass/03-tables.scss +++ b/sass/_03-tables.scss @@ -1,4 +1,3 @@ -@import "00-config"; /* ----------------------------- */ /* ==tables */ /* ----------------------------- */ diff --git a/sass/04-forms.scss b/sass/_04-forms.scss similarity index 98% rename from sass/04-forms.scss rename to sass/_04-forms.scss index 0235ca8..cd4a570 100644 --- a/sass/04-forms.scss +++ b/sass/_04-forms.scss @@ -1,4 +1,3 @@ -@import "00-config"; /* ----------------------------- */ /* ==forms */ /* ----------------------------- */ diff --git a/sass/05-icons.scss b/sass/_05-icons.scss similarity index 99% rename from sass/05-icons.scss rename to sass/_05-icons.scss index 4b1cd4c..01ec839 100644 --- a/sass/05-icons.scss +++ b/sass/_05-icons.scss @@ -1,4 +1,3 @@ -@import "00-config"; /* ----------------------------- */ /* ==icons and bullets */ /* ----------------------------- */ diff --git a/sass/06-rwd.scss b/sass/_06-rwd.scss similarity index 99% rename from sass/06-rwd.scss rename to sass/_06-rwd.scss index 0c39d11..c99ada8 100644 --- a/sass/06-rwd.scss +++ b/sass/_06-rwd.scss @@ -1,4 +1,3 @@ -@import "00-config"; /* ----------------------------- */ /* ==desktop and HD devices */ /* ----------------------------- */ diff --git a/sass/07-flexbox.scss b/sass/_07-flexbox.scss similarity index 93% rename from sass/07-flexbox.scss rename to sass/_07-flexbox.scss index 5b9ec03..dead3ad 100644 --- a/sass/07-flexbox.scss +++ b/sass/_07-flexbox.scss @@ -1,4 +1,3 @@ -@import "00-config"; /* flexbox layout Tutorial: http://knacss.com/demos/tutoriel.html#flex */ .flex { diff --git a/sass/08-print.scss b/sass/_08-print.scss similarity index 98% rename from sass/08-print.scss rename to sass/_08-print.scss index 1d6ce38..a567590 100644 --- a/sass/08-print.scss +++ b/sass/_08-print.scss @@ -1,4 +1,3 @@ -@import "00-config"; /* quick print reset */ @media print { * { diff --git a/sass/09-booleans.scss b/sass/_09-booleans.scss similarity index 97% rename from sass/09-booleans.scss rename to sass/_09-booleans.scss index d57333e..6f274f1 100644 --- a/sass/09-booleans.scss +++ b/sass/_09-booleans.scss @@ -1,4 +1,3 @@ -@import "00-config"; /* ----------------------------- */ /* ==booleans */ /* ----------------------------- */ diff --git a/sass/10-gmaps.scss b/sass/_10-gmaps.scss similarity index 94% rename from sass/10-gmaps.scss rename to sass/_10-gmaps.scss index 257ce18..c4fa06d 100644 --- a/sass/10-gmaps.scss +++ b/sass/_10-gmaps.scss @@ -1,4 +1,3 @@ -@import "00-config"; /* ----------------------------- */ /* ==gmaps support */ /* ----------------------------- */ diff --git a/sass/11-ie.scss b/sass/_11-ie.scss similarity index 98% rename from sass/11-ie.scss rename to sass/_11-ie.scss index dcc1d07..272afa6 100644 --- a/sass/11-ie.scss +++ b/sass/_11-ie.scss @@ -1,4 +1,3 @@ -@import "00-config"; /* ----------------------------- */ /* ==IE6, IE7, IE8 support */ /* ----------------------------- */ diff --git a/sass/12-styling.scss b/sass/_12-styling.scss similarity index 98% rename from sass/12-styling.scss rename to sass/_12-styling.scss index aabc03a..3fc0aaa 100644 --- a/sass/12-styling.scss +++ b/sass/_12-styling.scss @@ -1,4 +1,3 @@ -@import "00-config"; /* ----------------------------- */ /* ==minor stylings */ /* ----------------------------- */ diff --git a/sass/knacss.scss b/sass/knacss.scss index 52f62c7..15944fa 100644 --- a/sass/knacss.scss +++ b/sass/knacss.scss @@ -1,21 +1,21 @@ // Sass config file -@import "00-config"; +@import "_00-config"; // Sass base styles -@import "01-base"; +@import "_01-base"; // Sass files : chose the ones you need -@import "02-grids"; -@import "03-tables"; -@import "04-forms"; -@import "05-icons"; -@import "06-rwd"; -@import "07-flexbox"; -@import "08-print"; -@import "09-booleans"; -@import "10-gmaps"; -@import "11-ie"; -@import "12-styling"; +@import "_02-grids"; +@import "_03-tables"; +@import "_04-forms"; +@import "_05-icons"; +@import "_06-rwd"; +@import "_07-flexbox"; +@import "_08-print"; +@import "_09-booleans"; +@import "_10-gmaps"; +@import "_11-ie"; +@import "_12-styling"; /* ----------------------------- */ /* ==own stylesheet */