Merge pull request #3132 from XhmikosR/gridism

This commit is contained in:
Parker Moore 2014-11-20 12:37:06 -08:00
commit a9a21e6572
2 changed files with 43 additions and 15 deletions

View File

@ -53,8 +53,10 @@
.grid .half, .grid .w-1-2 { width: 50%; } .grid .half, .grid .w-1-2 { width: 50%; }
.grid .one-third, .grid .w-1-3 { width: 33.3332%; } .grid .one-third, .grid .w-1-3 { width: 33.3332%; }
.grid .two-thirds, .grid .w-2-3 { width: 66.6665%; } .grid .two-thirds, .grid .w-2-3 { width: 66.6665%; }
.grid .one-quarter, .grid .w-1-4 { width: 25%; } .grid .one-quarter,
.grid .three-quarters, .grid .w-3-4 { width: 75%; } .grid .one-fourth, .grid .w-1-4 { width: 25%; }
.grid .three-quarters,
.grid .three-fourths, .grid .w-3-4 { width: 75%; }
.grid .one-fifth, .grid .w-1-5 { width: 20%; } .grid .one-fifth, .grid .w-1-5 { width: 20%; }
.grid .two-fifths, .grid .w-2-5 { width: 40%; } .grid .two-fifths, .grid .w-2-5 { width: 40%; }
.grid .three-fifths, .grid .w-3-5 { width: 60%; } .grid .three-fifths, .grid .w-3-5 { width: 60%; }
@ -62,6 +64,19 @@
.grid .golden-small, .grid .w-g-s { width: 38.2716%; } /* Golden section: smaller piece */ .grid .golden-small, .grid .w-g-s { width: 38.2716%; } /* Golden section: smaller piece */
.grid .golden-large, .grid .w-g-l { width: 61.7283%; } /* Golden section: larger piece */ .grid .golden-large, .grid .w-g-l { width: 61.7283%; } /* Golden section: larger piece */
/* Clearfix after every .grid */
.grid {
*zoom: 1;
}
.grid:before, .grid:after {
display: table;
content: "";
line-height: 0;
}
.grid:after {
clear: both;
}
/* Utility classes */ /* Utility classes */
.align-center { text-align: center; } .align-center { text-align: center; }
.align-left { text-align: left; } .align-left { text-align: left; }
@ -69,14 +84,18 @@
.pull-left { float: left; } .pull-left { float: left; }
.pull-right { float: right; } .pull-right { float: right; }
.show-on-mobiles { /* A property for a better rendering of images in units: in
display: none; this way bigger pictures are just resized if the unit
becomes smaller */
.unit img {
max-width: 100%;
} }
/* Responsive Stuff */ /* Responsive Stuff */
@media screen and (max-width: 568px) { @media screen and (max-width: 568px) {
/* Stack anything that isnt full-width on smaller screens */ /* Stack anything that isnt full-width on smaller screens
.grid .unit { and doesn't provide the no-stacking-on-mobiles class */
.grid:not(.no-stacking-on-mobiles) > .unit {
width: 100% !important; width: 100% !important;
padding-left: 20px; padding-left: 20px;
padding-right: 20px; padding-right: 20px;
@ -93,18 +112,13 @@
.hide-on-mobiles { .hide-on-mobiles {
display: none !important; display: none !important;
} }
.show-on-mobiles {
display: block !important;
}
a .show-on-mobiles {
display: inline !important;
}
} }
/* Expand the wrap a bit further on larger screens */ /* Expand the wrap a bit further on larger screens */
/*@media screen and (min-width: 1180px) { @media screen and (min-width: 1180px) {
.wrap .grid { .wider .grid,
.grid.wider {
max-width: 1180px; max-width: 1180px;
margin: 0 auto; margin: 0 auto;
} }
}*/ }

View File

@ -957,3 +957,17 @@ code.output {
padding: 0 10px; padding: 0 10px;
} }
} }
.show-on-mobiles {
display: none;
}
@media screen and (max-width: 568px) {
.show-on-mobiles {
display: block !important;
}
a .show-on-mobiles {
display: inline !important;
}
}