# HG changeset patch # User Aurelien Campeas # Date 1322740126 -3600 # Node ID 71d9fb78b772e4a20838fbc6f6b6fcbfbb7955e2 # Parent 5feb10df65cd0718267eb7eff4548e926e914646 [facets] forcing a fixed height to the group is a bad idea: the container will not properly overflow diff -r 5feb10df65cd -r 71d9fb78b772 web/data/cubicweb.facets.css --- a/web/data/cubicweb.facets.css Tue Nov 29 12:06:35 2011 +0100 +++ b/web/data/cubicweb.facets.css Thu Dec 01 12:48:46 2011 +0100 @@ -13,7 +13,6 @@ .facetGroup { margin: .3em; float: left; - max-height: %(facet_Height)s; } div.facetTitle, div.bkSearch { diff -r 5feb10df65cd -r 71d9fb78b772 web/data/uiprops.py --- a/web/data/uiprops.py Tue Nov 29 12:06:35 2011 +0100 +++ b/web/data/uiprops.py Thu Dec 01 12:48:46 2011 +0100 @@ -168,7 +168,6 @@ # facets facet_titleFont = 'bold SansSerif' -facet_Height = '15em' facet_Padding = '.4em' facet_MarginBottom = '.4em' -facet_vocabMaxHeight = '12em' # ensure << facet_Height +facet_vocabMaxHeight = '12em' # ensure < FACET_GROUP_HEIGHT by some const. factor (e.g 3em) diff -r 5feb10df65cd -r 71d9fb78b772 web/facet.py --- a/web/facet.py Tue Nov 29 12:06:35 2011 +0100 +++ b/web/facet.py Thu Dec 01 12:48:46 2011 +0100 @@ -1407,7 +1407,8 @@ ## html widets ################################################################ -_DEFAULT_CONSTANT_VOCAB_WIDGET_HEIGHT = 14 +_DEFAULT_VOCAB_WIDGET_HEIGHT = 12 +_DEFAULT_FACET_GROUP_HEIGHT = 15 class FacetVocabularyWidget(htmlwidgets.HTMLWidget): @@ -1422,7 +1423,7 @@ hence, it is strongly advised not to specify but ems for this css prop """ return css_em_num_value(self.facet._cw.vreg, 'facet_vocabMaxHeight', - _DEFAULT_CONSTANT_VOCAB_WIDGET_HEIGHT) + _DEFAULT_VOCAB_WIDGET_HEIGHT) @cachedproperty def height(self): diff -r 5feb10df65cd -r 71d9fb78b772 web/views/facets.py --- a/web/views/facets.py Tue Nov 29 12:06:35 2011 +0100 +++ b/web/views/facets.py Thu Dec 01 12:48:46 2011 +0100 @@ -293,8 +293,7 @@ w(u'
\n') widget_queue = [] queue_height = 0 - wdg_stack_size = css_em_num_value(self._cw.vreg, 'facet_Height', - facetbase._DEFAULT_CONSTANT_VOCAB_WIDGET_HEIGHT) + wdg_stack_size = facetbase._DEFAULT_FACET_GROUP_HEIGHT for wdg in wdgs: height = wdg.height + self.per_facet_height_overhead if queue_height + height <= wdg_stack_size: