From: Wolfram Schneider Date: Wed, 5 Nov 2014 09:43:18 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws X-Git-Tag: 1.0.0~83 X-Git-Url: http://jsfdemo.indexdata.com/?a=commitdiff_plain;h=c07acf628bd0580ed707eeb58db77de5d41e3ca2;hp=198d13156f04dd64bf2703bdaefac005308a2ec5;p=mkws-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws --- diff --git a/doc/mkws-manual.markdown b/doc/mkws-manual.markdown index 0601a79..c25dde4 100644 --- a/doc/mkws-manual.markdown +++ b/doc/mkws-manual.markdown @@ -659,6 +659,9 @@ Name Description widget be subclassed to store the generated widget definitions in more useful places. +`button` The search button. Usually generated a `search` + widget. + `categories` Obtains from the Service Proxy a list of the target categories associated with the library in use, and displays them in a drop-down list. When a category @@ -699,55 +702,141 @@ Name Description be changed by overriding the `done` template using ` + + + +
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ + + + diff --git a/examples/htdocs/topic.css b/examples/htdocs/topic.css index 47da435..9e0e181 100644 --- a/examples/htdocs/topic.css +++ b/examples/htdocs/topic.css @@ -50,8 +50,15 @@ b, strong { } .mkws-summary { - padding: .5em 0; + margin: .5em 0; line-height: 1.35; + min-height: 60px; +} +.articles .mkws-summary, .alltargets .mkws-summary { + min-height: 0; +} +.articles .mkws-field-thumb, .alltargets .mkws-field-thumb { + display: none; } .mkws-summary:last-child { padding-bottom: 0; @@ -80,7 +87,7 @@ b, strong { } .mkws-google-image img { max-width: 100%; - max-height: 200px; + max-height: 180px; padding: 1em 0 .5em; } .list-group-item { @@ -90,6 +97,25 @@ b, strong { box-shadow: none; -webkit-box-shadow: none; } + +/* Fields */ +.mkws-field-thumb { + height: 60px; + width: 80px; + overflow: hidden; + margin-right: 1em; + float: left; +} +.mkws-field-thumb > img { + height: 60px; + max-width: 80px; +} +.mkws-field-description { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + @media screen and (min-width:700px) { .multicol { column-count: 2; @@ -100,3 +126,13 @@ b, strong { -webkit-column-gap: 20px; } } +@media screen and (min-width:900px) { + .multicol { + column-count: 3; + column-gap: 20px; + -moz-column-count: 3; + -moz-column-gap: 20px; + -webkit-column-count: 3; + -webkit-column-gap: 20px; + } +} diff --git a/examples/htdocs/topic.html b/examples/htdocs/topic.html index 642941b..0c727e1 100644 --- a/examples/htdocs/topic.html +++ b/examples/htdocs/topic.html @@ -1,10 +1,11 @@ - - + - MKWS demo: Compound reference widget, Bootstrap edition + MKWS demo + + @@ -13,35 +14,33 @@ + + + + - + + + + + -