Merge remote-tracking branch 'upstream2/master'

This commit is contained in:
Hugo Giraudel 2013-07-09 12:34:16 +02:00
commit 0e8145bac2
4 changed files with 120 additions and 82 deletions

View File

@ -14,6 +14,9 @@ There is nothing to install. It is only a CSS file you can call as usual in the
<link rel="stylesheet" href="knacss.css" media="all">
... Or you can also the KNACSS Builder : http://knacss.com/builder/
Usage
-----
KNACSS is a collection of ready to use styles and snippets to kick start your project. Feel free to use it as a “reset”, then make it grow to suit your needs.

View File

@ -1,5 +1,5 @@
/*
* www.KNACSS.com V2.6e @author: Raphael Goetter, Alsacreations
* www.KNACSS.com V2.6i @author: Raphael Goetter, Alsacreations
* Licence CC-BY http://creativecommons.org/licenses/by/3.0/fr/
*/
@ -138,6 +138,17 @@ mark {
padding:2px 4px;
background: #ff0;
}
sup,
sub {
vertical-align: 0;
position: relative;
}
sup {
bottom: 1ex;
}
sub {
top: .5ex;
}
table { margin-bottom: 1.5em; }
@ -169,17 +180,6 @@ li ol {
img, table, td, blockquote, code, pre, textarea, input, video {
max-width: 100%;
}
/* you shall not pass */
div, textarea, table, td, th, code, pre, samp {
word-wrap: break-word;
-webkit-hyphens: auto;
-moz-hyphens: auto;
-ms-hyphens: auto;
-o-hyphens: auto;
hyphens: auto;
}
/* pictures */
img {
height: auto;
@ -259,7 +259,6 @@ body > script {display: none !important;}
.inbl {
display: inline-block;
vertical-align: top;
margin-right: -.25em;
}
/* flexbox layout */
@ -372,6 +371,8 @@ img.left, img.right {
.w800p { width: 800px; }
.w960p { width: 960px; }
.mw960p { max-width: 960px; }
.w1140p { width: 1140px; }
.mw1140p { max-width: 1140px; }
/* spacing helpers
p,m = padding,margin
@ -379,27 +380,27 @@ a,t,r,b,l = all,top,right,bottom,left
s,m,l,n,0 = small(10px),medium(20px),large(30px), zero or none(0)
source https://github.com/stubbornella/oocss/blob/master/core/spacing/space.css
*/
.m-reset, .ma0 { margin: 0 !important; }
.p-reset, .pa0 { padding: 0 !important; }
.ma1, .mas { margin: 10px !important; }
.ma2, .mam { margin: 20px !important; }
.ma3, .mal { margin: 30px !important; }
.m-reset, .ma0 { margin: 0; }
.p-reset, .pa0 { padding: 0; }
.ma1, .mas { margin: 10px; }
.ma2, .mam { margin: 20px; }
.ma3, .mal { margin: 30px; }
.pa1, .pas { padding: 10px; }
.pa2, .pam { padding: 20px; }
.pa3, .pal { padding: 30px; }
.mt0, .mtn { margin-top: 0 !important; }
.mt1, .mts { margin-top: 10px !important; }
.mt2, .mtm { margin-top: 20px !important; }
.mt3, .mtl { margin-top: 30px !important; }
.mt0, .mtn { margin-top: 0; }
.mt1, .mts { margin-top: 10px; }
.mt2, .mtm { margin-top: 20px; }
.mt3, .mtl { margin-top: 30px; }
.mr0, .mrn { margin-right: 0; }
.mr1, .mrs { margin-right: 10px; }
.mr2, .mrm { margin-right: 20px; }
.mr3, .mrl { margin-right: 30px; }
.mb0, .mbn { margin-bottom: 0 !important; }
.mb1, .mbs { margin-bottom: 10px !important; }
.mb2, .mbm { margin-bottom: 20px !important; }
.mb3, .mbl { margin-bottom: 30px !important; }
.mb0, .mbn { margin-bottom: 0; }
.mb1, .mbs { margin-bottom: 10px; }
.mb2, .mbm { margin-bottom: 20px; }
.mb3, .mbl { margin-bottom: 30px; }
.ml0, .mln { margin-left: 0; }
.ml1, .mls { margin-left: 10px; }
.ml2, .mlm { margin-left: 20px; }

View File

@ -1,4 +1,28 @@
/* ----------------------------- */
/* ==viewport fixing for RWD */
/* ----------------------------- */
@-webkit-viewport {
width: device-width;
zoom: 1.0;
}
@-moz-viewport {
width: device-width;
zoom: 1.0;
}
@-ms-viewport {
width: device-width;
zoom: 1.0;
}
@-o-viewport {
width: device-width;
zoom: 1.0;
}
@viewport {
width: device-width;
zoom: 1.0;
}
/* ----------------------------- */
/* ==desktop and retina medias */
/* ----------------------------- */
@ -11,7 +35,7 @@
}
/* ---------------------------------- */
/* ==Responsive large / medium / tiny */
/* ==Responsive large / small / tiny */
/* ---------------------------------- */
@media (min-width: 1280px) {
@ -72,35 +96,45 @@
.w800p,
.w960p,
.mw960p,
.medium-wauto { width: auto; }
.small-wauto { width: auto; }
/* layouts for medium (m) screens */
.medium-hidden,
/* you shall not pass */
div, textarea, table, td, th, code, pre, samp {
word-wrap: break-word;
-webkit-hyphens: auto;
-moz-hyphens: auto;
-ms-hyphens: auto;
-o-hyphens: auto;
hyphens: auto;
}
/* layouts for small (s) screens */
.small-hidden,
.tablet-hidden { display: none !important; }
.medium-visible { display: block !important; }
.medium-no-float {float: none; }
.medium-inbl {
.small-visible { display: block !important; }
.small-no-float {float: none; }
.small-inbl {
display: inline-block;
float: none;
vertical-align: top;
}
.medium-row {
.small-row {
display: table !important;
table-layout: fixed !important;
width: 100% !important;
}
.medium-col {
.small-col {
display: table-cell !important;
vertical-align: top !important;
}
/* widths for medium (m) screens */
.medium-w25 { width: 25% !important; }
.medium-w33 { width: 33.3333% !important; }
.medium-w50 { width: 50% !important; }
.medium-w66 { width: 66.6666% !important; }
.medium-w75 { width: 75% !important; }
.medium-w100 {
/* widths for small (s) screens */
.small-w25 { width: 25% !important; }
.small-w33 { width: 33.3333% !important; }
.small-w50 { width: 50% !important; }
.small-w66 { width: 66.6666% !important; }
.small-w75 { width: 75% !important; }
.small-w100 {
display: block !important;
float: none !important;
clear: none !important;
@ -109,9 +143,9 @@
margin-right: 0 !important;
border: 0;
}
/* margins for medium (m) screens */
.medium-ma0,
.medium-man { margin: 0 !important; }
/* margins for small (s) screens */
.small-ma0,
.small-man { margin: 0 !important; }
/* Responsive grids */
.grid4 > * {width: 49% !important; }

View File

@ -1,5 +1,5 @@
/*
* www.KNACSS.com V2.6d @author: Raphael Goetter, Alsacreations
* www.KNACSS.com V2.6i @author: Raphael Goetter, Alsacreations
* Licence CC-BY http://creativecommons.org/licenses/by/3.0/fr/
*/
@ -15,18 +15,19 @@
@gutter : 1.5%; // gutter value (%) for grid layouts
// LESS functions : don't touch ;)
.pxtoem (@fontsize) {font-size: (@fontsize / @basefont) + 0em;}
.line (@fontsize) {line-height: @l-h *2 / (@fontsize / @basefont) + 0em}
.mtop (@fontsize) {margin: @l-h / (@fontsize / @basefont) + 0em 0 0}
.grid (@number) {width: (100%-(@gutter*(@number - 1))) / @number;}
.pxtoem (@fontsize) {font-size: ((@fontsize / @basefont) + 0em);}
.line (@fontsize) {line-height: (@l-h *2 / (@fontsize / @basefont) + 0em)}
.mtop (@fontsize) {margin: (@l-h / (@fontsize / @basefont) + 0em) 0 0}
.grid (@number) {width: ((100%-(@gutter*(@number - 1))) / @number);}
.flow(@font-size, @base-font: @basefont, @base-height: @l-h) {
@coef: ceil(1 / (@base-height * @base-font / @font-size));
@size: (@font-size / @base-font) + 0em;
@height: (@base-font * @base-height / @font-size) + 0em;
font-size: @size;
line-height: @height * @coef;
margin-top: @height;
margin-bottom: 0;
@coef: ceil((1 / (@base-height * @base-font / @font-size)));
@size: ((@font-size / @base-font) + 0em);
@height: ((@base-font * @base-height / @font-size) + 0em);
font-size: @size;
line-height: (@height * @coef);
margin-top: @height;
margin-bottom: 0;
}
@ -42,7 +43,7 @@ body {
background-color: #fff;
color: #000;
font-family: "Century Gothic", helvetica, arial, sans-serif;
font-size: (@basefont / 10) + 0em;
font-size: ((@basefont / 10) + 0em);
line-height: @l-h; // adapt to your design
}
@ -176,16 +177,6 @@ img, table, td, blockquote, code, pre, textarea, input, video {
max-width: 100%;
}
/* you shall not pass */
div, textarea, table, td, th, code, pre, samp {
word-wrap: break-word;
-webkit-hyphens: auto;
-moz-hyphens: auto;
-ms-hyphens: auto;
-o-hyphens: auto;
hyphens: auto;
}
/* pictures */
img {
height: auto;
@ -267,7 +258,6 @@ body > script {display: none !important;}
.inbl {
display: inline-block;
vertical-align: top;
margin-right: -.25em;
}
/* flexbox layout */
@ -426,27 +416,27 @@ a,t,r,b,l = all,top,right,bottom,left
s,m,l,n = small(10px),medium(20px),large(30px),none(0)
source https://github.com/stubbornella/oocss/blob/master/core/spacing/space.css
*/
.m-reset, .ma0 { margin: 0 !important; }
.p-reset, .pa0 { padding: 0 !important; }
.ma1, .mas { margin: @smallvalue !important; }
.ma2, .mam { margin: @mediumvalue !important; }
.ma3, .mal { margin: @largevalue !important; }
.m-reset, .ma0 { margin: 0; }
.p-reset, .pa0 { padding: 0; }
.ma1, .mas { margin: @smallvalue; }
.ma2, .mam { margin: @mediumvalue; }
.ma3, .mal { margin: @largevalue; }
.pa1, .pas { padding: @smallvalue; }
.pa2, .pam { padding: @mediumvalue; }
.pa3, .pal { padding: @largevalue; }
.mt0, .mtn { margin-top: 0 !important; }
.mt1, .mts { margin-top: @smallvalue !important; }
.mt2, .mtm { margin-top: @mediumvalue !important; }
.mt3, .mtl { margin-top: @largevalue !important; }
.mt0, .mtn { margin-top: 0; }
.mt1, .mts { margin-top: @smallvalue; }
.mt2, .mtm { margin-top: @mediumvalue; }
.mt3, .mtl { margin-top: @largevalue; }
.mr0, .mrn { margin-right: 0; }
.mr1, .mrs { margin-right: @smallvalue; }
.mr2, .mrm { margin-right: @mediumvalue; }
.mr3, .mrl { margin-right: @largevalue; }
.mb0, .mbn { margin-bottom: 0 !important; }
.mb1, .mbs { margin-bottom: @smallvalue !important; }
.mb2, .mbm { margin-bottom: @mediumvalue !important; }
.mb3, .mbl { margin-bottom: @largevalue !important; }
.mb0, .mbn { margin-bottom: 0; }
.mb1, .mbs { margin-bottom: @smallvalue; }
.mb2, .mbm { margin-bottom: @mediumvalue; }
.mb3, .mbl { margin-bottom: @largevalue; }
.ml0, .mln { margin-left: 0; }
.ml1, .mls { margin-left: @smallvalue; }
.ml2, .mlm { margin-left: @mediumvalue; }
@ -673,6 +663,16 @@ textarea {
vertical-align: top !important;
}
/* you shall not pass */
div, textarea, table, td, th, code, pre, samp {
word-wrap: break-word;
-webkit-hyphens: auto;
-moz-hyphens: auto;
-ms-hyphens: auto;
-o-hyphens: auto;
hyphens: auto;
}
/* widths for medium (m) screens */
.medium-w25 { width: 25% !important; }
.medium-w33 { width: 33.3333% !important; }