From b34cbbe9d213ef4c51bd9431a4f92e9685e7044f Mon Sep 17 00:00:00 2001 From: Santhosh Thottingal Date: Wed, 28 Nov 2012 14:56:21 +0530 Subject: [PATCH] Limit the grid to 'grid' class Change-Id: I60dd826ddee0861c05bc6b0cadc8bdc1eb3a6488 --- css/jquery.uls.css | 4 +- css/jquery.uls.grid.css | 136 ++++++++++++++++++++-------------------- src/jquery.uls.core.js | 2 +- 3 files changed, 71 insertions(+), 71 deletions(-) diff --git a/css/jquery.uls.css b/css/jquery.uls.css index 76028bf..044c2f3 100644 --- a/css/jquery.uls.css +++ b/css/jquery.uls.css @@ -139,8 +139,8 @@ div.uls-region { transition: opacity 0.15s linear; } -.map-block:hover, -.map-block:hover a { +.uls-menu .map-block:hover, +.uls-menu .map-block:hover a { opacity: 1; color: #333; } diff --git a/css/jquery.uls.grid.css b/css/jquery.uls.grid.css index cf7f9e2..319cea0 100644 --- a/css/jquery.uls.grid.css +++ b/css/jquery.uls.grid.css @@ -1,253 +1,253 @@ /* Generated using Foundation http://foundation.zurb.com/docs/grid.php */ /* Global Reset & Standards ---------------------- */ -.uls-menu * { +.grid * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } /* Misc ---------------------- */ -.uls-menu .left { +.grid .left { float: left; } -.uls-menu .right { +.grid .right { float: right; } -.uls-menu .text-left { +.grid .text-left { text-align: left; } -.uls-menu .text-right { +.grid .text-right { text-align: right; } -.uls-menu .text-center { +.grid .text-center { text-align: center; } -.uls-menu .hide { +.grid .hide { display: none; } -.uls-menu .highlight { +.grid .highlight { background: #ffff99; } /* The Grid ---------------------- */ -.uls-menu .row { +.grid .row { width: 100%; max-width: none; min-width: 600px; margin: 0 auto; } -.uls-menu .row .row { +.grid .row .row { width: auto; max-width: none; min-width: 0; margin: 0 -5px; } -.uls-menu .row.collapse .column, .uls-menu .row.collapse .columns { +.grid .row.collapse .column, .grid .row.collapse .columns { padding: 0; } -.uls-menu .row .row { +.grid .row .row { width: auto; max-width: none; min-width: 0; margin: 0 -5px; } -.uls-menu .row .row.collapse { +.grid .row .row.collapse { margin: 0; } -.uls-menu .column, .uls-menu .columns { +.grid .column, .grid .columns { float: left; min-height: 1px; padding: 0 5px; position: relative; } -.uls-menu .column.centered, .uls-menu .columns.centered { +.grid .column.centered, .grid .columns.centered { float: none; margin: 0 auto; } -.uls-menu .row .one { +.grid .row .one { width: 8.333%; } -.uls-menu .row .two { +.grid .row .two { width: 16.667%; } -.uls-menu .row .three { +.grid .row .three { width: 25%; } -.uls-menu .row .four { +.grid .row .four { width: 33.333%; } -.uls-menu .row .five { +.grid .row .five { width: 41.667%; } -.uls-menu .row .six { +.grid .row .six { width: 50%; } -.uls-menu .row .seven { +.grid .row .seven { width: 58.333%; } -.uls-menu .row .eight { +.grid .row .eight { width: 66.667%; } -.uls-menu .row .nine { +.grid .row .nine { width: 75%; } -.uls-menu .row .ten { +.grid .row .ten { width: 83.333%; } -.uls-menu .row .eleven { +.grid .row .eleven { width: 91.667%; } -.uls-menu .row .twelve { +.grid .row .twelve { width: 100%; } -.uls-menu .row .offset-by-one { +.grid .row .offset-by-one { margin-left: 8.333%; } -.uls-menu .row .offset-by-two { +.grid .row .offset-by-two { margin-left: 16.667%; } -.uls-menu .row .offset-by-three { +.grid .row .offset-by-three { margin-left: 25%; } -.uls-menu .row .offset-by-four { +.grid .row .offset-by-four { margin-left: 33.333%; } -.uls-menu .row .offset-by-five { +.grid .row .offset-by-five { margin-left: 41.667%; } -.uls-menu .row .offset-by-six { +.grid .row .offset-by-six { margin-left: 50%; } -.uls-menu .row .offset-by-seven { +.grid .row .offset-by-seven { margin-left: 58.333%; } -.uls-menu .row .offset-by-eight { +.grid .row .offset-by-eight { margin-left: 66.667%; } -.uls-menu .row .offset-by-nine { +.grid .row .offset-by-nine { margin-left: 75%; } -.uls-menu .row .offset-by-ten { +.grid .row .offset-by-ten { margin-left: 83.333%; } -.uls-menu .push-two { +.grid .push-two { left: 16.667%; } -.uls-menu .pull-two { +.grid .pull-two { right: 16.667%; } -.uls-menu .push-three { +.grid .push-three { left: 25%; } -.uls-menu .pull-three { +.grid .pull-three { right: 25%; } -.uls-menu .push-four { +.grid .push-four { left: 33.333%; } -.uls-menu .pull-four { +.grid .pull-four { right: 33.333%; } -.uls-menu .push-five { +.grid .push-five { left: 41.667%; } -.uls-menu .pull-five { +.grid .pull-five { right: 41.667%; } -.uls-menu .push-six { +.grid .push-six { left: 50%; } -.uls-menu .pull-six { +.grid .pull-six { right: 50%; } -.uls-menu .push-seven { +.grid .push-seven { left: 58.333%; } -.uls-menu .pull-seven { +.grid .pull-seven { right: 58.333%; } -.uls-menu .push-eight { +.grid .push-eight { left: 66.667%; } -.uls-menu .pull-eight { +.grid .pull-eight { right: 66.667%; } -.uls-menu .push-nine { +.grid .push-nine { left: 75%; } -.uls-menu .pull-nine { +.grid .pull-nine { right: 75%; } -.uls-menu .push-ten { +.grid .push-ten { left: 83.333%; } -.uls-menu .pull-ten { +.grid .pull-ten { right: 83.333%; } /* Nicolas Gallagher's micro clearfix */ -.uls-menu .row { +.grid .row { *zoom: 1; } -.uls-menu .row:before, .uls-menu .row:after { +.grid .row:before, .grid .row:after { content: ""; display: table; } -.uls-menu .row:after { +.grid .row:after { clear: both; } @@ -262,53 +262,53 @@ lines below to support arbitrary height, but know that IE7/8 do not support :nth-child. -------------------------------------------------- */ -.uls-menu .block-grid { +.grid .block-grid { display: block; overflow: hidden; padding: 0; } -.uls-menu .block-grid > li { +.grid .block-grid > li { display: block; height: auto; float: left; } -.uls-menu .block-grid.two-up { +.grid .block-grid.two-up { margin: 0 -15px; } -.uls-menu .block-grid.two-up > li { +.grid .block-grid.two-up > li { width: 50%; padding: 0 15px 15px; } /* .block-grid.two-up>li:nth-child(2n+1) {clear: left;} */ -.uls-menu .block-grid.three-up { +.grid .block-grid.three-up { margin: 0 -12px; } -.uls-menu .block-grid.three-up > li { +.grid .block-grid.three-up > li { width: 33.33%; padding: 0 12px 12px; } /* .block-grid.three-up>li:nth-child(3n+1) {clear: left;} */ -.uls-menu .block-grid.four-up { +.grid .block-grid.four-up { margin: 0 -10px; } -.uls-menu .block-grid.four-up > li { +.grid .block-grid.four-up > li { width: 25%; padding: 0 10px 10px; } /* .block-grid.four-up>li:nth-child(4n+1) {clear: left;} */ -.uls-menu .block-grid.five-up { +.grid .block-grid.five-up { margin: 0 -8px; } -.uls-menu .block-grid.five-up > li { +.grid .block-grid.five-up > li { width: 20%; padding: 0 8px 8px; } diff --git a/src/jquery.uls.core.js b/src/jquery.uls.core.js index f9ae25a..5f91f33 100644 --- a/src/jquery.uls.core.js +++ b/src/jquery.uls.core.js @@ -23,7 +23,7 @@ // Region numbers in id attributes also appear in the langdb. var template = '\ -
\ +
\
\ \
\