From 2eb2608cd90931a3c7b2fc34f3bebc8c40e1ef07 Mon Sep 17 00:00:00 2001 From: pginer Date: Mon, 26 Nov 2012 13:45:31 +0100 Subject: [PATCH] CSS grid made ULS-specific CSS rules used in the grid are prefixed with ULS specific elements so that they do not affect unintended elements. --- css/jquery.uls.grid.css | 138 ++++++++++++++++++++-------------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/css/jquery.uls.grid.css b/css/jquery.uls.grid.css index d778325..623298f 100644 --- a/css/jquery.uls.grid.css +++ b/css/jquery.uls.grid.css @@ -7,232 +7,232 @@ } /* Misc ---------------------- */ -.left { +.uls-menu .left { float: left; } -.right { +.uls-menu .right { float: right; } -.text-left { +.uls-menu .text-left { text-align: left; } -.text-right { +.uls-menu .text-right { text-align: right; } -.text-center { +.uls-menu .text-center { text-align: center; } -.hide { +.uls-menu .hide { display: none; } -.highlight { +.uls-menu .highlight { background: #ffff99; } /* The Grid ---------------------- */ -.row { +.uls-menu .row { width: 100%; max-width: none; min-width: 600px; margin: 0 auto; } -.row .row { +.uls-menu .row .row { width: auto; max-width: none; min-width: 0; margin: 0 -5px; } -.row.collapse .column, .row.collapse .columns { +.uls-menu .row.collapse .column, .uls-menu .row.collapse .columns { padding: 0; } -.row .row { +.uls-menu .row .row { width: auto; max-width: none; min-width: 0; margin: 0 -5px; } -.row .row.collapse { +.uls-menu .row .row.collapse { margin: 0; } -.column, .columns { +.uls-menu .column,.uls-menu .columns { float: left; min-height: 1px; padding: 0 5px; position: relative; } -.column.centered, .columns.centered { +.uls-menu .column.centered, .uls-menu .columns.centered { float: none; margin: 0 auto; } -.row .one { +.uls-menu .row .one { width: 8.333%; } -.row .two { +.uls-menu .row .two { width: 16.667%; } -.row .three { +.uls-menu .row .three { width: 25%; } -.row .four { +.uls-menu .row .four { width: 33.333%; } -.row .five { +.uls-menu .row .five { width: 41.667%; } -.row .six { +.uls-menu .row .six { width: 50%; } -.row .seven { +.uls-menu .row .seven { width: 58.333%; } -.row .eight { +.uls-menu .row .eight { width: 66.667%; } -.row .nine { +.uls-menu .row .nine { width: 75%; } -.row .ten { +.uls-menu .row .ten { width: 83.333%; } -.row .eleven { +.uls-menu .row .eleven { width: 91.667%; } -.row .twelve { +.uls-menu .row .twelve { width: 100%; } -.row .offset-by-one { +.uls-menu .row .offset-by-one { margin-left: 8.333%; } -.row .offset-by-two { +.uls-menu .row .offset-by-two { margin-left: 16.667%; } -.row .offset-by-three { +.uls-menu .row .offset-by-three { margin-left: 25%; } -.row .offset-by-four { +.uls-menu .row .offset-by-four { margin-left: 33.333%; } -.row .offset-by-five { +.uls-menu .row .offset-by-five { margin-left: 41.667%; } -.row .offset-by-six { +.uls-menu .row .offset-by-six { margin-left: 50%; } -.row .offset-by-seven { +.uls-menu .row .offset-by-seven { margin-left: 58.333%; } -.row .offset-by-eight { +.uls-menu .row .offset-by-eight { margin-left: 66.667%; } -.row .offset-by-nine { +.uls-menu .row .offset-by-nine { margin-left: 75%; } -.row .offset-by-ten { +.uls-menu .row .offset-by-ten { margin-left: 83.333%; } -.push-two { +.uls-menu .push-two { left: 16.667%; } -.pull-two { +.uls-menu .pull-two { right: 16.667%; } -.push-three { +.uls-menu .push-three { left: 25%; } -.pull-three { +.uls-menu .pull-three { right: 25%; } -.push-four { +.uls-menu .push-four { left: 33.333%; } -.pull-four { +.uls-menu .pull-four { right: 33.333%; } -.push-five { +.uls-menu .push-five { left: 41.667%; } -.pull-five { +.uls-menu .pull-five { right: 41.667%; } -.push-six { +.uls-menu .push-six { left: 50%; } -.pull-six { +.uls-menu .pull-six { right: 50%; } -.push-seven { +.uls-menu .push-seven { left: 58.333%; } -.pull-seven { +.uls-menu .pull-seven { right: 58.333%; } -.push-eight { +.uls-menu .push-eight { left: 66.667%; } -.pull-eight { +.uls-menu .pull-eight { right: 66.667%; } -.push-nine { +.uls-menu .push-nine { left: 75%; } -.pull-nine { +.uls-menu .pull-nine { right: 75%; } -.push-ten { +.uls-menu .push-ten { left: 83.333%; } -.pull-ten { +.uls-menu .pull-ten { right: 83.333%; } -img, object, embed { +/*img, object, embed { max-width: 100%; height: auto; } @@ -244,16 +244,17 @@ img { #map_canvas img, .map_canvas img { max-width: none !important; } +*/ /* Nicolas Gallagher's micro clearfix */ -.row { +.uls-menu .row { *zoom: 1; } -.row:before, .row:after { +.uls-menu .row:before, .uls-menu .row:after { content: ""; display: table; } -.row:after { +.uls-menu .row:after { clear: both; } @@ -268,53 +269,52 @@ img { lines below to support arbitrary height, but know that IE7/8 do not support :nth-child. -------------------------------------------------- */ -.block-grid { +.uls-menu .block-grid { display: block; overflow: hidden; padding: 0; } -.block-grid > li { +.uls-menu .block-grid > li { display: block; height: auto; float: left; } -.block-grid.two-up { +.uls-menu .block-grid.two-up { margin: 0 -15px; } -.block-grid.two-up > li { +.uls-menu .block-grid.two-up > li { width: 50%; padding: 0 15px 15px; } /* .block-grid.two-up>li:nth-child(2n+1) {clear: left;} */ -.block-grid.three-up { +.uls-menu .block-grid.three-up { margin: 0 -12px; } -.block-grid.three-up > li { +.uls-menu .block-grid.three-up > li { width: 33.33%; padding: 0 12px 12px; } /* .block-grid.three-up>li:nth-child(3n+1) {clear: left;} */ -.block-grid.four-up { +.uls-menu .block-grid.four-up { margin: 0 -10px; } -.block-grid.four-up > li { +.uls-menu .block-grid.four-up > li { width: 25%; padding: 0 10px 10px; } /* .block-grid.four-up>li:nth-child(4n+1) {clear: left;} */ -.block-grid.five-up { +.uls-menu .block-grid.five-up { margin: 0 -8px; } -.block-grid.five-up > li { +.uls-menu .block-grid.five-up > li { width: 20%; padding: 0 8px 8px; } -