Merge dd84c139a6
into f817dbfd7d
This commit is contained in:
commit
248de05a7b
3 changed files with 27 additions and 27 deletions
|
@ -323,7 +323,7 @@ img.left, img.right {
|
||||||
/* .. use only when needed */
|
/* .. use only when needed */
|
||||||
/* ----------------------------- */
|
/* ----------------------------- */
|
||||||
|
|
||||||
/* blocks widths (percentage and pixels) */
|
/* blocks widths (percentage, pixels and auto) */
|
||||||
.w10 { width: 10%; }
|
.w10 { width: 10%; }
|
||||||
.w20 { width: 20%; }
|
.w20 { width: 20%; }
|
||||||
.w25 { width: 25%; }
|
.w25 { width: 25%; }
|
||||||
|
@ -354,6 +354,7 @@ img.left, img.right {
|
||||||
.w1140p { width: 1140px; }
|
.w1140p { width: 1140px; }
|
||||||
.mw1140p { max-width: 1140px; }
|
.mw1140p { max-width: 1140px; }
|
||||||
|
|
||||||
|
.wauto { width: auto; }
|
||||||
|
|
||||||
/* ----------------------------- */
|
/* ----------------------------- */
|
||||||
/* == spacing helpers */
|
/* == spacing helpers */
|
||||||
|
@ -436,7 +437,7 @@ source https://github.com/stubbornella/oocss/blob/master/core/spacing/space.css
|
||||||
.em(@h6-size);
|
.em(@h6-size);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* haslayout for IE6/IE7 */
|
/* hasLayout for IE6/IE7 */
|
||||||
.ie67 .clearfix,
|
.ie67 .clearfix,
|
||||||
.ie67 .line,
|
.ie67 .line,
|
||||||
.ie67 .mod,
|
.ie67 .mod,
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
|
|
||||||
/* layouts for large (l) screens */
|
/* layouts for large (l) screens */
|
||||||
.large-hidden,
|
.large-hidden,
|
||||||
.tablet-hidden { display: none !important; }
|
|
||||||
.large-visible { display: block !important; }
|
.large-visible { display: block !important; }
|
||||||
.large-no-float {float: none; }
|
.large-no-float {float: none; }
|
||||||
.large-inbl {
|
.large-inbl {
|
||||||
|
@ -58,7 +57,7 @@
|
||||||
|
|
||||||
@media (max-width: @smallscreen) {
|
@media (max-width: @smallscreen) {
|
||||||
|
|
||||||
/* quick tablet reset */
|
/* quick reset in small resolution and less */
|
||||||
.w600p,
|
.w600p,
|
||||||
.w700p,
|
.w700p,
|
||||||
.w800p,
|
.w800p,
|
||||||
|
@ -69,9 +68,8 @@
|
||||||
float: none;
|
float: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* layouts for medium (m) screens */
|
/* layouts for small (s) screens */
|
||||||
.small-hidden,
|
.small-hidden { display: none !important; }
|
||||||
.tablet-hidden { display: none !important; }
|
|
||||||
.small-visible { display: block !important; }
|
.small-visible { display: block !important; }
|
||||||
.small-no-float {float: none; }
|
.small-no-float {float: none; }
|
||||||
.small-inbl {
|
.small-inbl {
|
||||||
|
@ -134,7 +132,8 @@
|
||||||
}
|
}
|
||||||
.w300p,
|
.w300p,
|
||||||
.w400p,
|
.w400p,
|
||||||
.w500p {
|
.w500p,
|
||||||
|
.tiny-wauto {
|
||||||
width: auto;
|
width: auto;
|
||||||
float: none;
|
float: none;
|
||||||
}
|
}
|
||||||
|
@ -144,8 +143,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
/* layouts for tiny (t) screens */
|
/* layouts for tiny (t) screens */
|
||||||
.tiny-hidden,
|
.tiny-hidden { display: none !important; }
|
||||||
.phone-hidden { display: none !important; }
|
|
||||||
.tiny-visible { display: block !important; }
|
.tiny-visible { display: block !important; }
|
||||||
.tiny-no-float {float: none;}
|
.tiny-no-float {float: none;}
|
||||||
.tiny-inbl {
|
.tiny-inbl {
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
|
|
||||||
/* flexbox layout */
|
/* flexbox layout
|
||||||
|
Tutorial: http://knacss.com/demos/tutoriel.html#flex */
|
||||||
.flex {
|
.flex {
|
||||||
display: -webkit-box;
|
display: -webkit-box;
|
||||||
display: -moz-box;
|
display: -moz-box;
|
||||||
|
|
Loading…
Add table
Reference in a new issue