From b476575a982746551619dd920a934b44d013f083 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 3 Oct 2011 09:38:17 +0200 Subject: [PATCH] quattro: add comment box --- view/theme/quattro/colors.less | 5 +++ view/theme/quattro/quattro.less | 40 ++++++++++++++++++--- view/theme/quattro/style.css | 39 ++++++++++++++++++--- view/wall_item.tpl | 4 ++- view/wallwall_item.tpl | 62 +++------------------------------ 5 files changed, 83 insertions(+), 67 deletions(-) diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less index 12b0d08a6..564cf6d24 100644 --- a/view/theme/quattro/colors.less +++ b/view/theme/quattro/colors.less @@ -67,3 +67,8 @@ @NoticeBackgroundColor: #511919; @ThreadBackgroundColor: #f6f7f8; + +@CommentBoxEmptyColor: @Grey3; +@CommentBoxEmptyBorderColor: @Grey3; +@CommentBoxFullColor: @Grey5; +@CommentBoxFullBorderColor: @Grey5; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 1be65ea91..31a25694f 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -3,7 +3,7 @@ /* global */ body { font-family: Liberation Sans,helvetica,arial,clean,sans-serif; - font-size: 10px; + font-size: 12px; background-color: @BodyBackground; color: @BodyColor; margin: 50px 0px 0px 0px; @@ -324,18 +324,17 @@ section { .wall-item-ago { padding-right: 40px; } .wall-item-name { font-weight: bold; } - .wall-item-actions-author { float: left; width: 25%; margin-top: 0.5em; } - .wall-item-actions-social { float: left; width: 50%; margin-top: 0.5em; + .wall-item-actions-author { float: left; width: 20em; margin-top: 0.5em; } + .wall-item-actions-social { float: left; margin-top: 0.5em; a { margin-right: 3em; } } - .wall-item-actions-tools { float: right; width: 25%; + .wall-item-actions-tools { float: right; width: 15%; a { float: right; } input { float: right; } } } - .wall-item-container.comment { margin-top: 50px; .wall-item-photo { width: 32px; height: 32px; margin-left: 16px;} @@ -345,3 +344,34 @@ section { } .wall-item-links { padding-left: 12px; } } + +.wall-item-comment-wrapper { + margin: 30px 2em 2em 60px; + .comment-edit-photo { display: none; } + textarea { + height: 1em; width: 100%; font-size: 10px; + color: @CommentBoxEmptyColor; + border: 1px solid @CommentBoxEmptyBorderColor; + padding:0.3em; + } + .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: @CommentBoxFullColor; + border: 1px solid @CommentBoxFullBorderColor; + } +} + +#profile-jot-wrapper { + width: 100%; + margin: 0px 2em 20px 0px; + + +} +.profile-jot-text { + height: 1em; width: 100%; font-size: 10px; + color: @CommentBoxEmptyColor; + border: 1px solid @CommentBoxEmptyBorderColor; + padding:0.3em; +} + diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 4d9e12540..f3237801d 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -153,7 +153,7 @@ /* global */ body { font-family: Liberation Sans, helvetica, arial, clean, sans-serif; - font-size: 10px; + font-size: 12px; background-color: #ffffff; color: #2d2d2d; margin: 50px 0px 0px 0px; @@ -574,12 +574,11 @@ section { } .wall-item-container .wall-item-actions-author { float: left; - width: 25%; + width: 20em; margin-top: 0.5em; } .wall-item-container .wall-item-actions-social { float: left; - width: 50%; margin-top: 0.5em; } .wall-item-container .wall-item-actions-social a { @@ -587,7 +586,7 @@ section { } .wall-item-container .wall-item-actions-tools { float: right; - width: 25%; + width: 15%; } .wall-item-container .wall-item-actions-tools a { float: right; @@ -610,3 +609,35 @@ section { .wall-item-container.comment .wall-item-links { padding-left: 12px; } +.wall-item-comment-wrapper { + margin: 30px 2em 2em 60px; +} +.wall-item-comment-wrapper .comment-edit-photo { + display: none; +} +.wall-item-comment-wrapper textarea { + height: 1em; + width: 100%; + font-size: 10px; + color: #999999; + border: 1px solid #999999; + padding: 0.3em; +} +.wall-item-comment-wrapper .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: #2d2d2d; + border: 1px solid #2d2d2d; +} +#profile-jot-wrapper { + width: 100%; + margin: 0px 2em 20px 0px; +} +.profile-jot-text { + height: 1em; + width: 100%; + font-size: 10px; + color: #999999; + border: 1px solid #999999; + padding: 0.3em; +} diff --git a/view/wall_item.tpl b/view/wall_item.tpl index 7db8b8697..cec5e5404 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -66,4 +66,6 @@ - +
+ $comment +
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl index 502bdda32..2429bc20f 100644 --- a/view/wallwall_item.tpl +++ b/view/wallwall_item.tpl @@ -1,58 +1,3 @@ -{#
-
-
-
- - $owner_name -
-
$wall
-
- - $name - menu -
-
    - $item_photo_menu -
-
- -
-
-
- $lock -
$location
-
-
-
- $name $to $owner_name $vwall
-
$ago
-
-
-
$title
-
-
$body
-
-
- $vote - $plink - $edpost - $star - $drop -
-
-
- -
$dislike
-
-
- $comment -
- -
-
#} - {{ if $indent }}{{ else }}
$star.starred @@ -63,12 +8,12 @@