Merge remote-tracking branch 'upstream/master'

This commit is contained in:
skullmasher 2016-11-01 04:45:49 +01:00
commit aec7fbdd6f
5 changed files with 16 additions and 22 deletions

View file

@ -1,6 +1,6 @@
{ {
"name": "KNACSS", "name": "KNACSS",
"version": "6.0.2", "version": "6.0.3",
"homepage": "http://www.knacss.com/", "homepage": "http://www.knacss.com/",
"authors": [ "authors": [
"Raphaël GOETTER, Alsacreations" "Raphaël GOETTER, Alsacreations"

View file

@ -1,6 +1,6 @@
{ {
"name": "knacss", "name": "knacss",
"version": "6.0.2", "version": "6.0.3",
"homepage": "http://www.knacss.com/", "homepage": "http://www.knacss.com/",
"bugs": "https://github.com/alsacreations/KNACSS/issues", "bugs": "https://github.com/alsacreations/KNACSS/issues",
"author": [ "author": [

View file

@ -1,7 +1,7 @@
// Config file and project variables // Config file and project variables
// font sizes // font sizes
$base-font-size : 1.6rem !default; // ex. 1.4rem would be "14px" equivalent $base-font-size : 1.6rem !default; // ex. 1.6rem would be "16px" equivalent
$line-height : 1.5 !default; // equiv line-height 1.5 $line-height : 1.5 !default; // equiv line-height 1.5
$h1-size : 3.2rem !default; // equiv "32px" $h1-size : 3.2rem !default; // equiv "32px"
$h2-size : 2.8rem !default; // equiv "28px" $h2-size : 2.8rem !default; // equiv "28px"
@ -16,20 +16,14 @@ $font-stack-headings : sans-serif !default; // headings font
$font-stack-monospace : consolas, courier, monospace !default; // monospace font $font-stack-monospace : consolas, courier, monospace !default; // monospace font
// font colors // font colors
$base-color : #000 !default; // text color on body and content $base-color : #000 !default; // text color on body and content
$alpha-color : #000 !default; // text color on primary elements $alpha-color : #fff !default;
$beta-color : #000 !default; // text color on secondary elements $beta-color : #333 !default;
$headings-color : #000 !default; // text color on headings $gamma-color : #000 !default;
$headings-1-color : #000 !default; // text color on headings level 1 $delta-color : #000 !default;
$headings-2-color : #000 !default; // text color on headings level 2 $epsilon-color : #000 !default;
$headings-3-color : #000 !default; // text color on headings level 3 $zeta-color : #333 !default;
$base-color-link : #333 !default; // base links color $theta-color : #000 !default;
$base-color-link-hover : #000 !default; // base hovered/focused links color
// backgrounds
$base-background : #fff !default; // body background color
$alpha-background : #fff !default; // primary elements background color
$beta-background : #fff !default; // secondary elements background color
// spacings (choose unit you prefer) // spacings (choose unit you prefer)
$tiny-value : .5rem !default; // tiny value for margins / paddings $tiny-value : .5rem !default; // tiny value for margins / paddings

View file

@ -1,5 +1,5 @@
/*! /*!
* www.KNACSS.com V6.0.2 (27 octobre 2016) @author: Alsacreations, Raphael Goetter * www.KNACSS.com V6.0.3 (31 octobre 2016) @author: Alsacreations, Raphael Goetter
* Licence WTFPL http://www.wtfpl.net/ * Licence WTFPL http://www.wtfpl.net/
*/ */

View file

@ -21,16 +21,16 @@ html {
body { body {
font-size: $base-font-size; font-size: $base-font-size;
background-color: $base-background; background-color: $alpha-color;
color: $base-color; color: $base-color;
font-family: $font-stack-common; font-family: $font-stack-common;
line-height: $line-height; line-height: $line-height;
} }
a { a {
color: $base-color-link; color: $zeta-color;
&:hover, &:focus, &:active { &:hover, &:focus, &:active {
color: $base-color-link-hover; color: $base-color;
} }
} }