[interchange] Fix Equal Heights usage to work properly
Josh Lavin <[email protected]> Tue, 11 Oct 2016 18:17:41 +0000
| Newsgroups | gmane.comp.web.interchange.cvs |
|---|---|
| Message-ID | <[email protected]> |
commit cd905a54f20812810dc630ffd16c9d36148c6d1a Author: Josh Lavin <[email protected]> Date: Tue Oct 11 11:15:57 2016 -0700 Fix Equal Heights usage to work properly - remove useless classes - limit [div-organize] columns to size/matches control value - only run .matchHeight() on the first div child dist/strap/templates/components/cross | 2 +- dist/strap/templates/components/promo | 4 ++-- dist/strap/templates/components/random | 6 +++--- dist/strap/variables/JS | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) --- diff --git a/dist/strap/templates/components/cross b/dist/strap/templates/components/cross index 6877f43..faab819 100644 --- a/dist/strap/templates/components/cross +++ b/dist/strap/templates/components/cross @@ -77,7 +77,7 @@ buttons: return; [/calc] <h4 class="text-muted">[control name=banner default="[L]See also...[/L]"]</h4> - [div-organize embed=lc pretty=1 cols="12" filler_class="[control cols col-sm-3]" row_attr='class="row equal-height-container"'] + [div-organize embed=lc pretty=1 cols="[control size 12]" filler_class="[control cols col-sm-3]" row_attr='class="row equal-height-container"'] [loop random="[scratch random]" list="[strip interpolate=1][scratch cross_codes][/strip]"] <div class="[control cols col-sm-3]"> <DIV class="thumbnail"> diff --git a/dist/strap/templates/components/promo b/dist/strap/templates/components/promo index ccca6cb..18a7b38 100644 --- a/dist/strap/templates/components/promo +++ b/dist/strap/templates/components/promo @@ -45,8 +45,8 @@ banner: | prefix="loop"] [div-organize embed=lc pretty=1 cols="12" filler_class="[control cols col-sm-3]" row_attr='class="row equal-height-container"'] [list] - <div class="[control cols col-sm-3] equal-height-column"> - <DIV class="thumbnail equal-height-column"> + <div class="[control cols col-sm-3]"> + <DIV class="thumbnail"> <a href="[area [loop-code]]">[image src="thumb/[loop-field thumb]" default="thumb.gif"]</a> <DIV class="caption text-center"> [if-loop-param blurb_begin] diff --git a/dist/strap/templates/components/random b/dist/strap/templates/components/random index 1f1ede7..7e9686d 100644 --- a/dist/strap/templates/components/random +++ b/dist/strap/templates/components/random @@ -35,7 +35,7 @@ buttons: <!-- BEGIN COMPONENT [control component random] --> <h4 class="text-muted">[control name=banner default="[L]Random Items[/L]"]</h4> -[div-organize embed=lc pretty=1 cols="12" filler_class="[control cols col-sm-3]" row_attr='class="row equal-height-container"'] +[div-organize embed=lc pretty=1 cols="[control matches 12]" filler_class="[control cols col-sm-3]" row_attr='class="row equal-height-container"'] [loop random="[control matches 2]" search=" @@ -44,8 +44,8 @@ buttons: ra=yes ml=[control pool 1000] "] - <div class="[control cols col-sm-3] equal-height-column"> - <DIV class="thumbnail equal-height-column"> + <div class="[control cols col-sm-3]"> + <DIV class="thumbnail"> <a href="[area [loop-code]]">[image src="thumb/[loop-field thumb]" default="thumb.gif"]</a> <DIV class="caption text-center"> <h5><a href="[area [loop-code]]">[loop-description]</a></h5> diff --git a/dist/strap/variables/JS b/dist/strap/variables/JS index 8b3adff..88be044 100644 --- a/dist/strap/variables/JS +++ b/dist/strap/variables/JS @@ -3,7 +3,7 @@ <script src="[var WWW_DIR]/js/jquery.matchHeight.js"></script> <script> $(document).ready(function() { - $('.equal-height-container').matchHeight(); + $('.equal-height-container > div').matchHeight(); }); </script>