From 0fb08e3642e195da071c6f8d01248c3565ae0cc3 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Fri, 29 Jun 2012 05:29:29 -0400 Subject: [PATCH 1/3] nav: pass $baseurl to template --- include/nav.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/nav.php b/include/nav.php index a67a8b6141..e26cc8889a 100644 --- a/include/nav.php +++ b/include/nav.php @@ -162,6 +162,7 @@ function nav(&$a) { $tpl = get_markup_template('nav.tpl'); $a->page['nav'] .= replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), '$langselector' => lang_selector(), '$sitelocation' => $sitelocation, '$nav' => $nav, From 8b18ee49ffbc51e4d377a99fd391ee44d876734f Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Fri, 29 Jun 2012 05:29:58 -0400 Subject: [PATCH 2/3] quattro: some updates - add makefile to rebuild both css with single command - fix icons in Forums widget - style photos pages --- view/theme/quattro/Makefile | 5 + view/theme/quattro/dark/style.css | 258 +++++++++++++++++++++++-- view/theme/quattro/green/style.css | 258 +++++++++++++++++++++++-- view/theme/quattro/icons.less | 7 + view/theme/quattro/icons/addon_off.png | Bin 438 -> 834 bytes view/theme/quattro/icons/addon_on.png | Bin 428 -> 715 bytes view/theme/quattro/icons/dislike.png | Bin 0 -> 386 bytes view/theme/quattro/icons/like.png | Bin 0 -> 388 bytes view/theme/quattro/icons/next.png | Bin 0 -> 300 bytes view/theme/quattro/icons/prev.png | Bin 0 -> 336 bytes view/theme/quattro/photo_view.tpl | 37 ++++ view/theme/quattro/quattro.less | 111 ++++++++++- 12 files changed, 630 insertions(+), 46 deletions(-) create mode 100644 view/theme/quattro/Makefile create mode 100644 view/theme/quattro/icons/dislike.png create mode 100644 view/theme/quattro/icons/like.png create mode 100644 view/theme/quattro/icons/next.png create mode 100644 view/theme/quattro/icons/prev.png create mode 100644 view/theme/quattro/photo_view.tpl diff --git a/view/theme/quattro/Makefile b/view/theme/quattro/Makefile new file mode 100644 index 0000000000..5df58c821b --- /dev/null +++ b/view/theme/quattro/Makefile @@ -0,0 +1,5 @@ +all: + cd dark; make; cd .. + cd green; make; cd .. + + diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 803a2c2f7b..d115453bc6 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -10,10 +10,72 @@ overflow: hidden; text-indent: -9999px; padding: 1px; + min-width: 22px; + height: 22px; } .icon.text { text-indent: 0px; } +.icon.notify { + background-image: url("../../../images/icons/22/notify_off.png"); +} +.icon.gear { + background-image: url("../../../images/icons/22/gear.png"); +} +.icon.like { + background-image: url("icons/like.png"); +} +.icon.dislike { + background-image: url("icons/dislike.png"); +} +.icon.add { + background-image: url("../../../images/icons/22/add.png"); +} +.icon.delete { + background-image: url("../../../images/icons/22/delete.png"); +} +.icon.edit { + background-image: url("../../../images/icons/22/edit.png"); +} +.icon.star { + background-image: url("../../../images/icons/22/star.png"); +} +.icon.menu { + background-image: url("../../../images/icons/22/menu.png"); +} +.icon.link { + background-image: url("../../../images/icons/22/link.png"); +} +.icon.lock { + background-image: url("../../../images/icons/22/lock.png"); +} +.icon.unlock { + background-image: url("../../../images/icons/22/unlock.png"); +} +.icon.plugin { + background-image: url("../../../images/icons/22/plugin.png"); +} +.icon.type-unkn { + background-image: url("../../../images/icons/22/zip.png"); +} +.icon.type-audio { + background-image: url("../../../images/icons/22/audio.png"); +} +.icon.type-video { + background-image: url("../../../images/icons/22/video.png"); +} +.icon.type-image { + background-image: url("../../../images/icons/22/image.png"); +} +.icon.type-text { + background-image: url("../../../images/icons/22/text.png"); +} +.icon.language { + background-image: url("icons/language.png"); +} +.icon.text { + padding: 10px 0px 0px 25px; +} .icon.s10 { min-width: 10px; height: 10px; @@ -24,6 +86,12 @@ .icon.s10.gear { background-image: url("../../../images/icons/10/gear.png"); } +.icon.s10.like { + background-image: url("icons/like.png"); +} +.icon.s10.dislike { + background-image: url("icons/dislike.png"); +} .icon.s10.add { background-image: url("../../../images/icons/10/add.png"); } @@ -82,6 +150,12 @@ .icon.s16.gear { background-image: url("../../../images/icons/16/gear.png"); } +.icon.s16.like { + background-image: url("icons/like.png"); +} +.icon.s16.dislike { + background-image: url("icons/dislike.png"); +} .icon.s16.add { background-image: url("../../../images/icons/16/add.png"); } @@ -140,6 +214,12 @@ .icon.s22.gear { background-image: url("../../../images/icons/22/gear.png"); } +.icon.s22.like { + background-image: url("icons/like.png"); +} +.icon.s22.dislike { + background-image: url("icons/dislike.png"); +} .icon.s22.add { background-image: url("../../../images/icons/22/add.png"); } @@ -198,6 +278,12 @@ .icon.s48.gear { background-image: url("../../../images/icons/48/gear.png"); } +.icon.s48.like { + background-image: url("icons/like.png"); +} +.icon.s48.dislike { + background-image: url("icons/dislike.png"); +} .icon.s48.add { background-image: url("../../../images/icons/48/add.png"); } @@ -267,7 +353,8 @@ body { h4 { font-size: 1.1em; } -a, a:link { +a, +a:link { color: #005c94; text-decoration: none; } @@ -336,6 +423,9 @@ code { .tool .action { float: right; } +.tool li > img { + float: left; +} /* popup notifications */ #jGrowl.top-right { top: 30px; @@ -489,7 +579,8 @@ nav #nav-site-linkmenu .menu-popup { right: 0px; left: auto; } -nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify { +nav #nav-notifications-linkmenu.on .icon.s22.notify, +nav #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png"); } nav #nav-apps-link.selected { @@ -678,11 +769,15 @@ aside #profiles-menu { height: 48px; } /* group member */ -#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper { +#contact-edit-drop-link, +.mail-list-delete-wrapper, +.group-delete-wrapper { float: right; margin-right: 50px; } -#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide { +#contact-edit-drop-link .drophide, +.mail-list-delete-wrapper .drophide, +.group-delete-wrapper .drophide { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; @@ -691,7 +786,9 @@ aside #profiles-menu { position: relative; top: -50px; } -#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop { +#contact-edit-drop-link .drop, +.mail-list-delete-wrapper .drop, +.group-delete-wrapper .drop { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; @@ -821,7 +918,8 @@ section { display: table; width: 750px; } -.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { +.wall-item-container .wall-item-item, +.wall-item-container .wall-item-bottom { display: table-row; } .wall-item-container .wall-item-bottom { @@ -859,11 +957,13 @@ section { .wall-item-container .wall-item-content img { max-width: 710px; } -.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { +.wall-item-container .wall-item-links, +.wall-item-container .wall-item-actions { display: table-cell; vertical-align: middle; } -.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { +.wall-item-container .wall-item-links .icon, +.wall-item-container .wall-item-actions .icon { opacity: 0.5; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -871,7 +971,8 @@ section { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { +.wall-item-container .wall-item-links .icon:hover, +.wall-item-container .wall-item-actions .icon:hover { opacity: 1; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -1015,9 +1116,6 @@ section { opacity: 0.5; } .wwto { - position: absolute !important; - width: 25px; - height: 25px; background: #FFFFFF; border: 2px solid #364e59; height: 25px; @@ -1248,7 +1346,9 @@ section { height: 18px; }*/ /** acl **/ -#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { +#photo-edit-perms-select, +#photos-upload-permissions-wrapper, +#profile-jot-acl-wrapper { display: block!important; } #acl-wrapper { @@ -1407,10 +1507,12 @@ ul.tabs li .active { float: left; width: 200px; } -.field input, .field textarea { +.field input, +.field textarea { width: 400px; } -.field input[type="checkbox"], .field input[type="radio"] { +.field input[type="checkbox"], +.field input[type="radio"] { width: auto; } .field textarea { @@ -1537,10 +1639,126 @@ ul.tabs li .active { width: 50px; float: left; } -/* photo */ -.lframe { +/* photo albums */ +#photo-edit-link-wrap { + margin-bottom: 10px; +} +#album-edit-link { + border-right: 1px solid #364e59; + float: left; + padding-right: 5px; + margin-right: 5px; +} +#photo-edit-link, +#album-edit-link a { + background: url("../../../images/icons/16/edit.png") no-repeat left center; + padding-left: 18px; +} +#photo-toprofile-link { + background: url("../../../images/icons/16/user.png") no-repeat left center; + padding-left: 18px; +} +.photos-upload-link a, +#photo-top-upload-link { + background: url("../../../images/icons/16/add.png") no-repeat left center; + padding-left: 18px; +} +.photo-top-image-wrapper, +.photo-album-image-wrapper { float: left; margin: 0px 10px 10px 0px; + width: 150px; + height: 150px; + position: relative; + overflow: hidden; +} +.photo-top-image-wrapper img, +.photo-album-image-wrapper img { + width: 150px; +} +.photo-top-image-wrapper .photo-top-album-name, +.photo-album-image-wrapper .photo-top-album-name, +.photo-top-image-wrapper .caption, +.photo-album-image-wrapper .caption { + position: absolute; + color: #2d2d2d; + background-color: #ffffff; + width: 100%; + -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); + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; + -o-transition: all 0.5s ease-in-out; + -ms-transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; + bottom: -150px; +} +.photo-top-image-wrapper:hover .photo-top-album-name, +.photo-album-image-wrapper:hover .photo-top-album-name, +.photo-top-image-wrapper:hover .caption, +.photo-album-image-wrapper:hover .caption { + bottom: 0px; + -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); + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; + -o-transition: all 0.5s ease-in-out; + -ms-transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; +} +#photo-photo { + display: block; + width: 660px; + padding: 50px; + margin-bottom: 0px; + text-align: center; + background-color: #999999; +} +#photo-photo img { + max-width: 560px; +} +#photo-album-title { + background: url("../../../images/icons/22/image.png") no-repeat top left; + padding-left: 23px; + min-height: 22px; +} +#photo-album-title a { + display: block; + padding-top: 5px; +} +#photo-caption { + display: block; + width: 660px; + min-height: 55px; + background-color: #cccccc; + padding: 0 50px 0 50px; +} +#photo-next-link > a > div { + background: url("icons/next.png") no-repeat center center; + float: right; + width: 50px; + height: 50px; +} +#photo-prev-link > a > div { + background: url("icons/prev.png") no-repeat center center; + float: left; + width: 50px; + height: 50px; +} +#photo-like-div { + display: block; + width: 660px; + height: 30px; + background-color: #cccccc; + padding: 0 50px 0 50px; +} +#photo-like-div .icon { + float: left; +} +#photo-like-div .like-rotator { + float: right; } /* profile match wrapper */ .profile-match-wrapper { @@ -1641,13 +1859,15 @@ ul.tabs li .active { transition: all 0.2s ease-in-out; } /* theme screenshot */ -.screenshot, #theme-preview { +.screenshot, +#theme-preview { position: absolute; width: 202px; left: 70%; top: 50px; } -.screenshot img, #theme-preview img { +.screenshot img, +#theme-preview img { width: 200px; height: 150px; } diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index ecf4ff9860..23fd4cb414 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -10,10 +10,72 @@ overflow: hidden; text-indent: -9999px; padding: 1px; + min-width: 22px; + height: 22px; } .icon.text { text-indent: 0px; } +.icon.notify { + background-image: url("../../../images/icons/22/notify_off.png"); +} +.icon.gear { + background-image: url("../../../images/icons/22/gear.png"); +} +.icon.like { + background-image: url("icons/like.png"); +} +.icon.dislike { + background-image: url("icons/dislike.png"); +} +.icon.add { + background-image: url("../../../images/icons/22/add.png"); +} +.icon.delete { + background-image: url("../../../images/icons/22/delete.png"); +} +.icon.edit { + background-image: url("../../../images/icons/22/edit.png"); +} +.icon.star { + background-image: url("../../../images/icons/22/star.png"); +} +.icon.menu { + background-image: url("../../../images/icons/22/menu.png"); +} +.icon.link { + background-image: url("../../../images/icons/22/link.png"); +} +.icon.lock { + background-image: url("../../../images/icons/22/lock.png"); +} +.icon.unlock { + background-image: url("../../../images/icons/22/unlock.png"); +} +.icon.plugin { + background-image: url("../../../images/icons/22/plugin.png"); +} +.icon.type-unkn { + background-image: url("../../../images/icons/22/zip.png"); +} +.icon.type-audio { + background-image: url("../../../images/icons/22/audio.png"); +} +.icon.type-video { + background-image: url("../../../images/icons/22/video.png"); +} +.icon.type-image { + background-image: url("../../../images/icons/22/image.png"); +} +.icon.type-text { + background-image: url("../../../images/icons/22/text.png"); +} +.icon.language { + background-image: url("icons/language.png"); +} +.icon.text { + padding: 10px 0px 0px 25px; +} .icon.s10 { min-width: 10px; height: 10px; @@ -24,6 +86,12 @@ .icon.s10.gear { background-image: url("../../../images/icons/10/gear.png"); } +.icon.s10.like { + background-image: url("icons/like.png"); +} +.icon.s10.dislike { + background-image: url("icons/dislike.png"); +} .icon.s10.add { background-image: url("../../../images/icons/10/add.png"); } @@ -82,6 +150,12 @@ .icon.s16.gear { background-image: url("../../../images/icons/16/gear.png"); } +.icon.s16.like { + background-image: url("icons/like.png"); +} +.icon.s16.dislike { + background-image: url("icons/dislike.png"); +} .icon.s16.add { background-image: url("../../../images/icons/16/add.png"); } @@ -140,6 +214,12 @@ .icon.s22.gear { background-image: url("../../../images/icons/22/gear.png"); } +.icon.s22.like { + background-image: url("icons/like.png"); +} +.icon.s22.dislike { + background-image: url("icons/dislike.png"); +} .icon.s22.add { background-image: url("../../../images/icons/22/add.png"); } @@ -198,6 +278,12 @@ .icon.s48.gear { background-image: url("../../../images/icons/48/gear.png"); } +.icon.s48.like { + background-image: url("icons/like.png"); +} +.icon.s48.dislike { + background-image: url("icons/dislike.png"); +} .icon.s48.add { background-image: url("../../../images/icons/48/add.png"); } @@ -267,7 +353,8 @@ body { h4 { font-size: 1.1em; } -a, a:link { +a, +a:link { color: #009100; text-decoration: none; } @@ -336,6 +423,9 @@ code { .tool .action { float: right; } +.tool li > img { + float: left; +} /* popup notifications */ #jGrowl.top-right { top: 30px; @@ -489,7 +579,8 @@ nav #nav-site-linkmenu .menu-popup { right: 0px; left: auto; } -nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify { +nav #nav-notifications-linkmenu.on .icon.s22.notify, +nav #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png"); } nav #nav-apps-link.selected { @@ -678,11 +769,15 @@ aside #profiles-menu { height: 48px; } /* group member */ -#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper { +#contact-edit-drop-link, +.mail-list-delete-wrapper, +.group-delete-wrapper { float: right; margin-right: 50px; } -#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide { +#contact-edit-drop-link .drophide, +.mail-list-delete-wrapper .drophide, +.group-delete-wrapper .drophide { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; @@ -691,7 +786,9 @@ aside #profiles-menu { position: relative; top: -50px; } -#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop { +#contact-edit-drop-link .drop, +.mail-list-delete-wrapper .drop, +.group-delete-wrapper .drop { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; @@ -821,7 +918,8 @@ section { display: table; width: 750px; } -.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { +.wall-item-container .wall-item-item, +.wall-item-container .wall-item-bottom { display: table-row; } .wall-item-container .wall-item-bottom { @@ -859,11 +957,13 @@ section { .wall-item-container .wall-item-content img { max-width: 710px; } -.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { +.wall-item-container .wall-item-links, +.wall-item-container .wall-item-actions { display: table-cell; vertical-align: middle; } -.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { +.wall-item-container .wall-item-links .icon, +.wall-item-container .wall-item-actions .icon { opacity: 0.5; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -871,7 +971,8 @@ section { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { +.wall-item-container .wall-item-links .icon:hover, +.wall-item-container .wall-item-actions .icon:hover { opacity: 1; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -1015,9 +1116,6 @@ section { opacity: 0.5; } .wwto { - position: absolute !important; - width: 25px; - height: 25px; background: #FFFFFF; border: 2px solid #364e59; height: 25px; @@ -1248,7 +1346,9 @@ section { height: 18px; }*/ /** acl **/ -#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { +#photo-edit-perms-select, +#photos-upload-permissions-wrapper, +#profile-jot-acl-wrapper { display: block!important; } #acl-wrapper { @@ -1407,10 +1507,12 @@ ul.tabs li .active { float: left; width: 200px; } -.field input, .field textarea { +.field input, +.field textarea { width: 400px; } -.field input[type="checkbox"], .field input[type="radio"] { +.field input[type="checkbox"], +.field input[type="radio"] { width: auto; } .field textarea { @@ -1537,10 +1639,126 @@ ul.tabs li .active { width: 50px; float: left; } -/* photo */ -.lframe { +/* photo albums */ +#photo-edit-link-wrap { + margin-bottom: 10px; +} +#album-edit-link { + border-right: 1px solid #364e59; + float: left; + padding-right: 5px; + margin-right: 5px; +} +#photo-edit-link, +#album-edit-link a { + background: url("../../../images/icons/16/edit.png") no-repeat left center; + padding-left: 18px; +} +#photo-toprofile-link { + background: url("../../../images/icons/16/user.png") no-repeat left center; + padding-left: 18px; +} +.photos-upload-link a, +#photo-top-upload-link { + background: url("../../../images/icons/16/add.png") no-repeat left center; + padding-left: 18px; +} +.photo-top-image-wrapper, +.photo-album-image-wrapper { float: left; margin: 0px 10px 10px 0px; + width: 150px; + height: 150px; + position: relative; + overflow: hidden; +} +.photo-top-image-wrapper img, +.photo-album-image-wrapper img { + width: 150px; +} +.photo-top-image-wrapper .photo-top-album-name, +.photo-album-image-wrapper .photo-top-album-name, +.photo-top-image-wrapper .caption, +.photo-album-image-wrapper .caption { + position: absolute; + color: #2d2d2d; + background-color: #ffffff; + width: 100%; + -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); + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; + -o-transition: all 0.5s ease-in-out; + -ms-transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; + bottom: -150px; +} +.photo-top-image-wrapper:hover .photo-top-album-name, +.photo-album-image-wrapper:hover .photo-top-album-name, +.photo-top-image-wrapper:hover .caption, +.photo-album-image-wrapper:hover .caption { + bottom: 0px; + -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); + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; + -o-transition: all 0.5s ease-in-out; + -ms-transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; +} +#photo-photo { + display: block; + width: 660px; + padding: 50px; + margin-bottom: 0px; + text-align: center; + background-color: #999999; +} +#photo-photo img { + max-width: 560px; +} +#photo-album-title { + background: url("../../../images/icons/22/image.png") no-repeat top left; + padding-left: 23px; + min-height: 22px; +} +#photo-album-title a { + display: block; + padding-top: 5px; +} +#photo-caption { + display: block; + width: 660px; + min-height: 55px; + background-color: #cccccc; + padding: 0 50px 0 50px; +} +#photo-next-link > a > div { + background: url("icons/next.png") no-repeat center center; + float: right; + width: 50px; + height: 50px; +} +#photo-prev-link > a > div { + background: url("icons/prev.png") no-repeat center center; + float: left; + width: 50px; + height: 50px; +} +#photo-like-div { + display: block; + width: 660px; + height: 30px; + background-color: #cccccc; + padding: 0 50px 0 50px; +} +#photo-like-div .icon { + float: left; +} +#photo-like-div .like-rotator { + float: right; } /* profile match wrapper */ .profile-match-wrapper { @@ -1641,13 +1859,15 @@ ul.tabs li .active { transition: all 0.2s ease-in-out; } /* theme screenshot */ -.screenshot, #theme-preview { +.screenshot, +#theme-preview { position: absolute; width: 202px; left: 70%; top: 50px; } -.screenshot img, #theme-preview img { +.screenshot img, +#theme-preview img { width: 200px; height: 150px; } diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less index ae7459dfc6..f9be4cc723 100644 --- a/view/theme/quattro/icons.less +++ b/view/theme/quattro/icons.less @@ -5,6 +5,9 @@ &.notify { background-image: url("../../../images/icons/@{size}/notify_off.png"); } &.gear { background-image: url("../../../images/icons/@{size}/gear.png"); } + &.like { background-image: url("icons/like.png"); } + &.dislike { background-image: url("icons/dislike.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"); } @@ -40,6 +43,10 @@ text-indent: 0px; } + min-width:22px; height: 22px; + .icons(22); + &.text { padding: 10px 0px 0px 25px; } + &.s10 { min-width:10px; height: 10px; .icons(10); diff --git a/view/theme/quattro/icons/addon_off.png b/view/theme/quattro/icons/addon_off.png index 40b53259a20a616c8b35e779cb1c086023a17125..0fcce4d5abe02fd91f47054311ee2cc6c567eaa3 100644 GIT binary patch literal 834 zcmV-I1HJr-P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY= z4G1NLQnm{K00P2EL_t(I%hi-mXjFF)$G`LY{odQRyNR1*(U?OcwStgCX`tv;QBZ6P zwiiojONpm?5pU973O#!eS|~jPEEN$16+{%#*h8h-Lun304<3@5G}$Jb&E~!Ld%ySl zGrja+((clhUYy&^Fdt^V!wm308}&-ueK@;=gm{mDj{r;nSZ3yXf%%KW`(OR>Ujgqu znmtsnRllyr(QYC_X&pQVSnFY|gZKVIR)neJ2PVVTTDdiF=ZBy74c2Sljy8v0-afpI zt4T~sNe~gFlq?A3LU@f4YOf!8cjoq$3!9+odFS%&?-M2EJGCU4L0v2!SC5K?*@q2o{2v2w>*1i#NZMJv($h1StZHwMcaV z1|yCXhzJ0InZe8m%;bGQ@S$AU(7iPbKIC3_UzS#y(jt-)f(TLwFaRF{ocCm{XKNi< z=R2oQ9Oa%Pm(D)6&V89_gTj_UeiU< zO7ns^Fh@#JHK}kVQXoNGniAbChc@P$XV2#E^aTRI2X7sm>1O)OS~tzJ!jSWUl~NQ~ zpwO1uX^xFdUs_mNJN?P2DgBR6@3ZL}=NgT{GcS#e($4Kobk@80b#WOh?e@dThB*4> z+s8V8S0{P_e_Pixi|b}-VZFd|YI%M&!`$kITj=Doy3?BX~dipMY0CKlx;})BW_pFLO_S znrmbJ_b#;7U*%bLz8_HaOSambODaxoiKL#Sg+;FO_Vn2gQ@qgj2lFC%_ar^g;{X5v M07*qoM6N<$g4D-&&j0`b literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1Ig&jCImu4aCb zLjd_w(~;qe`r|-hQ4-`A%;50sMjD8d?NMQuIzW%m_@`T{iL`ZfI|A7E{-7*my;6?a7idK%Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY= z4GAs_n_j{I00K)%L_t(I%hi-iNK|nY#((EOd?go_~Bw~5w4v<)J{w2e_YKE^w*dv9~SuhSx0WQ>#2rf>W4{mui< zfqyKiW#|-H8WW>vbOB{Rp@8s4U{XeSy&+)yL=H*Y;5)KIib3#l5V-JtMX6eX>I1pV zwZ8)D1nu-6vvlu>O8c-77Qy}i_9s{^p@q*X`58f@3Aw_JwR!VLiKfPvY(0#0o)kJy zLEC=F4ng}MWCxLseL{A(YQU&IqPsrO508*YLF|H;16CoCfK&@)Iv}$hTKa@UGa53! zHlF-#-1~H@AE(91L3tW*03QMi6p$1ow?MKPG0m#Jb98;64yB)0u}n3LaBOhP;FTfte|8te5QN});5y(qXuxdU9ZJXy`FW*mfosF6 z2Vn?d1fBzS5eiFSSCELYxi}3sf;sM7iexX zqpNyG=4J&qg2n-8IRKeK&*q=dW5x=0HL|@BFNjn%UP`A^ x&o=cBf9c+fw@v*$-P?NMQuIzW%m_@|oPNuG31Qb&Bba4!kxSX7DfJ;J=p_f}cDaA$DQ9J=iF6?JWY)|~f cdUZQP!g+>6ff^V*UHx3vIVCg!04kt$cK`qY diff --git a/view/theme/quattro/icons/dislike.png b/view/theme/quattro/icons/dislike.png new file mode 100644 index 0000000000000000000000000000000000000000..23de426c5a6def7113c12ee557789e8d0b6c8d2e GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfzsxE9dR0y+Bi#JY5_^EKaYz zv|rD~QRMi?^Lgv0>T)DyCKz!QQqChO=E7Ie&6HQoqNY-D#Ak zXFkdHGz?8hteN~y^dL_iIuBP?dhmo&Uaze&N9(|%3-We1Yd+Xlo~iq z*(9L0XvKf`Ka%InO(f>AYar!Uc zvs*iSZH~P>KI5lvv(@gyn)iflt^P9}aGo^zYUeGMA06BGKUB-ykbhc=!8yh?Zv7|i b#~bw>=6Z6*G3RRm1Bk)X)z4*}Q$iB})^3>v literal 0 HcmV?d00001 diff --git a/view/theme/quattro/icons/like.png b/view/theme/quattro/icons/like.png new file mode 100644 index 0000000000000000000000000000000000000000..b65edccc07e0125f663ff738e6983ae01a239e96 GIT binary patch literal 388 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfzsxk@<-kPC!#wJY5_^EKYB| zZ0p71DA4vWz3ix{qk!liP8LTOgHJ3{65Z|}^s4y{Kk+n8oRz84maU{D(b359ug5w$ zXtT-T4!#V>%dr7puZ73n{j>S(BLVRj$-Cq({A4s}GtEg*{S(&k(PPdLqg}a-#Tt+P zbZ+8JV2qx@vHys>?TSfTx^ve&VzYgdXul+UuYaQO>xe@Om|`FCE}wCb&u@Y|_tjI2 zr?Ssk?$xIFQKH*|YroH=(<$<92QSKoRQK_G_Pk%Jt+Z@;;<~vWRlN3}yW1y4MSAB1 zO<4NioH^rNmH@K@?#gRL?i|0fyU?+`qJR1fG3^gc+A+(y*eduE8l!E@JoG-a7|Z-Q cS^k&l@>YB4AFAC<>&kwInMX)pEY`$xA5dtGr;B5V#p$D0 z47nQ}CD=d2=cE|z(QH23VxTeqr29uko>LjyC3H1XO|>Vlv190F-248)yHoq~cI>LN zy>9#c!%U-PHc5zW3O>A*+v9|z>#25e~Z<=f?KE^>B*)`}8=F0&119Q!4X zE$Ei{A`+b0R>@c8rZ2Kqe1Un1)5R#pD);|?6Hdxc`f|!sUN!T!O75E_@%ldtJnZ%@ oV$b=RUGMs}b*mdKI;Vst0AdDj5C8xG literal 0 HcmV?d00001 diff --git a/view/theme/quattro/icons/prev.png b/view/theme/quattro/icons/prev.png new file mode 100644 index 0000000000000000000000000000000000000000..55c1464ba016c02da4c7ccb23d33203e25ab0eb1 GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~wj^(N7l!{J zxM1({$v_d#0*}aI1_o|n5N2eUHAey{$X?><>&kwInMX*^WTL;NG*IY*r;B5V#p%6Q z4ZWKjB^Vy4=VoY!aNLp=ky84we#>|DBRl_J3|rB>!?N?5$de0?uFTKK652ma*zOV2 z`^&FeA6r<+-J4$hzVD00QRZn9i=Q@F92RiRx}K8M!Sy$Yp%|n zVSmx{=(@V8I}h7kSl#5SbVE9C^%TqQg!MZ-kIt&-OyG`Lp7cE8Z)0ijMz(8$Iep*k z9M0Mw3G_Z!q!D>b%{w`LXH}$J`=`%eWgLHp{{F!IU841?=b07iX*&;^D6rl;T>fG2 b?GMa0R`K7$PWHC|{l?(w>gTe~DWM4fA?$?c literal 0 HcmV?d00001 diff --git a/view/theme/quattro/photo_view.tpl b/view/theme/quattro/photo_view.tpl new file mode 100644 index 0000000000..3b7a662716 --- /dev/null +++ b/view/theme/quattro/photo_view.tpl @@ -0,0 +1,37 @@ +
+

$album.1

+ + + +
+{{ if $prevlink }}{{ endif }} +{{ if $nextlink }}{{ endif }} +
$desc
+{{ if $tags }} +
$tags.0
+
$tags.1
+{{ endif }} +{{ if $tags.2 }}{{ endif }} + +{{ if $edit }}$edit{{ endif }} + +{{ if $likebuttons }} +
+ $likebuttons + $like + $dislike +
+{{ endif }} +
+ $comments +
+ +$paginate + diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 9099f0be16..2e4c0da389 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -27,13 +27,17 @@ h4 { font-size: 1.1em } .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; + .transition(); } +.transition(@d: 0.2s){ + -webkit-transition: all @d ease-in-out; + -moz-transition: all @d ease-in-out; + -o-transition: all @d ease-in-out; + -ms-transition: all @d ease-in-out; + transition: all @d ease-in-out; +} + a, a:link { color: @Link; text-decoration: none; } a:visited { color: @LinkVisited; text-decoration: none; } @@ -81,6 +85,7 @@ code { height: auto; overflow: auto; .label { float: left;} .action { float: right; } + li > img { float: left; } } @@ -1068,12 +1073,102 @@ ul.tabs { width: 50px; float: left; } -/* photo */ -.lframe { +/* photo albums */ +@photosize: 150px; + +#photo-edit-link-wrap { margin-bottom: 10px; } + +#album-edit-link { + border-right: 1px solid @MenuBorder; float: left; - margin: 0px 10px 10px 0px; + padding-right: 5px; + margin-right: 5px; +} +#photo-edit-link, +#album-edit-link a { + background: url("../../../images/icons/16/edit.png") no-repeat left center; + padding-left: 18px; +} +#photo-toprofile-link { + background: url("../../../images/icons/16/user.png") no-repeat left center; + padding-left: 18px; } +.photos-upload-link a, +#photo-top-upload-link { + background: url("../../../images/icons/16/add.png") no-repeat left center; + padding-left: 18px; +} + + +.photo-top-image-wrapper, +.photo-album-image-wrapper { + float: left; + margin: 0px 10px 10px 0px; + width:@photosize; height: @photosize; + position: relative; + overflow: hidden; + + img { width: @photosize; } + + .photo-top-album-name, + .caption{ + position: absolute; + color: @Menu; + background-color: @MenuBg; + + width: 100%; + .shadow(0px, 5px); + .transition(0.5s); + bottom: -@photosize; + } + + &:hover .photo-top-album-name, + &:hover .caption { + bottom: 0px; + .shadow(0px, 0px); + .transition(0.5s); + } +} + +#photo-photo { + display: block; width: 660px; + padding: 50px; margin-bottom: 0px; + text-align: center; + background-color: @Grey3; + img { max-width: 560px; } +} +#photo-album-title { + background: url("../../../images/icons/22/image.png") no-repeat top left; + padding-left: 23px; + min-height: 22px; + a { display: block; padding-top: 5px; } +} + +#photo-caption { + display: block; width: 660px; + min-height: 55px; + background-color: @Grey2; + padding:0 50px 0 50px; +} +#photo-next-link > a > div { + background: url("icons/next.png") no-repeat center center; + float: right; + width: 50px; height: 50px; +} +#photo-prev-link > a > div { + background: url("icons/prev.png") no-repeat center center; + float: left; + width: 50px; height: 50px; +} +#photo-like-div { + display: block; width: 660px; + height: 30px; + background-color: @Grey2; + padding:0 50px 0 50px; + .icon {float: left;} + .like-rotator {float: right;} +} /* profile match wrapper */ .profile-match-wrapper { float: left; From a03e6b96ea96c81d4cb1a1e8c4e86a8a3a82863e Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Fri, 29 Jun 2012 05:47:53 -0400 Subject: [PATCH 3/3] quattro: fix Forum widget, hide edit profile link --- view/theme/quattro/dark/style.css | 5 ++++- view/theme/quattro/green/style.css | 5 ++++- view/theme/quattro/quattro.less | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index d115453bc6..35595c8bc5 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -423,7 +423,7 @@ code { .tool .action { float: right; } -.tool li > img { +.tool > img { float: left; } /* popup notifications */ @@ -690,6 +690,9 @@ aside { padding: 0px 10px 0px 20px; border-right: 1px solid #bdcdd4; } +aside .profile-edit-side-div { + display: none; +} aside .vcard .fn { font-size: 16px; font-weight: bold; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 23fd4cb414..57fa38aa19 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -423,7 +423,7 @@ code { .tool .action { float: right; } -.tool li > img { +.tool > img { float: left; } /* popup notifications */ @@ -690,6 +690,9 @@ aside { padding: 0px 10px 0px 20px; border-right: 1px solid #bdcdd4; } +aside .profile-edit-side-div { + display: none; +} aside .vcard .fn { font-size: 16px; font-weight: bold; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 2e4c0da389..0dac79bf9c 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -85,7 +85,7 @@ code { height: auto; overflow: auto; .label { float: left;} .action { float: right; } - li > img { float: left; } + > img { float: left; } } @@ -287,6 +287,8 @@ aside { padding:0px 10px 0px 20px; border-right: 1px solid @AsideBorder; + .profile-edit-side-div { display: none; } + .vcard { .fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; } .title { margin-bottom: 5px; }