MDL-44074 theme_bootstrapbase: No 768px-979px & 1200px+ empty blk span calcs.

This commit is contained in:
Gareth J Barnard
2014-03-01 08:59:42 +00:00
parent 53490ad50d
commit 68a5672df8
4 changed files with 48 additions and 7 deletions
@@ -11,3 +11,12 @@
content: "";
}
}
// Bootstrap's calculation of blocks within a fluid grid. Copied from their grid code.
.fluid-span (@columns) {
.fluid-span-full(@columns, @fluidGridColumnWidth, @fluidGridGutterWidth);
}
.fluid-span-full (@columns, @columnWidth, @gutterWidth) {
width: (@columnWidth * @columns) + (@gutterWidth * (@columns - 1));
*width: (@columnWidth * @columns) + (@gutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%);
}
+1 -5
View File
@@ -29,11 +29,7 @@
width:100%;
}
.fluid-span (@columns) {
width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1));
*width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%);
}
// grid.less implied.
.empty-region-side-post.used-region-side-pre #region-main.span8 {
/** increase the span size by 1 **/
.fluid-span(9);
@@ -120,6 +120,18 @@
}
}
// Core empty block regions.
.fluid-span (@columns) {
.fluid-span-full(@columns, @fluidGridColumnWidth1200, @fluidGridGutterWidth1200);
}
.empty-region-side-post.used-region-side-pre #region-main.span8 {
/** increase the span size by 1 **/
.fluid-span(9);
}
.empty-region-side-post.used-region-side-pre #block-region-side-pre.span4 {
/** decrease the span size by 1 **/
.fluid-span(3);
}
}
@media (min-width: 980px) {
@@ -142,6 +154,18 @@
width: 48.61878453038674%;
*width: 48.56559304102504%;
}
// Core empty block regions.
.fluid-span (@columns) {
.fluid-span-full(@columns, @fluidGridColumnWidth768, @fluidGridGutterWidth768);
}
.empty-region-side-post.used-region-side-pre #region-main.span8 {
/** increase the span size by 1 **/
.fluid-span(9);
}
.empty-region-side-post.used-region-side-pre #block-region-side-pre.span4 {
/** decrease the span size by 1 **/
.fluid-span(3);
}
}
@media (max-width: 767px) {
@@ -377,7 +401,7 @@
}
@media (max-width: 768px) {
@media (max-width: 767px) {
// Resize, reflow file-picker on small devices
#filesskin .yui3-panel,
#filesskin .file-picker.fp-generallayout {
@@ -428,6 +452,18 @@
margin-left: 0;
.box-sizing(border-box);
}
// We need to specify a more specific selector to reset the width for
// cases when we have content in the side-pre blockregion but not in the
// side-post blockregion as there are more specific selectors in
// core.less which take precedence which break responsiveness.
.empty-region-side-post.used-region-side-pre {
#block-region-side-pre.span4,
#region-main.span8 {
.fluid-span(12);
}
}
.row-fluid .span12 {
width: 100%;
.box-sizing(border-box);
File diff suppressed because one or more lines are too long