diff options
author | friendica <info@friendica.com> | 2012-08-09 16:26:44 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2012-08-09 16:26:44 -0700 |
commit | 0292d46e5de06529012ebb14ce934fb476d595d0 (patch) | |
tree | 16208e490a8e2d6d90996c936c6f467533aaf612 /view/theme/quattro | |
parent | 432595314affa179bdce439d6e90955cee99cd9e (diff) | |
download | volse-hubzilla-0292d46e5de06529012ebb14ce934fb476d595d0.tar.gz volse-hubzilla-0292d46e5de06529012ebb14ce934fb476d595d0.tar.bz2 volse-hubzilla-0292d46e5de06529012ebb14ce934fb476d595d0.zip |
merge comment threading, provide plugin/theme functions to handle css/js includes
Diffstat (limited to 'view/theme/quattro')
-rw-r--r-- | view/theme/quattro/dark/style.css | 3 | ||||
-rw-r--r-- | view/theme/quattro/green/style.css | 3 | ||||
-rw-r--r-- | view/theme/quattro/quattro.less | 2 | ||||
-rw-r--r-- | view/theme/quattro/wall_item_tag.tpl | 4 |
4 files changed, 11 insertions, 1 deletions
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 38dd3dcea..d397a9305 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -1065,6 +1065,9 @@ section { color: #2d2d2d; border: 1px solid #2d2d2d; } +.threaded .wall-item-comment-wrapper { + margin-left: 0px; +} .comment-edit-preview { width: 710px; border: 1px solid #2d2d2d; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index a7d1f10b8..fdab77eb7 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -1065,6 +1065,9 @@ section { color: #2d2d2d; border: 1px solid #2d2d2d; } +.threaded .wall-item-comment-wrapper { + margin-left: 0px; +} .comment-edit-preview { width: 710px; border: 1px solid #2d2d2d; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 1bd0fae0a..a3ab8107b 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -534,6 +534,8 @@ section { } } +.threaded .wall-item-comment-wrapper { margin-left: 0px; } + .comment-edit-preview { width: 710px; border: 1px solid @Grey5; diff --git a/view/theme/quattro/wall_item_tag.tpl b/view/theme/quattro/wall_item_tag.tpl index 926fc929d..205fcfebc 100644 --- a/view/theme/quattro/wall_item_tag.tpl +++ b/view/theme/quattro/wall_item_tag.tpl @@ -13,11 +13,13 @@ <div class="wall-item-location">$item.location</div> </div> <div class="wall-item-content"> - $item.body + $item.ago $item.body </div> </div> </div> +{{ if $item.flatten }} <div class="wall-item-comment-wrapper" > $item.comment </div> +{{ endif }} |