From 2904b7d354c54595ad98f4127b65717d0fc0b42e Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Mon, 28 Apr 2014 08:47:10 -0400 Subject: [PATCH 1/4] quattro: remove 'do not edit' comments from templates --- view/theme/quattro/templates/birthdays_reminder.tpl | 5 ----- view/theme/quattro/templates/comment_item.tpl | 5 ----- view/theme/quattro/templates/conversation.tpl | 5 ----- view/theme/quattro/templates/events_reminder.tpl | 5 ----- view/theme/quattro/templates/fileas_widget.tpl | 5 ----- view/theme/quattro/templates/generic_links_widget.tpl | 5 ----- view/theme/quattro/templates/group_side.tpl | 5 ----- view/theme/quattro/templates/jot.tpl | 5 ----- view/theme/quattro/templates/mail_conv.tpl | 5 ----- view/theme/quattro/templates/mail_display.tpl | 5 ----- view/theme/quattro/templates/mail_list.tpl | 5 ----- view/theme/quattro/templates/message_side.tpl | 5 ----- view/theme/quattro/templates/nets.tpl | 5 ----- view/theme/quattro/templates/photo_view.tpl | 5 ----- view/theme/quattro/templates/profile_vcard.tpl | 5 ----- view/theme/quattro/templates/prv_message.tpl | 6 ------ view/theme/quattro/templates/saved_searches_aside.tpl | 5 ----- view/theme/quattro/templates/search_item.tpl | 6 ------ view/theme/quattro/templates/theme_settings.tpl | 5 ----- view/theme/quattro/templates/threaded_conversation.tpl | 5 ----- view/theme/quattro/templates/wall_item_tag.tpl | 5 ----- view/theme/quattro/templates/wall_thread.tpl | 5 ----- 22 files changed, 112 deletions(-) diff --git a/view/theme/quattro/templates/birthdays_reminder.tpl b/view/theme/quattro/templates/birthdays_reminder.tpl index f951fc97a8..8b13789179 100644 --- a/view/theme/quattro/templates/birthdays_reminder.tpl +++ b/view/theme/quattro/templates/birthdays_reminder.tpl @@ -1,6 +1 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/theme/quattro/templates/comment_item.tpl b/view/theme/quattro/templates/comment_item.tpl index eca1f14f40..d3d5c46320 100644 --- a/view/theme/quattro/templates/comment_item.tpl +++ b/view/theme/quattro/templates/comment_item.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}
diff --git a/view/theme/quattro/templates/conversation.tpl b/view/theme/quattro/templates/conversation.tpl index 4e3553894b..b812d533a3 100644 --- a/view/theme/quattro/templates/conversation.tpl +++ b/view/theme/quattro/templates/conversation.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} {{$live_update}} {{foreach $threads as $thread}} diff --git a/view/theme/quattro/templates/events_reminder.tpl b/view/theme/quattro/templates/events_reminder.tpl index b188bd4a37..eb5386f386 100644 --- a/view/theme/quattro/templates/events_reminder.tpl +++ b/view/theme/quattro/templates/events_reminder.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/theme/quattro/templates/fileas_widget.tpl b/view/theme/quattro/templates/fileas_widget.tpl index 555ac5feb3..23d001d462 100644 --- a/view/theme/quattro/templates/fileas_widget.tpl +++ b/view/theme/quattro/templates/fileas_widget.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}

{{$title}}

{{$desc}}
diff --git a/view/theme/quattro/templates/generic_links_widget.tpl b/view/theme/quattro/templates/generic_links_widget.tpl index 802563255c..e10ded9f4c 100644 --- a/view/theme/quattro/templates/generic_links_widget.tpl +++ b/view/theme/quattro/templates/generic_links_widget.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}
{{if $title}}

{{$title}}

{{/if}} {{if $desc}}
{{$desc}}
{{/if}} diff --git a/view/theme/quattro/templates/group_side.tpl b/view/theme/quattro/templates/group_side.tpl index b71f1f1e2f..d0fb5d62b6 100644 --- a/view/theme/quattro/templates/group_side.tpl +++ b/view/theme/quattro/templates/group_side.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}

{{$title}}

diff --git a/view/theme/quattro/templates/jot.tpl b/view/theme/quattro/templates/jot.tpl index f9f36a37db..21df47dfa8 100644 --- a/view/theme/quattro/templates/jot.tpl +++ b/view/theme/quattro/templates/jot.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}
 
diff --git a/view/theme/quattro/templates/mail_conv.tpl b/view/theme/quattro/templates/mail_conv.tpl index 3ddc8e99f8..69673470ed 100644 --- a/view/theme/quattro/templates/mail_conv.tpl +++ b/view/theme/quattro/templates/mail_conv.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}
diff --git a/view/theme/quattro/templates/mail_display.tpl b/view/theme/quattro/templates/mail_display.tpl index dc1fbbc6f5..ac8ec98e1b 100644 --- a/view/theme/quattro/templates/mail_display.tpl +++ b/view/theme/quattro/templates/mail_display.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}
{{$thread_subject}} diff --git a/view/theme/quattro/templates/mail_list.tpl b/view/theme/quattro/templates/mail_list.tpl index 0090668740..038607e4df 100644 --- a/view/theme/quattro/templates/mail_list.tpl +++ b/view/theme/quattro/templates/mail_list.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}
{{$subject}} {{$from_name}} diff --git a/view/theme/quattro/templates/message_side.tpl b/view/theme/quattro/templates/message_side.tpl index 723b0b710c..c8a372c744 100644 --- a/view/theme/quattro/templates/message_side.tpl +++ b/view/theme/quattro/templates/message_side.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}
diff --git a/view/theme/quattro/templates/nets.tpl b/view/theme/quattro/templates/nets.tpl index dfe133251f..981bd8d2c8 100644 --- a/view/theme/quattro/templates/nets.tpl +++ b/view/theme/quattro/templates/nets.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}

