aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/theme/dispy/wall_item.tpl8
-rw-r--r--view/theme/dispy/wallwall_item.tpl8
-rw-r--r--view/theme/duepuntozero/wall_item.tpl8
-rw-r--r--view/theme/duepuntozero/wallwall_item.tpl8
-rw-r--r--view/theme/quattro/colors.less1
-rw-r--r--view/theme/quattro/quattro.less23
-rw-r--r--view/theme/quattro/style.css33
-rw-r--r--view/theme/testbubble/wall_item.tpl8
-rw-r--r--view/theme/testbubble/wallwall_item.tpl8
9 files changed, 93 insertions, 12 deletions
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index f555ed813..51431d4eb 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -50,7 +50,13 @@
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+ <div class="wall-item-body" id="wall-item-body-$id" >$body
+ <div class="body-tag">
+ {{ for $tags as $tag }}
+ <span class='tag'>$tag</span>
+ {{ endfor }}
+ </div>
+ </div>
</div>
<div class="wall-item-author">
<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index 9e6ea40a1..4b2b52b85 100644
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -55,7 +55,13 @@
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+ <div class="wall-item-body" id="wall-item-body-$id" >$body
+ <div class="body-tag">
+ {{ for $tags as $tag }}
+ <span class='tag'>$tag</span>
+ {{ endfor }}
+ </div>
+ </div>
</div>
<div class="wall-item-author">
<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
index 3a4a49729..62f33ddee 100644
--- a/view/theme/duepuntozero/wall_item.tpl
+++ b/view/theme/duepuntozero/wall_item.tpl
@@ -29,7 +29,13 @@
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+ <div class="wall-item-body" id="wall-item-body-$id" >$body
+ <div class="body-tag">
+ {{ for $tags as $tag }}
+ <span class='tag'>$tag</span>
+ {{ endfor }}
+ </div>
+ </div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$id">
{{ if $vote }}
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
index aaa542760..050abb02d 100644
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ b/view/theme/duepuntozero/wallwall_item.tpl
@@ -33,7 +33,13 @@
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+ <div class="wall-item-body" id="wall-item-body-$id" >$body
+ <div class="body-tag">
+ {{ for $tags as $tag }}
+ <span class='tag'>$tag</span>
+ {{ endfor }}
+ </div>
+ </div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$id">
{{ if $vote }}
diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less
index a7a91114c..d36ff05b0 100644
--- a/view/theme/quattro/colors.less
+++ b/view/theme/quattro/colors.less
@@ -77,3 +77,4 @@
@CommentBoxFullColor: @Grey5;
@CommentBoxFullBorderColor: @Grey5;
+@TagColor: @Grey1;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index ea699d5c6..babcff3e8 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: 12px;
+ font-size: 10px;
background-color: @BodyBackground;
color: @BodyColor;
margin: 50px 0px 0px 0px;
@@ -302,6 +302,9 @@ section {
.wall-item-item,
.wall-item-bottom { display: table-row; }
+
+ .wall-item-bottom { .opaque(0.5); }
+ &:hover .wall-item-bottom { .opaque(1); }
.wall-item-info {
display: table-cell;
vertical-align: top;
@@ -326,7 +329,7 @@ section {
}
.wall-item-content {
display: table-cell;
- font-size: 16px;
+ font-size: 12px;
max-width: 720px;
word-wrap: break-word;
}
@@ -355,11 +358,12 @@ section {
a { float: right; }
input { float: right; }
}
+
}
.wall-item-container.comment {
- margin-top: 50px;
+ /*margin-top: 50px;*/
.wall-item-photo { width: 32px; height: 32px; margin-left: 16px;}
.wall-item-photo-menu-button {
top: 13px !important;
@@ -385,6 +389,19 @@ section {
}
}
+.tag {
+ background: url("../../../images/tag_b.png") no-repeat center left;
+ color: @TagColor;
+ padding-left: 3px;
+ a {
+ padding-right: 8px;
+ background: url("../../../images/tag.png") no-repeat center right;
+ color: @TagColor;
+ }
+}
+
+
+
#profile-jot-wrapper {
width: 100%;
margin: 0px 2em 20px 0px;
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 95c3d087e..560f53c2c 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: 12px;
+ font-size: 10px;
background-color: #ffffff;
color: #2d2d2d;
margin: 50px 0px 0px 0px;
@@ -535,6 +535,22 @@ section {
.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
display: table-row;
}
+.wall-item-container .wall-item-bottom {
+ opacity: 0.5;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.wall-item-container:hover .wall-item-bottom {
+ opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
.wall-item-container .wall-item-info {
display: table-cell;
vertical-align: top;
@@ -563,7 +579,7 @@ section {
}
.wall-item-container .wall-item-content {
display: table-cell;
- font-size: 16px;
+ font-size: 12px;
max-width: 720px;
word-wrap: break-word;
}
@@ -619,7 +635,8 @@ section {
float: right;
}
.wall-item-container.comment {
- margin-top: 50px;
+ /*margin-top: 50px;*/
+
}
.wall-item-container.comment .wall-item-photo {
width: 32px;
@@ -653,6 +670,16 @@ section {
color: #2d2d2d;
border: 1px solid #2d2d2d;
}
+.tag {
+ background: url("../../../images/tag_b.png") no-repeat center left;
+ color: #ffffff;
+ padding-left: 3px;
+}
+.tag a {
+ padding-right: 8px;
+ background: url("../../../images/tag.png") no-repeat center right;
+ color: #ffffff;
+}
#profile-jot-wrapper {
width: 100%;
margin: 0px 2em 20px 0px;
diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl
index 199381fd3..4fe819f4b 100644
--- a/view/theme/testbubble/wall_item.tpl
+++ b/view/theme/testbubble/wall_item.tpl
@@ -25,7 +25,13 @@
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+ <div class="wall-item-body" id="wall-item-body-$id" >$body
+ <div class="body-tag">
+ {{ for $tags as $tag }}
+ <span class='tag'>$tag</span>
+ {{ endfor }}
+ </div>
+ </div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$id">
diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl
index ba62d30fb..015e62f3e 100644
--- a/view/theme/testbubble/wallwall_item.tpl
+++ b/view/theme/testbubble/wallwall_item.tpl
@@ -56,7 +56,13 @@
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+ <div class="wall-item-body" id="wall-item-body-$id" >$body
+ <div class="body-tag">
+ {{ for $tags as $tag }}
+ <span class='tag'>$tag</span>
+ {{ endfor }}
+ </div>
+ </div>
</div>
<div class="wall-item-author">
<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>