diff --git a/view/contact_block.tpl b/view/contact_block.tpl index df56143983..eb46c6c43c 100644 --- a/view/contact_block.tpl +++ b/view/contact_block.tpl @@ -1,7 +1,7 @@

$contacts

{{ if $micropro }} - $viewcontacts + $viewcontacts
{{ for $micropro as $m }} $m diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index d151cfa1cd..26a21bcf1a 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -103,11 +103,11 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{box-shadow:3px 3px 10px 0 #000;} #asidemain h4{font-size:1.2em;} #asidemain #viewcontacts{text-align:right;} +#asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;} .aprofile dt{background:#eec;color:#2e2f2e;font-weight:bold;box-shadow:1px 1px 5px 0 #000;margin:15px 0 5px;padding-left:5px;} #profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;} #dfrn-request-link{background:#3465a4 url(dark/connect.png) no-repeat 95% center;border-radius:5px 5px 5px 5px;color:#eec;display:block;font-size:1.2em;padding:0.2em 0.5em;} #wallmessage-link{color:#eee;display:block;font-size:1.2em;padding:0.2em 0.5em;} -#netsearch-box{margin:20px 0px 30px;width:150px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;} .ttright{margin:0px 0px 0px 0px;} .contact-block-div{width:50px;height:50px;float:left;} .contact-block-textdiv{width:150px;height:34px;float:left;} @@ -215,7 +215,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-body code{display:block;padding:0 0 10px 5px;border-color:#ccc;border-style:solid;border-width:1px 1px 1px 10px;background:#eee;color:#2e2f2e;width:95%;} div[id$="text"]{font-weight:bold;border-bottom:1px solid #ccc;} div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;} -[id$="-end"],[class$="end"]{clear:both;margin:0 0 10px 0;} +.profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;} +.icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;} +[id$="-end"],[class$="-end"]{clear:both;margin:0 0 10px 0;} +.profile-match-end{margin:0 0 5px 0;} +.profile-match-name{font-weight:bold;margin:auto auto auto 23px;} +.profile-match-connect{font-style:italic;margin:auto auto auto 23px;} #advanced-profile-with{margin-left:200px;} .photos{height:auto;overflow:auto;} #photo-top-links{margin-bottom:30px;} @@ -227,8 +232,8 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le .caption{position:absolute;bottom:0;margin:0 5px;} #photo-photo{position:relative;float:left;} #photo-prev-link,#photo-next-link{position:absolute;width:30%;height:100%;background-color:rgba(255, 255, 255, 0.5);opacity:0;-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;background-position:center center;background-repeat:no-repeat;} -#photo-prev-link{left:0;top:0;background-image:url(dark/prev.png);} -#photo-next-link{right:0;top:0;background-image:url(dark/next.png);} +#photo-prev-link{background-image:url(dark/prev.png);height:350px;left:1%;top:215px;width:50px;z-index:10;} +#photo-next-link{background-image:url(dark/next.png);height:350px;right:45%;top:215px;width:50px;} #photo-prev-link a,#photo-next-link a{display:block;width:100%;height:100%;overflow:hidden;text-indent:-900000px;} #photo-prev-link:hover{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;} #photo-next-link:hover{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;} @@ -376,10 +381,10 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le #peoplefind-sidebar form{margin-bottom:10px;} #sidebar-new-group:hover{} #sidebar-new-group:active{position:relative;top:1px;} -#side-peoplefind-url{background-color:#2e2f2e;color:#eec;border:1px 999 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;} +#side-peoplefind-url{background-color:#2e2f2e;color:#eec;border:1px #999 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;} .nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;} .nets-link,.nets-all{margin-left:0px;} -#netsearch-box{margin-top:20px;width:150px;}#netsearch-box #search-submit{margin:5px 0px 0px 0px;} +#netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;} #pending-update{float:right;color:#fff;font-weight:bold;background-color:#ff0000;padding:0 .3em;} .admin.linklist{border:0;padding:0;} .admin.link{list-style-position:inside;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index 6bab0109a0..c56adf5a18 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -693,10 +693,26 @@ nav #nav-notifications-linkmenu { */ #asidemain { - h4 { - font-size: 1.2em; } - #viewcontacts { - text-align: right; } } + h4 { + font-size: 1.2em; } + #viewcontacts { + text-align: right; + } + #contact-block { + width: 99%; + .contact-block-content { + width: 99%; + .contact-block-div { + float: left; + margin: 0 5px 5px 0; + width: 50px; + height: 50px; + padding: 3px; + position: relative; + } + } + } +} .aprofile dt { background: #eec; @@ -727,12 +743,6 @@ nav #nav-notifications-linkmenu { font-size: 1.2em; padding: 0.2em 0.5em; } -#netsearch-box { - margin: 20px 0px 30px; - width: 150px; - #search-submit { - margin: 5px 5px 0px 0px; } } - .ttright { margin: 0px 0px 0px 0px; } @@ -1385,10 +1395,36 @@ div { br { clear: left; } } } -[id$="-end"], [class$="end"] { +.profile-match-wrapper { + float: left; + margin: 0 5px 40px 0; + width: 120px; + height: 120px; + padding: 3px; + position: relative; +} +.icon.drophide.profile-match-ignore { + margin: 0 6px 0 -3px; +} +.profile-match-photo { + +} + +[id$="-end"], [class$="-end"] { clear: both; margin: 0 0 10px 0; } +.profile-match-end { + margin: 0 0 5px 0; +} +.profile-match-name { + font-weight: bold; + margin: auto auto auto 23px; +} +.profile-match-connect { + font-style: italic; + margin: auto auto auto 23px; +} #advanced-profile-with { margin-left: 200px; } @@ -1459,14 +1495,21 @@ div { background-repeat: no-repeat; } #photo-prev-link { - left: 0; - top: 0; - background-image: url(dark/prev.png); } + background-image: url(dark/prev.png); + height: 350px; + left: 1%; + top: 215px; + width: 50px; + z-index: 10; +} #photo-next-link { - right: 0; - top: 0; - background-image: url(dark/next.png); } + background-image: url(dark/next.png); + height: 350px; + right: 45%; + top: 215px; + width: 50px; +} #photo-prev-link a, #photo-next-link a { display: block; @@ -2155,7 +2198,7 @@ div { #side-peoplefind-url { background-color: #2e2f2e; color: #eec; - border: 1px 999 solid; + border: 1px #999 solid; margin-right: 3px; width: 75%; &:hover, &:focus { @@ -2173,10 +2216,12 @@ div { margin-left: 0px; } #netsearch-box { - margin-top: 20px; - width: 150px; - #search-submit { - margin: 5px 0px 0px 0px; } } + margin: 20px 0px 30px; + width: 135px; + #search-submit { + margin: 5px 5px 0px 0px; + } +} /** * admin diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index 7c996f6f97..2c95d70da9 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -103,11 +103,11 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{box-shadow:3px 3px 10px 0 #000;} #asidemain h4{font-size:1.2em;} #asidemain #viewcontacts{text-align:right;} +#asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;} .aprofile dt{background:transparent;color:#666666;font-weight:bold;box-shadow:1px 1px 5px 0 #000;margin:15px 0 5px;padding-left:5px;} #profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;} #dfrn-request-link{background:#3465a4 url(light/connect.png) no-repeat 95% center;border-radius:5px 5px 5px 5px;color:#fff;display:block;font-size:1.2em;padding:0.2em 0.5em;} #wallmessage-link{color:#eee;display:block;font-size:1.2em;padding:0.2em 0.5em;} -#netsearch-box{margin:20px 0px 30px;width:150px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;} .ttright{margin:0px 0px 0px 0px;} .contact-block-div{width:50px;height:50px;float:left;} .contact-block-textdiv{width:150px;height:34px;float:left;} @@ -215,7 +215,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-body code{display:block;padding:0 0 10px 5px;border-color:#ccc;border-style:solid;border-width:1px 1px 1px 10px;background:#eee;color:#444;width:95%;} div[id$="text"]{font-weight:bold;border-bottom:1px solid #ccc;} div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;} -[id$="-end"],[class$="end"]{clear:both;margin:0 0 10px 0;} +.profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;} +.icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;} +[id$="-end"],[class$="-end"]{clear:both;margin:0 0 10px 0;} +.profile-match-end{margin:0 0 5px 0;} +.profile-match-name{font-weight:bold;margin:auto auto auto 23px;} +.profile-match-connect{font-style:italic;margin:auto auto auto 23px;} #advanced-profile-with{margin-left:200px;} .photos{height:auto;overflow:auto;} #photo-top-links{margin-bottom:30px;} @@ -227,8 +232,8 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le .caption{position:absolute;bottom:0;margin:0 5px;} #photo-photo{position:relative;float:left;} #photo-prev-link,#photo-next-link{position:absolute;width:30%;height:100%;background-color:rgba(255, 255, 255, 0.5);opacity:0;-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;background-position:center center;background-repeat:no-repeat;} -#photo-prev-link{left:0;top:0;background-image:url(light/prev.png);} -#photo-next-link{right:0;top:0;background-image:url(light/next.png);} +#photo-prev-link{background-image:url(light/prev.png);height:350px;left:1%;top:215px;width:50px;z-index:10;} +#photo-next-link{background-image:url(light/next.png);height:350px;right:45%;top:215px;width:50px;} #photo-prev-link a,#photo-next-link a{display:block;width:100%;height:100%;overflow:hidden;text-indent:-900000px;} #photo-prev-link:hover{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;} #photo-next-link:hover{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;} @@ -376,10 +381,10 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le #peoplefind-sidebar form{margin-bottom:10px;} #sidebar-new-group:hover{} #sidebar-new-group:active{position:relative;top:1px;} -#side-peoplefind-url{background-color:#e5e0cf;color:#666;border:1px 666 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;} +#side-peoplefind-url{background-color:#e5e0cf;color:#666;border:1px #666 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;} .nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;} .nets-link,.nets-all{margin-left:0px;} -#netsearch-box{margin-top:20px;width:150px;}#netsearch-box #search-submit{margin:5px 0px 0px 0px;} +#netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;} #pending-update{float:right;color:#fff;font-weight:bold;background-color:#ff0000;padding:0 .3em;} .admin.linklist{border:0;padding:0;} .admin.link{list-style-position:inside;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index 141ff731b1..18151bc270 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -694,10 +694,26 @@ nav #nav-notifications-linkmenu { */ #asidemain { - h4 { - font-size: 1.2em; } - #viewcontacts { - text-align: right; } } + h4 { + font-size: 1.2em; } + #viewcontacts { + text-align: right; + } + #contact-block { + width: 99%; + .contact-block-content { + width: 99%; + .contact-block-div { + float: left; + margin: 0 5px 5px 0; + width: 50px; + height: 50px; + padding: 3px; + position: relative; + } + } + } +} .aprofile dt { background: transparent; @@ -728,12 +744,6 @@ nav #nav-notifications-linkmenu { font-size: 1.2em; padding: 0.2em 0.5em; } -#netsearch-box { - margin: 20px 0px 30px; - width: 150px; - #search-submit { - margin: 5px 5px 0px 0px; } } - .ttright { margin: 0px 0px 0px 0px; } @@ -1386,10 +1396,36 @@ div { br { clear: left; } } } -[id$="-end"], [class$="end"] { +.profile-match-wrapper { + float: left; + margin: 0 5px 40px 0; + width: 120px; + height: 120px; + padding: 3px; + position: relative; +} +.icon.drophide.profile-match-ignore { + margin: 0 6px 0 -3px; +} +.profile-match-photo { + +} + +[id$="-end"], [class$="-end"] { clear: both; margin: 0 0 10px 0; } +.profile-match-end { + margin: 0 0 5px 0; +} +.profile-match-name { + font-weight: bold; + margin: auto auto auto 23px; +} +.profile-match-connect { + font-style: italic; + margin: auto auto auto 23px; +} #advanced-profile-with { margin-left: 200px; } @@ -1460,14 +1496,21 @@ div { background-repeat: no-repeat; } #photo-prev-link { - left: 0; - top: 0; - background-image: url(light/prev.png); } + background-image: url(light/prev.png); + height: 350px; + left: 1%; + top: 215px; + width: 50px; + z-index: 10; +} #photo-next-link { - right: 0; - top: 0; - background-image: url(light/next.png); } + background-image: url(light/next.png); + height: 350px; + right: 45%; + top: 215px; + width: 50px; +} #photo-prev-link a, #photo-next-link a { display: block; @@ -2156,7 +2199,7 @@ div { #side-peoplefind-url { background-color: #e5e0cf; color: #666; - border: 1px 666 solid; + border: 1px #666 solid; margin-right: 3px; width: 75%; &:hover, &:focus { @@ -2174,10 +2217,12 @@ div { margin-left: 0px; } #netsearch-box { - margin-top: 20px; - width: 150px; - #search-submit { - margin: 5px 0px 0px 0px; } } + margin: 20px 0px 30px; + width: 135px; + #search-submit { + margin: 5px 5px 0px 0px; + } +} /** * admin diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 52af07532b..35e65f397d 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -40,7 +40,7 @@