{{$title}}

{{$desc}}
diff --git a/view/theme/quattro/templates/photo_view.tpl b/view/theme/quattro/templates/photo_view.tpl index 38b3b5216e..8456a2747a 100644 --- a/view/theme/quattro/templates/photo_view.tpl +++ b/view/theme/quattro/templates/photo_view.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}

{{$album.1}}

diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl index 8213a108f7..0c44a7f439 100644 --- a/view/theme/quattro/templates/profile_vcard.tpl +++ b/view/theme/quattro/templates/profile_vcard.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}
diff --git a/view/theme/quattro/templates/prv_message.tpl b/view/theme/quattro/templates/prv_message.tpl index 26b14d6e0e..45ba137439 100644 --- a/view/theme/quattro/templates/prv_message.tpl +++ b/view/theme/quattro/templates/prv_message.tpl @@ -1,9 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -

{{$header}}

diff --git a/view/theme/quattro/templates/saved_searches_aside.tpl b/view/theme/quattro/templates/saved_searches_aside.tpl index 6ff59afae4..007d1d956e 100644 --- a/view/theme/quattro/templates/saved_searches_aside.tpl +++ b/view/theme/quattro/templates/saved_searches_aside.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}

{{$title}}

diff --git a/view/theme/quattro/templates/search_item.tpl b/view/theme/quattro/templates/search_item.tpl index a5dafa643c..88739ff47a 100644 --- a/view/theme/quattro/templates/search_item.tpl +++ b/view/theme/quattro/templates/search_item.tpl @@ -1,9 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -
{{$item.star.starred}} {{if $item.lock}}{{$item.lock}}{{/if}} diff --git a/view/theme/quattro/templates/theme_settings.tpl b/view/theme/quattro/templates/theme_settings.tpl index 5df1e99ede..9fb2d4c1c9 100644 --- a/view/theme/quattro/templates/theme_settings.tpl +++ b/view/theme/quattro/templates/theme_settings.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} {{include file="field_select.tpl" field=$color}} diff --git a/view/theme/quattro/templates/threaded_conversation.tpl b/view/theme/quattro/templates/threaded_conversation.tpl index dc3e918f61..158c30d6bd 100644 --- a/view/theme/quattro/templates/threaded_conversation.tpl +++ b/view/theme/quattro/templates/threaded_conversation.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} {{$live_update}} {{foreach $threads as $thread}} diff --git a/view/theme/quattro/templates/wall_item_tag.tpl b/view/theme/quattro/templates/wall_item_tag.tpl index 1e658883c7..efcb528881 100644 --- a/view/theme/quattro/templates/wall_item_tag.tpl +++ b/view/theme/quattro/templates/wall_item_tag.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} {{if $mode == display}} {{else}} {{if $item.comment_firstcollapsed}} diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl index f4149949ef..e5a7115e91 100644 --- a/view/theme/quattro/templates/wall_thread.tpl +++ b/view/theme/quattro/templates/wall_thread.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} {{if $mode == display}} {{else}} {{if $item.comment_firstcollapsed}} From aba27ad40420f06dea46fd58b7f903ea4b4ed6bf Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Mon, 28 Apr 2014 09:29:48 -0400 Subject: [PATCH 2/4] fix photo comments: use $drop array as in wall_thread and search_item --- mod/photos.php | 13 +++++++++---- view/templates/photo_drop.tpl | 9 --------- view/templates/photo_item.tpl | 9 ++++++++- 3 files changed, 17 insertions(+), 14 deletions(-) delete mode 100644 view/templates/photo_drop.tpl diff --git a/mod/photos.php b/mod/photos.php index 1ec16898bf..0e9055d05d 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1640,10 +1640,15 @@ function photos_content(&$a) { $profile_link = $profile_url; - $drop = ''; - - if(($item['contact-id'] == $contact_id) || ($item['uid'] == local_user())) - $drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); + + + $dropping = (($item['contact-id'] == $contact_id) || ($item['uid'] == local_user())); + $drop = array( + 'dropping' => $dropping, + 'pagedrop' => false, + 'select' => t('Select'), + 'delete' => t('Delete'), + ); if($a->theme['template_engine'] === 'internal') { diff --git a/view/templates/photo_drop.tpl b/view/templates/photo_drop.tpl deleted file mode 100644 index ed500fd0ad..0000000000 --- a/view/templates/photo_drop.tpl +++ /dev/null @@ -1,9 +0,0 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -
- -
-
diff --git a/view/templates/photo_item.tpl b/view/templates/photo_item.tpl index 7d6ac96ee1..d1ed78b7e8 100644 --- a/view/templates/photo_item.tpl +++ b/view/templates/photo_item.tpl @@ -17,7 +17,14 @@
{{$title}}
{{$body}}
- {{$drop}} + + {{if $drop.dropping }} +
+ +
+
+ {{/if}} +
{{$comment}} From 42a9d0af0924358f9d1b0914b4b57ef3508fca81 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Mon, 28 Apr 2014 09:31:48 -0400 Subject: [PATCH 3/4] quattro: fix photo comments, small fix to search_item template --- view/theme/quattro/dark/style.css | 7 ++ view/theme/quattro/green/style.css | 7 ++ view/theme/quattro/lilac/style.css | 7 ++ view/theme/quattro/quattro.less | 4 + view/theme/quattro/templates/photo_item.tpl | 79 ++++++++++++++++++++ view/theme/quattro/templates/photo_view.tpl | 3 +- view/theme/quattro/templates/search_item.tpl | 2 +- 7 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 view/theme/quattro/templates/photo_item.tpl diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 22d3f13b0b..8436b56d51 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -486,6 +486,7 @@ header { margin: 0px; padding: 0px; /*width: 100%; height: 12px; */ + z-index: 110; color: #ffffff; } @@ -815,6 +816,7 @@ aside #profiles-menu { overflow: auto; height: auto; /*.contact-block-div { width:60px; height: 60px; }*/ + } #contact-block .contact-block-h4 { float: left; @@ -896,6 +898,7 @@ aside #profiles-menu { margin-bottom: 2em; /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ + } .widget h3 { padding: 0px; @@ -1160,6 +1163,9 @@ section { color: #2d2d2d; border: 1px solid #2d2d2d; } +.wall-item-comment-wrapper.photo { + margin: 1em 2em 1em 0px; +} .threaded .wall-item-comment-wrapper { margin-left: 0px; } @@ -1174,6 +1180,7 @@ section { 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; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 24ce51c65b..19c5170066 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -486,6 +486,7 @@ header { margin: 0px; padding: 0px; /*width: 100%; height: 12px; */ + z-index: 110; color: #ffffff; } @@ -815,6 +816,7 @@ aside #profiles-menu { overflow: auto; height: auto; /*.contact-block-div { width:60px; height: 60px; }*/ + } #contact-block .contact-block-h4 { float: left; @@ -896,6 +898,7 @@ aside #profiles-menu { margin-bottom: 2em; /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ + } .widget h3 { padding: 0px; @@ -1160,6 +1163,9 @@ section { color: #2d2d2d; border: 1px solid #2d2d2d; } +.wall-item-comment-wrapper.photo { + margin: 1em 2em 1em 0px; +} .threaded .wall-item-comment-wrapper { margin-left: 0px; } @@ -1174,6 +1180,7 @@ section { 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; diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index 7c002b112e..9b191dab97 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -486,6 +486,7 @@ header { margin: 0px; padding: 0px; /*width: 100%; height: 12px; */ + z-index: 110; color: #ffffff; } @@ -815,6 +816,7 @@ aside #profiles-menu { overflow: auto; height: auto; /*.contact-block-div { width:60px; height: 60px; }*/ + } #contact-block .contact-block-h4 { float: left; @@ -896,6 +898,7 @@ aside #profiles-menu { margin-bottom: 2em; /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ + } .widget h3 { padding: 0px; @@ -1160,6 +1163,9 @@ section { color: #2d2d2d; border: 1px solid #2d2d2d; } +.wall-item-comment-wrapper.photo { + margin: 1em 2em 1em 0px; +} .threaded .wall-item-comment-wrapper { margin-left: 0px; } @@ -1174,6 +1180,7 @@ section { 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; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 96019e0927..60f70d421a 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -586,6 +586,10 @@ section { color: @CommentBoxFullColor; border: 1px solid @CommentBoxFullBorderColor; } + + &.photo { + margin: 1em 2em 1em 0px; + } } .threaded .wall-item-comment-wrapper { margin-left: 0px; } diff --git a/view/theme/quattro/templates/photo_item.tpl b/view/theme/quattro/templates/photo_item.tpl new file mode 100644 index 0000000000..12c43eb0b2 --- /dev/null +++ b/view/theme/quattro/templates/photo_item.tpl @@ -0,0 +1,79 @@ +
+
+
+
+ + {{$name}} + +
+
{{$location}}
+
+
+ {{if $title}}

{{$title}}

{{/if}} + {{$body}} +
+
+
+
+
+
+ {{foreach $tags as $tag}} + {{$tag}} + {{/foreach}} +
+
+
+
+ {{if $plink}}{{$plink.title}}{{/if}} +
+
+
+ {{$name}} {{$ago}} +
+ +
+ {{if $star}} + {{$star.do}} + {{$star.undo}} + {{$star.tagger}} + {{/if}} + + {{if $vote}} + {{$vote.like.1}} + {{$vote.dislike.1}} + {{/if}} + + {{if $vote.share}} + {{$vote.share.1}} + {{/if}} +
+ +
+ + {{if $drop.pagedrop}} + + {{/if}} + {{if $drop.dropping}} + {{$drop.delete}} + {{/if}} + {{if $edpost}} + + {{/if}} +
+ +
+
+
+
+ +
{{$dislike}}
+ {{if $conv}} + + {{/if}} +
+ + +
+ diff --git a/view/theme/quattro/templates/photo_view.tpl b/view/theme/quattro/templates/photo_view.tpl index 8456a2747a..463969e78e 100644 --- a/view/theme/quattro/templates/photo_view.tpl +++ b/view/theme/quattro/templates/photo_view.tpl @@ -29,7 +29,8 @@ {{$dislike}}
{{/if}} -
+ +
{{$comments}}
diff --git a/view/theme/quattro/templates/search_item.tpl b/view/theme/quattro/templates/search_item.tpl index 88739ff47a..132d1d32d3 100644 --- a/view/theme/quattro/templates/search_item.tpl +++ b/view/theme/quattro/templates/search_item.tpl @@ -83,8 +83,8 @@ {{if $item.conv}} + {{/if}}
From cae89749d7804c524383a609ec0df438cc015e25 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Mon, 28 Apr 2014 09:42:41 -0400 Subject: [PATCH 4/4] vier: remove unused .less files, fix photo comments --- view/theme/vier/colors.less | 96 -- view/theme/vier/icons.less | 59 -- view/theme/vier/quattro.less | 1067 ---------------------- view/theme/vier/style.css | 12 + view/theme/vier/style.less | 14 - view/theme/vier/templates/photo_item.tpl | 78 ++ view/theme/vier/templates/photo_view.tpl | 44 + 7 files changed, 134 insertions(+), 1236 deletions(-) delete mode 100644 view/theme/vier/colors.less delete mode 100644 view/theme/vier/icons.less delete mode 100644 view/theme/vier/quattro.less delete mode 100644 view/theme/vier/style.less create mode 100644 view/theme/vier/templates/photo_item.tpl create mode 100644 view/theme/vier/templates/photo_view.tpl diff --git a/view/theme/vier/colors.less b/view/theme/vier/colors.less deleted file mode 100644 index 18d0fc620d..0000000000 --- a/view/theme/vier/colors.less +++ /dev/null @@ -1,96 +0,0 @@ -// Quattro Theme LESS file - -// "Echo" palette from Inkscape -@Yellow1 : #fce94f; -@Blue1:rgb(25,174,255); -@Blue2:rgb(0,132,200); -@Blue3:rgb(0,92,148); -@Red1:rgb(255,65,65); -@Red2:rgb(220,0,0); -@Red3:rgb(181,0,0); -@Orange1:rgb(255,255,62); -@Orange2:rgb(255,153,0); -@Orange3:rgb(255,102,0); -@Brown1:rgb(255,192,34); -@Brown2:rgb(184,129,0); -@Brown3:rgb(128,77,0); -@Green1:rgb(204,255,66); -@Green2:rgb(154,222,0); -@Green3:rgb(0,145,0); -@Purple1:rgb(241,202,255); -@Purple2:rgb(215,108,255); -@Purple3:rgb(186,0,255); -@Metalic1:rgb(189,205,212); -@Metalic2:rgb(158,171,176); -@Metalic3:rgb(54,78,89); -@Metalic4:rgb(14,35,46); -@Grey1:rgb(255,255,255); -@Grey2:rgb(204,204,204); -@Grey3:rgb(153,153,153); -@Grey4:rgb(102,102,102); -@Grey5:rgb(45,45,45); - - -// Theme colors -@BodyBackground: @Grey1; -@BodyColor: @Grey5; - -@Link: @Blue3; -@LinkHover: @Blue3; -@LinkVisited: @Blue3; - - -@ButtonColor: @Grey1; -@ButtonBackgroundColor: @Grey5; - -@Banner: @Grey1; - -@NavbarBackground:@Metalic4; -@NavbarSelectedBg:@Metalic3; -@NavbarSelectedBorder: @Metalic2; -@NavbarNotifBg: @Blue1; - -@Menu: @Grey5; -@MenuBg: @Grey1; -@MenuBorder: @Metalic3; -@MenuItem: @Grey5; -@MenuItemHoverBg: @Metalic1; -@MenuItemSeparator: @Metalic2; -@MenuEmpty: @Metalic2; -@MenuItemDetail: @Metalic2; - -@AsideBorder: @Metalic1; -@AsideConnect: @Grey1; -@AsideConnectBg: @Blue3; -@AsideConnectHoverBg: @Blue1; -@VCardLabelColor: @Grey3; - -@InfoColor: @Grey1; -@InfoBackgroundColor: @Metalic3; - -@NoticeColor: @Grey1; -@NoticeBackgroundColor: #511919; - -@ThreadBackgroundColor: #f6f7f8; -@ShinyBorderColor: @Yellow1; - -@CommentBoxEmptyColor: @Grey3; -@CommentBoxEmptyBorderColor: @Grey3; -@CommentBoxFullColor: @Grey5; -@CommentBoxFullBorderColor: @Grey5; - -@TagColor: @Grey1; - -@JotToolsBackgroundColor: @Metalic4; -@JotToolsBorderColor: @Metalic2; -@JotToolsOverBackgroundColor: @Metalic3; -@JotToolsOverBorderColor: @Metalic1; -@JotToolsText: @Grey2; -@JotSubmitBackgroundColor: @Grey2; -@JotSubmitText: @Grey4; -@JotSubmitOverBackgroundColor: @Metalic1; -@JotSubmitOverText: @Grey4; -@JotPermissionUnlockBackgroundColor: @Grey2; -@JotPermissionLockBackgroundColor: @Grey4; -@JotLoadingBackgroundColor: @Grey1; -@JotPreviewBackgroundColor: @Yellow1; diff --git a/view/theme/vier/icons.less b/view/theme/vier/icons.less deleted file mode 100644 index e314fba1fd..0000000000 --- a/view/theme/vier/icons.less +++ /dev/null @@ -1,59 +0,0 @@ -// Quattro Theme LESS file -/* icons */ - -.icons(@size: 22) { - &.notify { background-image: url("../../../images/icons/@{size}/notify_off.png"); } - &.gear { background-image: url("../../../images/icons/@{size}/gear.png"); } - - &.add { background-image: url("../../../images/icons/@{size}/add.png"); } - &.delete { background-image: url("../../../images/icons/@{size}/delete.png"); } - &.edit { background-image: url("../../../images/icons/@{size}/edit.png"); } - &.star { background-image: url("../../../images/icons/@{size}/star.png"); } - &.menu { background-image: url("../../../images/icons/@{size}/menu.png"); } - &.link { background-image: url("../../../images/icons/@{size}/link.png"); } - &.lock { background-image: url("../../../images/icons/@{size}/lock.png"); } - &.unlock { background-image: url("../../../images/icons/@{size}/unlock.png"); } - &.type-unkn { background-image: url("../../../images/icons/@{size}/zip.png"); } - &.type-audio{ background-image: url("../../../images/icons/@{size}/audio.png"); } - &.type-video{ background-image: url("../../../images/icons/@{size}/video.png"); } - &.type-image{ background-image: url("../../../images/icons/@{size}/image.png"); } - &.type-text { background-image: url("../../../images/icons/@{size}/text.png"); } - -} - - -.icon { - background-color: transparent ; - background-repeat: no-repeat; - background-position: left center; - display: block; - overflow: hidden; - text-indent: -9999px; - padding: 1px; - - &.text { - text-indent: 0px; - } - - &.s10 { - min-width:10px; height: 10px; - .icons(10); - &.text { padding: 2px 0px 0px 15px; } - } - &.s16 { - min-width:16px; height: 16px; - .icons(16); - &.text { padding: 4px 0px 0px 20px; } - } - &.s22 { - min-width:22px; height: 22px; - .icons(22); - &.text { padding: 10px 0px 0px 25px; } - } - &.s48 { - width:48px; height: 48px; - .icons(48); - } - - -} diff --git a/view/theme/vier/quattro.less b/view/theme/vier/quattro.less deleted file mode 100644 index 9d26082616..0000000000 --- a/view/theme/vier/quattro.less +++ /dev/null @@ -1,1067 +0,0 @@ -// Quattro Theme LESS file - -/* global */ -body { - font-family: Liberation Sans,helvetica,arial,clean,sans-serif; - font-size: 11px; - background-color: @BodyBackground; - color: @BodyColor; - margin: 50px 0px 0px 0px; - display:table; -} -h4 { font-size: 1.1em } - -.shadow(@x: 0px, @y: 5px){ - -webkit-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7); - box-shadow:@x @y 10px rgba(0, 0, 0, 0.7); -} - -.rounded(@tr: 5px, @tl: 5px, @bl: 5px, @br: 5px){ - -moz-border-radius: @arguments; - -webkit-border-radius: @arguments; - border-radius: @arguments; -} -.roundbottom (@radius: 5px){ .rounded(0, 0, @radius, @radius); } -.roundtop (@radius: 5px){ .rounded(@radius, @radius, 0, 0); } - -.opaque(@v: 0.5){ - opacity: @v; - -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; -} - - -a, a:link { color: @Link; text-decoration: none; } -a:visited { color: @LinkVisited; text-decoration: none; } -a:hover {color: @LinkHover; text-decoration: underline; } - -.left { float: left; } -.right { float: right; } -.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; - display: block; - overflow: auto; - border: 1px solid #444; - background: #EEE; - color: #444; - 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 { - height: auto; overflow: auto; - .label { float: left;} - .action { float: right; } -} - - - - -/* popup notifications */ -div.jGrowl div.notice { - background: @NoticeBackgroundColor url("../../../images/icons/48/notice.png") no-repeat 5px center; - color: @NoticeColor; - padding-left: 58px; -} -div.jGrowl div.info { - background: @InfoBackgroundColor url("../../../images/icons/48/info.png") no-repeat 5px center; - color: @InfoColor; - padding-left: 58px; -} - - - -/* header */ -header { - position: fixed; left: 43%; right: 43%; top: 0px; - margin: 0px; padding: 0px; - /*width: 100%; height: 12px; */ - z-index: 110; - color: @Grey1; - #site-location { - display: none; - } - - #banner { - overflow: hidden; - text-align: center; - width: 100%; - a, a:active, a:visited, a:link, a:hover { color: @Grey1; text-decoration: none; outline: none; vertical-align: bottom; } - #logo-img { height: 22px; margin-top:5px;} - #logo-text { font-size: 22px } - } -} -/* nav */ -nav { - width: 100%; height: 32px; - position: fixed; left: 0px; top: 0px; - padding: 0px; - background-color: @NavbarBackground; - color: @Grey1; - z-index: 100; - .shadow(0px, 0px); - - a, a:active, a:visited, a:link, a:hover { color: @Banner; text-decoration: none; outline: none; } - - ul { - margin: 0px; - padding: 0px 20px; - li { - list-style: none; - margin: 0px; padding: 0px; - float: left; - .menu-popup{ left: 0px; right: auto; } - } - - } - - .nav-menu-icon { - position: relative; - height: 22px; - padding: 5px; - margin: 0px 10px; - .roundtop(); - - &.selected { - background-color: @NavbarSelectedBg; - } - - img { width: 22px; height: 22px; } - .nav-notify { top: 3px; } - } - - .nav-menu { - position: relative; - height: 16px; - padding: 5px; - margin: 3px 15px 0px; - font-size: 14px; - border-bottom: 3px solid @NavbarBackground; - &.selected { - border-bottom: 3px solid @NavbarSelectedBorder; - } - - } - - .nav-notify { - display: none; - position: absolute; - background-color: @NavbarNotifBg; - .rounded(); - font-size: 10px; - padding: 1px 3px; - top: 0px; - right: -10px; - min-width: 15px; - text-align: right; - - &.show{ display: block; } - } - - - #nav-help-link, - #nav-search-link, - #nav-directory-link, - #nav-apps-link, - #nav-site-linkmenu { - float: right; - .menu-popup{ right: 0px; left: auto; } - } - - #nav-notifications-linkmenu.on .icon.s22.notify, - #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png") } - #nav-apps-link.selected { background-color: @NavbarSelectedBg; } -} - - -ul.menu-popup { - position: absolute; - display: none; - width: 10em; - background: @MenuBg; - color: @Menu; - margin: 0px; - padding: 0px; - list-style: none; - border: 3px solid @MenuBorder; - z-index: 100000; - - .shadow(); - - a { display: block; color: @MenuItem; padding: 5px 10px; text-decoration: none;} - a:hover { background-color: @MenuItemHoverBg; } - .menu-sep { border-top: 1px solid @MenuItemSeparator; } - li { float: none; overflow: auto; height: auto; display: block; } - li img { float: left; width: 16px; height: 16px; padding-right: 5px;} - .empty { - padding: 5px; - text-align: center; - color: @MenuEmpty; - } - -} - -/* autocomplete popup */ -.acpopup { - max-height:150px; - background-color:@MenuBg; - color: @Menu; - border:1px solid #MenuBorder; - overflow:auto; - z-index:100000; - .shadow(); -} -.acpopupitem { - color: @MenuItem; padding: 4px; - clear:left; - img { - float: left; - margin-right: 4px; - } - &.selected{ - background-color: @MenuItemHoverBg; - } -} - - -#nav-notifications-menu { - 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; } -} - - - - -/* aside */ -aside { - display: table-cell; - vertical-align: top; - width: 200px; - padding:0px 10px 0px 20px; - border-right: 1px solid @AsideBorder; - - .vcard { - .fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; } - .title { margin-bottom: 5px; } - dl { height: auto; overflow: auto; } - dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; } - dd {float: left; margin-left: 4px; width: 60%;} - - } - - #profile-extra-links { - ul { padding: 0px; margin: 0px; } - li { padding: 0px; margin: 0px; list-style: none; } - } - - #dfrn-request-link { - display: block; - .rounded(); - color: @AsideConnect; - background: @AsideConnectBg url('../../../images/connect-bg.png') no-repeat left center; - font-weight: bold; - text-transform:uppercase; - padding: 4px 2px 2px 35px; - - &:hover { text-decoration: none; background-color: @AsideConnectHoverBg; } - } - - #profiles-menu { width: 20em; } - - -} - -#contact-block { - overflow: auto; height: auto; - .contact-block-h4 { float: left; margin: 5px 0px; } - .allcontact-link { float: right; margin: 5px 0px; } - .contact-block-content { - clear: both; - overflow: hidden; - height: auto; - } - /*.contact-block-div { width:60px; height: 60px; }*/ - .contact-block-link { - float: left; - margin: 0px 2px 2px 0px; - img { width: 48px; height: 48px; } - } -} -/* mail view */ -.mail-conv-sender, -.mail-conv-detail { - float: left; -} -.mail-conv-detail { - margin-left: 20px; - width: 500px; -} - -.mail-conv-subject { - font-size: 1.4em; - margin: 10px 0; -} - -.mail-conv-outside-wrapper-end { - clear: both; -} - -.mail-conv-outside-wrapper { - margin-top: 30px; -} - -.mail-conv-delete-wrapper { - float: right; - margin-right: 30px; - margin-top: 15px; -} -.mail-conv-break { - clear: both; -} - -.mail-conv-delete-icon { - border: none; -} - -/* group member */ -#contact-edit-drop-link, -.mail-list-delete-wrapper, -.group-delete-wrapper { - float: right; - margin-right: 50px; - .drophide { - background-image: url('../../../images/icons/22/delete.png'); - display: block; width: 22px; height: 22px; - opacity: 0.3; - position: relative; - top: -50px; - } - .drop { - background-image: url('../../../images/icons/22/delete.png'); - display: block; width: 22px; height: 22px; - position: relative; - top: -50px; - } -} -/* -#group-members { - margin-top: 20px; - padding: 10px; - height: 250px; - overflow: auto; - border: 1px solid #ddd; -} -#group-members-end { - clear: both; -} -#group-all-contacts { - padding: 10px; - height: 450px; - overflow: auto; - border: 1px solid #ddd; -} -#group-all-contacts-end { - clear: both; - margin-bottom: 10px; -} -.contact-block-div { - float: left; - width: 60px; - height: 60px; -}*/ - -/* widget */ -.widget { - margin-bottom: 2em; - - h3 { padding: 0px; margin: 2px;} - .action { .opaque(0.1); } - input.action { .opaque(0.5); } - &:hover .title .action { .opaque(1); } - .tool:hover .action { .opaque(1); } - .tool:hover .action.ticked { .opaque(1); } - - ul { padding: 0px;} - ul li {padding-left: 16px; min-height: 16px; list-style: none; } - - .tool.selected { - background: url('../../../images/selected.png') no-repeat left center; - } - - /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} - .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ - -} - -/* widget: search */ -#add-search-popup { - width: 200px; - top: 18px; -} - - -/* section */ -section { - display: table-cell; - vertical-align: top; - width: 800px; - padding:0px 20px 0px 10px; -} - -/* wall item */ -.tread-wrapper { - background-color: @ThreadBackgroundColor; - position: relative; - padding: 10px; - margin-bottom: 20px; - width: 780px; -} -.wall-item-decor { position: absolute; left: 790px; top: -10px; width: 16px;} -.unstarred { display: none; } - -.wall-item-container { - display: table; - width: 780px; - - .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; - text-align: left; - width: 60px; - - } - .wall-item-location { - word-wrap: break-word; - width: 50px; - } - .wall-item-content { - display: table-cell; - font-size: 12px; - max-width: 720px; - word-wrap: break-word; - } - .wall-item-content img { max-width: 710px; } - .wall-item-links, - .wall-item-actions { - display: table-cell; - vertical-align: middle; - - .icon { - .opaque(0.5); - } - .icon:hover { - .opaque(1.0); - } - } - - .wall-item-ago { padding-right: 40px; } - .wall-item-name { font-weight: bold; } - - .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: 15%; - a { float: right; } - input { float: right; } - } - -} - - -.wall-item-container.comment { - /*margin-top: 50px;*/ - .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-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; - } -} - -.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;} - - -} - -.shiny { border-right:10px solid @ShinyBorderColor; } -#jot-preview-content .tread-wrapper { background-color: @JotPreviewBackgroundColor; } - - -.wall-item-tags { padding-top: 5px; } -.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; - } -} - -.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; } - - -#pause { - position: fixed; - bottom: 5px; - right: 5px; -} - - -.contact-photo-wrapper { position: relative; } -.contact-photo { - width: 48px; height: 48px; - img { width: 48px; height: 48px; } - overflow: hidden; - display: block; - } -.contact-photo-menu-button { - display: none; - position: absolute; - left: -2px; - top: 31px; -} - -.contact-wrapper { - float: left; - width: 300px; - height: 90px; - padding-right: 10px; - margin: 0 10px 10px 0px; - .contact-photo-wrapper { - float: left; - margin-right: 10px; - } - .contact-photo { - width: 80px; height: 80px; - img { width: 80px; height: 80px; } - } - .contact-photo-menu-button { - left: 0px; - top: 63px; - } -} -.directory-item { - float: left; - width: 200px; - height: 200px; - .contact-photo { - width: 175px; height: 175px; - img { width: 175px; height: 175px; } - } -} -.contact-name { font-weight: bold; padding-top: 15px; } -.contact-details { - color: @Grey3; white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -/* editor */ -.jothidden { display: none; } -#jot { - - width: 100%; - margin: 0px 2em 20px 0px; - - - .profile-jot-text { - height: 1em; width: 99%; font-size: 10px; - color: @CommentBoxEmptyColor; - border: 1px solid @CommentBoxEmptyBorderColor; - padding:0.3em; - } - - #jot-tools { - margin: 0px; padding: 0px; - height: 40px; overflow: none; - width: 800px; - background-color: @JotToolsBackgroundColor; - border-bottom: 2px solid @JotToolsBorderColor; - li { - list-style: none; - float: left; - width: 80px; - height: 40px; - border-bottom: 2px solid @JotToolsBorderColor; - a { - display: block; - color: @JotToolsText; - width: 100%; - height:40px; - text-align: center; - line-height: 40px; - overflow: hidden; - } - } - li:hover { - background-color: @JotToolsOverBackgroundColor; - border-bottom: 2px solid @JotToolsOverBorderColor; - } - li.perms { - float: right; - width: 40px; - a.unlock { - width: 30px; - border-left: 10px solid @JotPermissionUnlockBackgroundColor; - background-color: @JotPermissionUnlockBackgroundColor; - } - a.lock { - width: 30px; - border-left: 10px solid @JotPermissionLockBackgroundColor; - background-color: @JotPermissionLockBackgroundColor; - } - - } - li.submit { - float: right; - background-color: @JotSubmitBackgroundColor; - border-bottom: 2px solid @JotSubmitBackgroundColor; - border-right: 1px solid @Grey4; - border-left: 1px solid @Grey4; - input { - border: 0px; margin: 0px; padding: 0px; - background-color: @JotSubmitBackgroundColor; - color: @JotSubmitText; - width: 80px; height: 40px; - line-height: 40px; - } - input:hover { - background-color: @JotSubmitOverBackgroundColor; - color: @JotSubmitOverText; - } - } - li.loading { - float: right; - background-color: @JotLoadingBackgroundColor; - width: 20px; - vertical-align: center; - text-align: center; - img { margin-top: 10px; } - border-top: 2px solid @JotToolsBorderColor; - height: 38px; - } - } - - #jot-title { - border: 0px; - margin: 0px; - height: 20px; - width: 700px; - font-weight: bold; - border: 1px solid @BodyBackground; - - &:-webkit-input-placeholder { - font-weight: normal; - } - - &:-moz-placeholder { - font-weight: normal; - } - - &:hover { border: 1px solid @CommentBoxEmptyBorderColor } - &:focus { border: 1px solid @CommentBoxEmptyBorderColor } - } - - #character-counter { - width: 80px; - float: right; - text-align: right; - height: 20px; - line-height: 20px; - padding-right: 20px; - } - -} - - -/** buttons **/ -/*input[type="submit"] { - border: 0px; - background-color: @ButtonBackgroundColor; - color: @ButtonColor; - padding: 0px 10px; - .rounded(5px); - height: 18px; -}*/ - - -/** acl **/ -#photo-edit-perms-select, -#photos-upload-permissions-wrapper, -#profile-jot-acl-wrapper{ - display:block!important; -} - - - -#acl-wrapper { - width: 690px; - float:left; -} -#acl-search { - float:right; - background: #ffffff url("../../../images/search_18.png") no-repeat right center; - padding-right:20px; -} -#acl-showall { - float: left; - display: block; - width: auto; - height: 18px; - background-color: #cccccc; - background-image: url("../../../images/show_all_off.png"); - background-position: 7px 7px; - background-repeat: no-repeat; - padding: 7px 5px 0px 30px; - color: #999999; - .rounded(5px); -} -#acl-showall.selected { - color: #000000; - background-color: #ff9900; - background-image: url("../../../images/show_all_on.png"); -} - -#acl-list { - height: 210px; - border: 1px solid #cccccc; - clear: both; - margin-top: 30px; - overflow: auto; -} -#acl-list-content { - -} -.acl-list-item { - display: block; - width: 150px; - height: 30px; - border: 1px solid #cccccc; - margin: 5px; - float: left; -} -.acl-list-item img{ - width:22px; - height: 22px; - float: left; - margin: 4px; -} -.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} -.acl-list-item a { - font-size: 8px; - display: block; - width: 40px; - height: 10px; - float: left; - color: #999999; - background-color: #cccccc; - background-position: 3px 3px; - background-repeat: no-repeat; - margin-right: 5px; - -webkit-border-radius: 2px ; - -moz-border-radius: 2px; - border-radius: 2px; - padding-left: 15px; -} -#acl-wrapper a:hover { - text-decoration: none; - color:#000000; -} -.acl-button-show { background-image: url("../../../images/show_off.png"); } -.acl-button-hide { background-image: url("../../../images/hide_off.png"); } - -.acl-button-show.selected { - color: #000000; - background-color: #9ade00; - background-image: url("../../../images/show_on.png"); -} -.acl-button-hide.selected { - color: #000000; - background-color: #ff4141; - background-image: url("../../../images/hide_on.png"); -} -.acl-list-item.groupshow { border-color: #9ade00; } -.acl-list-item.grouphide { border-color: #ff4141; } -/** /acl **/ - -/** tab buttons **/ -ul.tabs { - list-style-type: none; - padding-bottom: 10px; - - li { - float: left; - margin-left: 20px; - - .active { - border-bottom: 1px solid @LinkVisited; - } - } - -} - - -/** - * Form fields - */ -.field { - margin-bottom: 10px; - padding-bottom: 10px; - overflow: auto; - width: 100%; - - - label { - float: left; - width: 200px; - } - - input, - textarea { - width: 400px; - } - textarea { height: 100px; } - .field_help { - display: block; - margin-left: 200px; - color: #666666; - - } - - - .onoff { - float: left; - width: 80px; - } - .onoff a { - display: block; - border:1px solid #666666; - background-image:url("../../../images/onoff.jpg"); - background-repeat: no-repeat; - padding: 4px 2px 2px 2px; - height: 16px; - text-decoration: none; - } - .onoff .off { - border-color:#666666; - padding-left: 40px; - background-position: left center; - background-color: #cccccc; - color: #666666; - text-align: right; - } - .onoff .on { - border-color:#204A87; - padding-right: 40px; - background-position: right center; - background-color: #D7E3F1; - color: #204A87; - text-align: left; - } - .hidden { display: none!important; } - - &.radio .field_help { margin-left: 0px; } -} - -#profile-edit-links li { - list-style: none; - margin-top: 10px; -} - -#profile-edit-default-desc { - color: #FF0000; - border: 1px solid #FF8888; - background-color: #FFEEEE; - padding: 7px; -} -#profile-edit-profile-name-label, -#profile-edit-name-label, -#profile-edit-pdesc-label, -#profile-edit-gender-label, -#profile-edit-dob-label, -#profile-edit-address-label, -#profile-edit-locality-label, -#profile-edit-region-label, -#profile-edit-postal-code-label, -#profile-edit-country-name-label, -#profile-edit-marital-label, -#profile-edit-with-label, -#profile-edit-sexual-label, -#profile-edit-politic-label, -#profile-edit-religion-label, -#profile-edit-pubkeywords-label, -#profile-edit-prvkeywords-label, -#profile-edit-gender-select, -#profile-edit-homepage-label { - float: left; - width: 175px; - padding-top: 7px; -} -#profile-edit-profile-name, -#profile-edit-name, -#gender-select, -#profile-edit-pdesc, -#profile-edit-gender, -#profile-edit-dob, -#profile-edit-address, -#profile-edit-locality, -#profile-edit-region, -#profile-edit-postal-code, -#profile-edit-country-name, -#profile-edit-marital, -#profile-edit-with, -#profile-edit-sexual, -#profile-edit-politic, -#profile-edit-religion, -#profile-edit-pubkeywords, -#profile-edit-prvkeywords, -#profile-edit-homepage { - margin-top: 5px; -} - -/* oauth */ -.oauthapp { - height: auto; overflow: auto; - border-bottom: 2px solid #cccccc; - padding-bottom: 1em; - margin-bottom: 1em; -} -.oauthapp img { - float: left; - width: 48px; height: 48px; - margin: 10px; -} -.oauthapp img.noicon { - background-image: url("../../../images/icons/48/plugin.png"); - background-position: center center; - background-repeat: no-repeat; -} -.oauthapp a { - float: left; -} - -/* contacts */ -.contact-entry-wrapper { - width: 50px; float: left; -} - -/* photo */ -.lframe { - float: left; - 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; } - -.pager { - margin-top: 25px; - clear: both; -} - diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 5e8d97418c..ef7708acc0 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -1352,6 +1352,7 @@ h2 { width: calc(100% - 90px); border-bottom: 1px solid hsl(198, 21%, 79%); } + .wall-item-container.comment .wall-item-content { max-width: 585px; } @@ -1376,6 +1377,17 @@ h2 { .wall-item-comment-wrapper { margin: 1px 15px 1px 80px; } +.wall-item-comment-wrapper.photo { + margin: 1px 15px 1px 0px; +} +.wall-item-comment-wrapper.photo .wall-item-container.comment { + margin-left: 0px; + width: 665px; + width: 100%; + border-bottom: 1px solid hsl(198, 21%, 79%); +} + + .wall-item-comment-wrapper .comment-edit-photo { display: none; } diff --git a/view/theme/vier/style.less b/view/theme/vier/style.less deleted file mode 100644 index c3dbae7778..0000000000 --- a/view/theme/vier/style.less +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Fabio Comuni - **/ -// Less file http://lesscss.org/ -// compile with lessc -// $ lessc style.less > style.css - -@import "colors"; -@import "icons"; -@import "quattro"; - - - - diff --git a/view/theme/vier/templates/photo_item.tpl b/view/theme/vier/templates/photo_item.tpl new file mode 100644 index 0000000000..84783ae303 --- /dev/null +++ b/view/theme/vier/templates/photo_item.tpl @@ -0,0 +1,78 @@ +
+
+
+
+ + {{$name}} + +
+
+
+ {{$name}} + + {{if $plink}}{{$ago}}{{else}} {{$ago}} {{/if}} + {{if $lock}}{{$lock}} {{/if}} + +
+
+ {{if $title}}

{{$title}}

{{/if}} + {{$body}} +
+
+
+
+
+
+ {{foreach $tags as $tag}} + {{$tag}} + {{/foreach}} + +
+
+
+
+ + {{if $conv}}{{/if}} +
+
+ +
{{$location}} 
+ +
+ {{if $star}} + {{$star.do}} + {{$star.undo}} + {{$star.tagger}} + {{/if}} + + {{if $vote}} + {{$vote.like.1}} + {{$vote.dislike.1}} + {{/if}} + + {{if $vote.share}} + {{$vote.share.1}} + {{/if}} +
+ +
+ + {{if $drop.pagedrop}} + + {{/if}} + {{if $drop.dropping}} + {{$drop.delete}} + {{/if}} + {{if $edpost}} + + {{/if}} +
+ +
+
+
+
+ +
{{$dislike}}
+
+
diff --git a/view/theme/vier/templates/photo_view.tpl b/view/theme/vier/templates/photo_view.tpl new file mode 100644 index 0000000000..354d0229cc --- /dev/null +++ b/view/theme/vier/templates/photo_view.tpl @@ -0,0 +1,44 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} +
+

{{$album.1}}

+ + + +{{if $prevlink}}{{/if}} +
+{{if $nextlink}}{{/if}} +
+
{{$desc}}
+{{if $tags}} +
{{$tags.0}}
+
{{$tags.1}}
+{{/if}} +{{if $tags.2}}{{/if}} + +{{if $edit}}{{$edit}}{{/if}} + +{{if $likebuttons}} +
+ {{$likebuttons}} + {{$like}} + {{$dislike}} +
+{{/if}} + +
+{{$comments}} +
+ +{{$paginate}} +