From 96d5b2e5f854a3931f0a8fc7c41f678858b7cbe9 Mon Sep 17 00:00:00 2001 From: raphaelgoettter Date: Wed, 4 Mar 2015 15:37:11 +0100 Subject: [PATCH] =?UTF-8?q?r=C3=A9organisation=20des=20fichiers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - le fichier dédié "IE" disparait - le fichier "booleans" devient "misc" (plus cohérent) - le fichier "gmaps" est inclus dans "booleans" --- less/{_10-booleans.less => _10-misc.less} | 22 +++- less/_11-gmaps.less | 18 ---- less/{_13-styling.less => _11-styling.less} | 12 ++- less/_12-ie.less | 107 ------------------- less/knacss.less | 3 +- sass/{_10-booleans.scss => _10-misc.scss} | 19 +++- sass/_11-gmaps.scss | 18 ---- sass/{_13-styling.scss => _11-styling.scss} | 11 +- sass/_12-ie.scss | 111 -------------------- sass/knacss.scss | 3 +- 10 files changed, 51 insertions(+), 273 deletions(-) rename less/{_10-booleans.less => _10-misc.less} (67%) delete mode 100644 less/_11-gmaps.less rename less/{_13-styling.less => _11-styling.less} (97%) delete mode 100644 less/_12-ie.less rename sass/{_10-booleans.scss => _10-misc.scss} (68%) delete mode 100644 sass/_11-gmaps.scss rename sass/{_13-styling.scss => _11-styling.scss} (95%) delete mode 100644 sass/_12-ie.scss diff --git a/less/_10-booleans.less b/less/_10-misc.less similarity index 67% rename from less/_10-booleans.less rename to less/_10-misc.less index 07fc1fa..808ee3b 100644 --- a/less/_10-booleans.less +++ b/less/_10-misc.less @@ -1,9 +1,8 @@ /* ----------------------------- */ -/* ==skip-hyphens */ +/* ==misc rules */ /* ----------------------------- */ /* styling skip links */ - .skip-links { position: absolute; @@ -24,7 +23,7 @@ } } -// hyphens +// hyphens on small screens @media (max-width: @small-screen) { /* you shall not pass */ div, @@ -38,4 +37,19 @@ word-wrap: break-word; hyphens: auto; } -} \ No newline at end of file +} + +/* Google Gmap3 bug fix on images */ +.gm-style img { + height: 100%; +} + +:not(.gm-style) img { + height: auto; +} + +.gm-style img, +.gmnoscreen img, +.gmnoprint img { + max-width: none !important; +} diff --git a/less/_11-gmaps.less b/less/_11-gmaps.less deleted file mode 100644 index 93ac3b5..0000000 --- a/less/_11-gmaps.less +++ /dev/null @@ -1,18 +0,0 @@ -/* ----------------------------- */ -/* ==gmaps support */ -/* ----------------------------- */ - -/* Google Gmap3 bug fix on images */ -.gm-style img { - height: 100%; -} - -:not(.gm-style) img { - height: auto; -} - -.gm-style img, -.gmnoscreen img, -.gmnoprint img { - max-width: none !important; -} \ No newline at end of file diff --git a/less/_13-styling.less b/less/_11-styling.less similarity index 97% rename from less/_13-styling.less rename to less/_11-styling.less index d16e54a..51e18f1 100644 --- a/less/_13-styling.less +++ b/less/_11-styling.less @@ -3,8 +3,8 @@ /* ----------------------------- */ /* styling elements */ -code, -kbd, +code, +kbd, mark { border-radius: 2px; } @@ -17,7 +17,7 @@ kbd { code { padding: 2px 4px; background: rgba(0,0,0,0.04); - color: #b11; + color: #b11; } pre code { @@ -50,6 +50,7 @@ blockquote { position: relative; padding-left: 3em; } + blockquote:before { content: "\201C"; position: absolute; @@ -60,16 +61,17 @@ blockquote:before { line-height: 0.9; color: rgba(0, 0, 0, .3); } + blockquote > footer { margin-top: .75em; font-size: 0.9em; color: rgba(0, 0, 0, .7); } + blockquote > footer:before { content: "\2014 \0020"; } - q { font-style: normal; } @@ -110,7 +112,7 @@ hr { } /* alternate-vert tables */ -.alternate-vert { +.alternate-vert { border: 0; border-right: 1px solid #ccc; } diff --git a/less/_12-ie.less b/less/_12-ie.less deleted file mode 100644 index 0bdb465..0000000 --- a/less/_12-ie.less +++ /dev/null @@ -1,107 +0,0 @@ -/* ----------------------------- */ -/* ==IE6, IE7, IE8 support */ -/* ----------------------------- */ - -/* Active box-sizing for IE6/IE7 */ -/* @source https://github.com/Schepp/box-sizing-polyfill */ - -.ie67 * { - behavior: url(/js/boxsizing.htc); -} - -.ie678 h1, .ie678 .h1-like { - @em: @h1-size * 10 / @base-font-size; - font-size: unit(round(@em,2), em); -} - -.ie678 h2, .ie678 .h2-like { - @em: @h2-size * 10 / @base-font-size; - font-size: unit(round(@em,2), em); -} - -.ie678 h3, .ie678 .h3-like { - @em: @h3-size * 10 / @base-font-size; - font-size: unit(round(@em,2), em); -} - -.ie678 h4, .ie678 .h4-like { - @em: @h4-size * 10 / @base-font-size; - font-size: unit(round(@em,2), em); -} - -.ie678 h5, .ie678 .h5-like { - @em: @h5-size * 10 / @base-font-size; - font-size: unit(round(@em,2), em); -} - -.ie678 h6, .ie678 .h6-like { - @em: @h6-size * 10 / @base-font-size; - font-size: unit(round(@em,2), em); -} - -/* @bugfix for IE8 */ -.ie678 img { - width: auto; -} - -.ie678 .gm-style img { - height: 100%; -} - -/* hasLayout for IE6/IE7 */ -.clearfix, -.line, -.mod, -.row, -.col { - *zoom: 1; -} - -/*! inline-block and table-cell for IE6/IE7 */ -/*! warning: .col needs width on IE6/IE7 */ -.btn, -.col, -.inbl { - *display: inline; - *zoom: 1; -} - -/* old syntax of clip for IE6/IE7 */ -.visually-hidden { - *clip: rect(1px 1px 1px 1px); -} - -/* IE8 grid hack */ -.ie8 .grid > *, -.ie8 [class*="autogrid"] > * { - letter-spacing: -0.31em; - text-rendering: optimizespeed; -} - -.ie8 .grid > * > *, -.ie8 [class*="autogrid"] > * > *{ - letter-spacing: normal; - word-spacing: normal; - text-rendering: auto; -} - -/* IE7 grid hack */ -.grid > * > *, -[class*="autogrid"] > * > *{ - *display: inline; - *zoom: 1; -} - -/* forms */ -/* Corrects excess space around these inputs in IE8/9 */ -.ie678 input[type="checkbox"], -.ie678 input[type="radio"] { - padding: 0; -} - -/* Removes default vertical scrollbar on empty textarea in IE6/7/8/9 */ -.ie678 textarea { - overflow: auto; -} - - diff --git a/less/knacss.less b/less/knacss.less index 2b8b884..2df9903 100644 --- a/less/knacss.less +++ b/less/knacss.less @@ -16,8 +16,7 @@ @import "_09-print"; @import "_10-booleans"; // skip links and hyphens @import "_11-gmaps"; // Google maps bugs fix -@import "_12-ie"; // IE6, IE7, IE8 support -@import "_13-styling"; // minor stylings +@import "_13-styling"; // minor stylings /* ----------------------------- */ /* ==own stylesheet */ diff --git a/sass/_10-booleans.scss b/sass/_10-misc.scss similarity index 68% rename from sass/_10-booleans.scss rename to sass/_10-misc.scss index d533d62..11f5f30 100644 --- a/sass/_10-booleans.scss +++ b/sass/_10-misc.scss @@ -1,6 +1,7 @@ /* ----------------------------- */ -/* ==skip-hyphens */ +/* ==misc rules */ /* ----------------------------- */ + /* styling skip links */ .skip-links { position: absolute; @@ -22,7 +23,7 @@ } } -// hyphens boolean +// hyphens on small screens @media (max-width: $small-screen) { /* you shall not pass */ div, @@ -38,3 +39,17 @@ } } +/* Google Gmap3 bug fix on images */ +.gm-style img { + height: 100%; +} + +:not(.gm-style) img { + height: auto; +} + +.gm-style img, +.gmnoscreen img, +.gmnoprint img { + max-width: none !important; +} diff --git a/sass/_11-gmaps.scss b/sass/_11-gmaps.scss deleted file mode 100644 index 3364e8b..0000000 --- a/sass/_11-gmaps.scss +++ /dev/null @@ -1,18 +0,0 @@ -/* ----------------------------- */ -/* ==gmaps support */ -/* ----------------------------- */ - -/* Google Gmap3 bug fix on images */ -.gm-style img { - height: 100%; -} - -:not(.gm-style) img { - height: auto; -} - -.gm-style img, -.gmnoscreen img, -.gmnoprint img { - max-width: none !important; -} diff --git a/sass/_13-styling.scss b/sass/_11-styling.scss similarity index 95% rename from sass/_13-styling.scss rename to sass/_11-styling.scss index e4072bb..78f6ff1 100644 --- a/sass/_13-styling.scss +++ b/sass/_11-styling.scss @@ -15,7 +15,7 @@ kbd { code { padding: 2px 4px; background: rgba(0,0,0,0.04); - color: #b11; + color: #b11; } pre code { @@ -48,6 +48,7 @@ blockquote { position: relative; padding-left: 3em; } + blockquote:before { content: "\201C"; position: absolute; @@ -58,11 +59,13 @@ blockquote:before { line-height: 0.9; color: rgba(0, 0, 0, .3); } + blockquote > footer { margin-top: .75em; font-size: 0.9em; color: rgba(0, 0, 0, .7); } + blockquote > footer:before { content: "\2014 \0020"; } @@ -94,8 +97,8 @@ hr { /* alternate tables */ .alternate { border: 0; } -.alternate tbody { - border: 1px solid #ccc; +.alternate tbody { + border: 1px solid #ccc; } .alternate thead tr > * + * { @@ -107,7 +110,7 @@ hr { } /* alternate-vert tables */ -.alternate-vert { +.alternate-vert { border: 0; border-right: 1px solid #ccc; } diff --git a/sass/_12-ie.scss b/sass/_12-ie.scss deleted file mode 100644 index a222cdd..0000000 --- a/sass/_12-ie.scss +++ /dev/null @@ -1,111 +0,0 @@ -/* ----------------------------- */ -/* ==IE6, IE7, IE8 support */ -/* ----------------------------- */ -// IE6, 7, 8 support boolean -$bf: $base-font-size / 1px; -/* IE678 support */ -.ie678 h1, .ie678 .h1-like { - $val: $h1-size / 1rem; - $em : $val * 10 / $bf; - font-size: $em +0em; -} - -.ie678 h2, .ie678 .h2-like { - $val: $h2-size / 1rem; - $em : $val * 10 / $bf; - font-size: $em +0em; -} - -.ie678 h3, .ie678 .h3-like { - $val: $h3-size / 1rem; - $em : $val * 10 / $bf; - font-size: $em +0em; -} - -.ie678 h4, .ie678 .h4-like { - $val: $h4-size / 1rem; - $em : $val * 10 / $bf; - font-size: $em +0em; -} - -.ie678 h5, .ie678 .h5-like { - $val: $h5-size / 1rem; - $em : $val * 10 / $bf; - font-size: $em +0em; -} - -.ie678 h6, .ie678 .h6-like { - $val: $h6-size / 1rem; - $em : $val * 10 / $bf; - font-size: $em +0em; -} - -.ie678 img { - width: auto; /* @bugfix for IE8 */ -} - -.ie678 .gm-style img { - height: 100%; -} - -/* hasLayout for IE6/IE7 */ -.clearfix, -.line, -.mod, -.row, -.col { - *zoom: 1; -} - -/* inline-block and table-cell for IE6/IE7 */ -/* warning: .col needs width on IE6/IE7 */ -.btn, -.col, -.inbl { - *display: inline; - *zoom: 1; -} -.visually-hidden { - *clip: rect(1px 1px 1px 1px); -} - -/* IE8 grid hack */ -.ie8 .grid > *, -.ie8 [class*="autogrid"] > * { - letter-spacing: -0.31em; - text-rendering: optimizespeed; -} - -.ie8 .grid > * > *, -.ie8 [class*="autogrid"] > * > *{ - letter-spacing: normal; - word-spacing: normal; - text-rendering: auto; -} - -/* IE7 grid hack */ -.grid > * > *, -[class*="autogrid"] > * > *{ - *display: inline; - *zoom: 1; -} - -/* forms */ - /* Corrects excess space around these inputs in IE8/9 */ -.ie678 input[type="checkbox"], -.ie678 input[type="radio"] { - padding: 0; -} - -/* Removes default vertical scrollbar on empty textarea in IE6/7/8/9 */ -.ie678 textarea { - overflow: auto; -} - -/* Active box-sizing for IE6/IE7 */ -/* @source https://github.com/Schepp/box-sizing-polyfill */ -/* -.ie67 * { - behavior: url(/lib/box-sizing-polyfill/boxsizing.htc); -} -*/ \ No newline at end of file diff --git a/sass/knacss.scss b/sass/knacss.scss index 18c9e5f..a0e3721 100644 --- a/sass/knacss.scss +++ b/sass/knacss.scss @@ -16,8 +16,7 @@ @import "_09-print"; @import "_10-booleans"; // skip links and hyphens @import "_11-gmaps"; // Google maps bugs fix -@import "_12-ie"; // IE6, IE7, IE8 support -@import "_13-styling"; // minor stylings +@import "_13-styling"; // minor stylings /* ----------------------------- */ /* ==own stylesheet */