diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-05 20:08:19 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-05 20:08:19 -0400 |
| commit | 0c4099966a5ac1f1ff5dc568a600aa57776fb752 (patch) | |
| tree | f6c8a337eeae8ecc1848e319c9e5beb8c338d973 /view/theme/diabook/js/jquery.twitter.search.js | |
| parent | 250bf57e1e69670b956c1365dcb9ffa90800c05c (diff) | |
| parent | e1ab3a93cc450ca52c7651ecca8cad8334e5f1ce (diff) | |
| download | volse-hubzilla-0c4099966a5ac1f1ff5dc568a600aa57776fb752.tar.gz volse-hubzilla-0c4099966a5ac1f1ff5dc568a600aa57776fb752.tar.bz2 volse-hubzilla-0c4099966a5ac1f1ff5dc568a600aa57776fb752.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-theme: small fix
diabook-theme: twitter-box-update at right_aside
diabook-theme: can now set the twitter search term in theme-settings & small fixes
consolidate item deletion so we can fix orphaned categories and file_as tags.
DE: new email templates translated
workaround to clean up orphaned filetags
only show remove category to item owner
Option to set theme width added. Minor layout changes
* master:
Diffstat (limited to 'view/theme/diabook/js/jquery.twitter.search.js')
| -rw-r--r-- | view/theme/diabook/js/jquery.twitter.search.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/view/theme/diabook/js/jquery.twitter.search.js b/view/theme/diabook/js/jquery.twitter.search.js index a1b4b83bd..d3ccfe68e 100644 --- a/view/theme/diabook/js/jquery.twitter.search.js +++ b/view/theme/diabook/js/jquery.twitter.search.js @@ -31,7 +31,7 @@ opts.title = opts.term; opts.title = opts.title || ''; - text = opts.titleLink ? ('<a href="'+ opts.titleLink +'">'+ opts.title + '</a>') : ('<span>' + opts.title +'<a id="close_friends_icon" onClick="close_twitter()" class="icon close_box" title="close"></a>'+ '</span>'); + text = opts.titleLink ? ('<a href="'+ opts.titleLink +'">'+ opts.title + '</a>') : ('<span>' + opts.title +'</span>'); $text = $(text); if (opts.titleLink) $text.css(opts.css['titleLink']); @@ -210,7 +210,7 @@ loading: { padding: '20px', textAlign: 'center', color: '#888' }, text: {}, time: { fontSize: 'smaller', color: '#888' }, - title: { 'border-bottom': '1px solid #D2D2D2', 'padding-top': '5px', 'padding-bottom': '0px', 'padding-left': '9px', 'margin-bottom': '0px', 'margin-top': '30px' , 'display': 'block', 'font-size': '1.17em', 'font-weight': 'bold'}, + title: { 'display': 'none'}, titleLink: { textDecoration: 'none', color: '#3B5998' }, user: { fontWeight: 'bold' } } |