diff --git a/view/comment_item.tpl b/view/comment_item.tpl index 49751c42b..a28fc411a 100644 --- a/view/comment_item.tpl +++ b/view/comment_item.tpl @@ -17,7 +17,7 @@
diff --git a/view/jot.tpl b/view/jot.tpl index 12df0d9c2..f116dc0f0 100644 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -31,18 +31,20 @@ + +
+
+ $acl +
+
$emailcc
+
+ $jotnets +
+
+ -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
diff --git a/view/search_item.tpl b/view/search_item.tpl index 616eaf110..c4f3ccac7 100644 --- a/view/search_item.tpl +++ b/view/search_item.tpl @@ -1,18 +1,20 @@ +
$star.starred {{ if $lock }}$lock{{ endif }}
+
-
- $name + $name - menu + menu @@ -27,6 +29,15 @@
+
+ {{ for $tags as $tag }} + $tag + {{ endfor }} +
+
+
+
{{ if $plink }}$plink.title{{ endif }}
@@ -38,6 +49,7 @@ {{ if $star }} $star.do $star.undo + $star.tagger {{ endif }} {{ if $vote }} @@ -48,16 +60,12 @@ {{ if $vote.share }} $vote.share.1 {{ endif }} - - {{ if $conv }} - $conv.title - {{ endif }}
{{ if $drop.dropping }} - + $drop.delete {{ endif }} {{ if $edpost }} @@ -67,5 +75,9 @@
+
+ + +
$dislike
+
- diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 671577303..db31fc25e 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: 11px; background-color: @BodyBackground; color: @BodyColor; margin: 50px 0px 0px 0px; @@ -44,6 +44,9 @@ a:hover {color: @LinkHover; text-decoration: underline; } .hidden { display: none; } .clear { clear: both; } +.fakelink { color: @Link; text-decoration: none; cursor:pointer; } +.fakelink:hover { color: @LinkHover; text-decoration: underline; } + code { font-family: Courier, monospace; white-space: pre; @@ -55,6 +58,23 @@ code { padding: 10px; margin-top: 20px; } + +#panel { + position: absolute; + width: 10em; + background: @MenuBg; + color: @Menu; + margin: 0px; + padding: 1em; + list-style: none; + border: 3px solid @MenuBorder; + z-index: 100000; + + .shadow(); +} + + + /* tool */ .tool { @@ -234,7 +254,8 @@ ul.menu-popup { #nav-notifications-menu { - width: 400px; + width: 400px; max-height: 550px; + overflow: auto; img { float: left; margin-right: 5px; } .contactname { font-weight: bold; } .notif-when { font-size: 10px; color: @MenuItemDetail; display: block; } @@ -431,6 +452,26 @@ section { } } +.comment-edit-preview { + width: 710px; + border: 1px solid @Grey5; + margin-top: 10px; + + .contact-photo { width: 32px; height: 32px; margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + } + .contact-photo-menu-button { + top: 15px !important; + left: 15px !important; + } + .wall-item-links { padding-left: 12px; } + + .wall-item-container { width: 700px; } + .tread-wrapper { width: 700px; padding: 0; margin: 10px 0;} + + +} + .wall-item-tags { padding-top: 5px; } @@ -445,6 +486,23 @@ section { } } +.wwto { + position: absolute !important; + width: 25px; height: 25px; + background: #FFFFFF; + border: 2px solid @Metalic3; + height: 25px; + width: 25px; + overflow: hidden; + padding: 1px; + position: absolute !important; + top: 40px; + left: 30px; + + .shadow(0px, 0px) +} +.wwto .contact-photo { width: 25px; height: 25px; } + /* contacts menu */ .contact-photo-wrapper { position: relative; } .contact-photo { @@ -464,6 +522,7 @@ section { float: left; width: 90px; height: 90px; + margin-bottom: 15px; .contact-photo { width: 80px; height: 80px; img { width: 80px; height: 80px; } @@ -828,6 +887,22 @@ ul.tabs { margin: 0px 10px 10px 0px; } +/* profile match wrapper */ +.profile-match-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 20px; + .contact-photo { + width: 80px; height: 80px; + img { width: 80px; height: 80px; } + } + .contact-photo-menu-button { + left: 0px; + top: 63px; + } +} + /* page footer */ footer { height: 100px; display: table-row; } diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 003ebfae6..dbfc8cdda 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -162,7 +162,7 @@ /* global */ body { font-family: Liberation Sans, helvetica, arial, clean, sans-serif; - font-size: 10px; + font-size: 11px; background-color: #ffffff; color: #2d2d2d; margin: 50px 0px 0px 0px; @@ -195,6 +195,15 @@ a:hover { .clear { clear: both; } +.fakelink { + color: #005c94; + text-decoration: none; + cursor: pointer; +} +.fakelink:hover { + color: #005c94; + text-decoration: underline; +} code { font-family: Courier, monospace; white-space: pre; @@ -206,6 +215,20 @@ code { padding: 10px; margin-top: 20px; } +#panel { + position: absolute; + width: 10em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 1em; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} /* tool */ .tool { height: auto; @@ -442,6 +465,8 @@ ul.menu-popup .empty { } #nav-notifications-menu { width: 400px; + max-height: 550px; + overflow: auto; } #nav-notifications-menu img { float: left; @@ -758,6 +783,33 @@ section { color: #2d2d2d; border: 1px solid #2d2d2d; } +.comment-edit-preview { + width: 710px; + border: 1px solid #2d2d2d; + margin-top: 10px; +} +.comment-edit-preview .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.comment-edit-preview .contact-photo-menu-button { + top: 15px !important; + left: 15px !important; +} +.comment-edit-preview .wall-item-links { + padding-left: 12px; +} +.comment-edit-preview .wall-item-container { + width: 700px; +} +.comment-edit-preview .tread-wrapper { + width: 700px; + padding: 0; + margin: 10px 0; +} .wall-item-tags { padding-top: 5px; } @@ -771,6 +823,27 @@ section { background: url("../../../images/tag.png") no-repeat center right; color: #ffffff; } +.wwto { + position: absolute !important; + width: 25px; + height: 25px; + background: #FFFFFF; + border: 2px solid #364e59; + height: 25px; + width: 25px; + overflow: hidden; + padding: 1px; + position: absolute !important; + top: 40px; + left: 30px; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); +} +.wwto .contact-photo { + width: 25px; + height: 25px; +} /* contacts menu */ .contact-photo-wrapper { position: relative; @@ -795,6 +868,7 @@ section { float: left; width: 90px; height: 90px; + margin-bottom: 15px; } .contact-wrapper .contact-photo { width: 80px; @@ -1167,6 +1241,25 @@ ul.tabs li .active { float: left; margin: 0px 10px 10px 0px; } +/* profile match wrapper */ +.profile-match-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 20px; +} +.profile-match-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} /* page footer */ footer { height: 100px; diff --git a/view/wall_item.tpl b/view/wall_item.tpl index 96f3cee74..83e6dd361 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -1,10 +1,10 @@ -{{ if $indent }}{{ else }} +
$star.starred {{ if $lock }}$lock{{ endif }}
-{{ endif }} +
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl index 96d514702..11297647a 100644 --- a/view/wallwall_item.tpl +++ b/view/wallwall_item.tpl @@ -1,18 +1,12 @@ -{{ if $indent }}{{ else }}
$star.starred {{ if $lock }}$lock{{ endif }}
-{{ endif }} +
-
- - $owner_name - -
@@ -25,6 +19,11 @@
+
+ + $owner_name + +
$location