diff --git a/mod/editpost.php b/mod/editpost.php index 0cf6d0d4c..9a80d0b2f 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -60,7 +60,7 @@ function editpost_content(&$a) { $tpl = get_markup_template("jot.tpl"); - + if(($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) $lockstate = 'lock'; else @@ -99,10 +99,11 @@ function editpost_content(&$a) { call_hooks('jot_tool', $jotplugins); //call_hooks('jot_networks', $jotnets); - + //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); $o .= replace_macros($tpl,array( + '$is_edit' => true, '$return_path' => $_SESSION['return_url'], '$action' => 'item', '$share' => t('Save'), diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 33b236d0b..bb255fa46 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -422,7 +422,7 @@ body { font-size: 11px; background-color: #ffffff; color: #2d2d2d; - margin: 50px 0px 0px 0px; + margin: 50px 0 0 0; display: table; } h4 { @@ -463,7 +463,7 @@ a:hover { text-decoration: underline; } blockquote { - background: #ffffff; + background: #FFFFFF; padding: 1em; margin-left: 1em; border-left: 1em solid #e6e6e6; @@ -484,14 +484,14 @@ code { width: 10em; background: #ffffff; color: #2d2d2d; - margin: 0px; + margin: 0; padding: 1em; list-style: none; border: 3px solid #364e59; z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); } /* tool */ .tool { @@ -540,9 +540,9 @@ header { position: fixed; left: 43%; right: 43%; - top: 0px; - margin: 0px; - padding: 0px; + top: 0; + margin: 0; + padding: 0; /*width: 100%; height: 12px; */ z-index: 110; color: #ffffff; @@ -577,15 +577,15 @@ nav { width: 100%; height: 32px; position: fixed; - left: 0px; - top: 0px; - padding: 0px; + left: 0; + top: 0; + padding: 0; background-color: #0e232e; color: #ffffff; z-index: 100; - -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-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); } nav a, nav a:active, @@ -597,24 +597,24 @@ nav a:hover { outline: none; } nav ul { - margin: 0px; - padding: 0px 20px; + margin: 0; + padding: 0 20px; } nav ul li { list-style: none; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; float: left; } nav ul li .menu-popup { - left: 0px; + left: 0; right: auto; } nav .nav-menu-icon { position: relative; height: 22px; padding: 5px; - margin: 0px 10px; + margin: 0 10px; -moz-border-radius: 5px 5px 0 0; -webkit-border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0; @@ -633,7 +633,7 @@ nav .nav-menu { position: relative; height: 16px; padding: 5px; - margin: 3px 15px 0px; + margin: 3px 15px 0; font-size: 14px; border-bottom: 3px solid #0e232e; } @@ -649,7 +649,7 @@ nav .nav-notify { border-radius: 5px 5px 5px 5px; font-size: 10px; padding: 1px 3px; - top: 0px; + top: 0; right: -10px; min-width: 15px; text-align: right; @@ -669,7 +669,7 @@ nav #nav-search-link .menu-popup, nav #nav-directory-link .menu-popup, nav #nav-apps-link .menu-popup, nav #nav-site-linkmenu .menu-popup { - right: 0px; + right: 0; left: auto; } nav #nav-notifications-linkmenu.on .icon.s22.notify, @@ -693,14 +693,14 @@ ul.menu-popup { width: 10em; background: #ffffff; color: #2d2d2d; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; list-style: none; border: 3px solid #364e59; z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); } ul.menu-popup a { display: block; @@ -751,9 +751,9 @@ ul.menu-popup .toolbar a:hover { border: 1px solid #364e59; overflow: auto; z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); } .autocomplete > div, .acpopupitem { @@ -819,7 +819,7 @@ aside { display: table-cell; vertical-align: top; width: 200px; - padding: 0px 10px 0px 20px; + padding: 0px 10px 0 20px; border-right: 1px solid #bdcdd4; } aside .profile-edit-side-div { @@ -846,7 +846,7 @@ aside .vcard dl { } aside .vcard dt { float: left; - margin-left: 0px; + margin-left: 0; width: 35%; text-align: right; color: #999999; @@ -857,12 +857,12 @@ aside .vcard dd { width: 60%; } aside #profile-extra-links ul { - padding: 0px; - margin: 0px; + padding: 0; + margin: 0; } aside #profile-extra-links li { - padding: 0px; - margin: 0px; + padding: 0.2em 0; + margin: 0; list-style: none; } aside #wallmessage-link { @@ -887,7 +887,7 @@ aside #dfrn-request-link { -webkit-border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px; color: #ffffff; - background: #005c94 url('../../../images/connect-bg.png') no-repeat left center; + background: #005c94 url('icons/connect-bg.png') no-repeat left center; font-weight: bold; text-transform: uppercase; padding: 4px 2px 2px 35px; @@ -902,7 +902,7 @@ aside #subscribe-feed-link { -webkit-border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px; color: #ffffff; - background: #005c94 url('../../../images/connect-bg.png') no-repeat left center; + background: #005c94 url('icons/rss-bg.png') no-repeat left center; font-weight: bold; text-transform: uppercase; padding: 4px 2px 2px 35px; @@ -924,11 +924,11 @@ aside .posted-date-selector-months { } #contact-block .contact-block-h4 { float: left; - margin: 5px 0px; + margin: 5px 0; } #contact-block .allcontact-link { float: right; - margin: 5px 0px; + margin: 5px 0; } #contact-block .contact-block-content { clear: both; @@ -937,7 +937,7 @@ aside .posted-date-selector-months { } #contact-block .contact-block-link { float: left; - margin: 0px 2px 2px 0px; + margin: 0 2px 2px 0; } #contact-block .contact-block-link img { width: 48px; @@ -1000,11 +1000,11 @@ aside .posted-date-selector-months { /* widget */ .widget { margin-bottom: 2em; - /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} - .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ + /*.action .s10 { width: 10px; overflow: hidden; padding: 0;} + .action .s16 { width: 16px; overflow: hidden; padding: 0;}*/ } .widget h3 { - padding: 0px; + padding: 0; margin: 2px; } .widget .action { @@ -1048,7 +1048,7 @@ aside .posted-date-selector-months { transition: all 0.2s ease-in-out; } .widget ul { - padding: 0px; + padding: 0; } .widget ul li { padding-left: 16px; @@ -1083,7 +1083,7 @@ section { display: table-cell; vertical-align: top; width: 770px; - padding: 0px 20px 0px 10px; + padding: 0px 20px 0 10px; } .sparkle { cursor: url('icons/lock.cur'), pointer; @@ -1216,13 +1216,13 @@ section { } .wall-item-container.comment .contact-photo-menu-button { top: 15px !important; - left: 0px !important; + left: 0 !important; } .wall-item-container.comment .wall-item-links { padding-left: 12px; } .wall-item-container.comment .commentbox { - height: 0px; + height: 0; overflow: hidden; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -1232,7 +1232,7 @@ section { } .wall-item-container.comment .commentbox .wall-item-comment-wrapper { border-top: 1px solid #999999; - height: 0px; + height: 0; overflow: hidden; } .wall-item-container.comment:hover .commentbox { @@ -1245,7 +1245,7 @@ section { transition: all 0.2s ease-in-out; } .wall-item-container.comment:hover .commentbox .wall-item-comment-wrapper { - border-top: 0px; + border-top: 0; height: auto; overflow: visible; } @@ -1289,10 +1289,10 @@ section { border: 1px solid #2d2d2d; } .wall-item-comment-wrapper.photo { - margin: 1em 2em 1em 0px; + margin: 1em 2em 1em 0; } .threaded .wall-item-comment-wrapper { - margin-left: 0px; + margin-left: 0; } .comment-edit-preview { width: 710px; @@ -1321,7 +1321,7 @@ section { padding: 0; margin: 10px 0; background-color: #fce94f; - border-bottom: 0px; + border-bottom: 0; } .comment-edit-preview .wall-item-conv { display: none; @@ -1375,7 +1375,7 @@ section { color: #666666; } /*.filesavetags { - padding: 3px 0px 3px 0px; + padding: 3px 0 3px 0; opacity: 0.5; }*/ .wwto { @@ -1388,9 +1388,9 @@ section { padding: 1px; top: 40px; left: 30px; - -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -webkit-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); } .wwto .contact-photo { width: 25px; @@ -1409,10 +1409,10 @@ section { max-width: 650px; max-height: inital; float: none; - margin-right: 0px; + margin-right: 0; } .type-link blockquote { - margin: 1em 0px; + margin: 1em 0; max-height: 160px; overflow: hidden; padding-left: 1em; @@ -1504,10 +1504,10 @@ blockquote.shared_content { width: 500px; } .children .children .children .children .children .children { - margin-left: 0px; + margin-left: 0; } .children .children .children .children .children .children .hide-comments-outer { - margin-left: 0px; + margin-left: 0; } /*.threaded .hide-comments-outer { margin-left: 20px; }*/ span[id^="showmore-teaser"] { @@ -1550,7 +1550,7 @@ span[id^="showmore-wrap"] { display: block; width: 100%; background-color: #ffffff; - border: 0px; + border: 0; color: #2d2d2d; text-align: left; padding: 5px 10px; @@ -1585,7 +1585,7 @@ span[id^="showmore-wrap"] { width: 300px; height: 90px; padding-right: 10px; - margin: 0 10px 10px 0px; + margin: 0 10px 10px 0; } .contact-wrapper .contact-photo-wrapper { float: left; @@ -1600,7 +1600,7 @@ span[id^="showmore-wrap"] { height: 80px; } .contact-wrapper .contact-photo-menu-button { - left: 0px; + left: 0; top: 63px; } .contact-wrapper .drop { @@ -1657,7 +1657,7 @@ span[id^="showmore-wrap"] { } #jot { width: 100%; - margin: 0px 2em 20px 0px; + margin: 0 2em 20px 0; } #jot .profile-jot-text { height: 1em; @@ -1668,8 +1668,8 @@ span[id^="showmore-wrap"] { padding: 0.3em; } #jot #jot-tools { - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; height: 40px; overflow: none; width: 770px; @@ -1718,9 +1718,9 @@ span[id^="showmore-wrap"] { border-left: 1px solid #666666; } #jot #jot-tools li.submit input { - border: 0px; - margin: 0px; - padding: 0px; + border: 0; + margin: 0; + padding: 0; background-color: #cccccc; color: #666666; width: 80px; @@ -1744,8 +1744,8 @@ span[id^="showmore-wrap"] { margin-top: 10px; } #jot #jot-title { - border: 0px; - margin: 0px; + border: 0; + margin: 0; height: 20px; width: 500px; font-weight: bold; @@ -1772,8 +1772,8 @@ span[id^="showmore-wrap"] { padding-right: 20px; } #jot #jot-category { - border: 0px; - margin: 0px; + border: 0; + margin: 0; height: 20px; width: 200px; border: 1px solid #ffffff; @@ -1786,13 +1786,35 @@ span[id^="showmore-wrap"] { } /** buttons **/ /*input[type="submit"] { - border: 0px; + border: 0; background-color: @ButtonBackgroundColor; color: @ButtonColor; - padding: 0px 10px; + padding: 0 10px; .rounded(5px); height: 18px; }*/ +a.actionbutton { + border: 1px solid #999999; + background-color: #cccccc; + color: #2d2d2d; + font-size: 8pt; + padding: 2pt; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} +a.actionbutton i.icon { + display: inline-block; + vertical-align: baseline; + padding: 0; +} +a.actionbutton:hover { + text-decoration: none; + background-color: #ffffff; +} +h2 > .actionbutton { + float: right; +} /** acl **/ #photo-edit-perms-select, #photos-upload-permissions-wrapper, @@ -1817,7 +1839,7 @@ span[id^="showmore-wrap"] { background-image: url("../../../images/show_all_off.png"); background-position: 7px 7px; background-repeat: no-repeat; - padding: 7px 5px 0px 30px; + padding: 7px 5px 0 30px; color: #999999; -moz-border-radius: 5px 5px 5px 5px; -webkit-border-radius: 5px 5px 5px 5px; @@ -1852,8 +1874,8 @@ span[id^="showmore-wrap"] { .acl-list-item p { height: 12px; font-size: 10px; - margin: 0px; - padding: 2px 0px 1px; + margin: 0; + padding: 2px 0 1px; overflow: hidden; } .acl-list-item a { @@ -2004,7 +2026,7 @@ ul.tabs li .active { display: none!important; } .field.radio .field_help { - margin-left: 0px; + margin-left: 0; } #profile-edit-links li { list-style: none; @@ -2091,7 +2113,7 @@ ul.tabs li .active { .videos .video-top-wrapper { width: 200px; float: left; - margin: 0px 10px 10px 0px; + margin: 0 10px 10px 0; position: relative; } .videos .video-top-wrapper .video-js { @@ -2101,8 +2123,8 @@ ul.tabs li .active { .videos .video-top-wrapper .video-delete { position: absolute; opacity: 0; - right: 0px; - top: 0px; + right: 0; + top: 0; transition: opacity 0.5s; } .videos .video-top-wrapper:hover .video-delete { @@ -2129,7 +2151,7 @@ ul.tabs li .active { } #photo-top-upload-link, .photos-upload-link { - margin: 1em 0px; + margin: 1em 0; display: block; } .photos-upload-link a, @@ -2140,7 +2162,7 @@ ul.tabs li .active { .photo-top-image-wrapper, .photo-album-image-wrapper { float: left; - margin: 0px 10px 10px 0px; + margin: 0 10px 10px 0; width: 150px; height: 150px; position: relative; @@ -2172,10 +2194,10 @@ ul.tabs li .active { .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); + bottom: 0; + -webkit-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0 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; @@ -2186,7 +2208,7 @@ ul.tabs li .active { display: block; width: 660px; padding: 50px; - margin-bottom: 0px; + margin-bottom: 0; text-align: center; background-color: #999999; } @@ -2270,7 +2292,7 @@ ul.tabs li .active { height: 80px; } .profile-match-wrapper .contact-photo-menu-button { - left: 0px; + left: 0; top: 63px; } /* messages */ @@ -2284,7 +2306,7 @@ ul.tabs li .active { text-align: center; display: block; font-weight: bold; - padding: 1em 0px; + padding: 1em 0; } .mail-list-wrapper { background-color: #f6f7f8; @@ -2301,7 +2323,7 @@ ul.tabs li .active { } .mail-list-wrapper .mail-subject { width: 30%; - padding: 4px 0px 0px 4px; + padding: 4px 0 0 4px; } .mail-list-wrapper .mail-subject a { display: block; @@ -2310,13 +2332,13 @@ ul.tabs li .active { font-weight: bold; } .mail-list-wrapper .mail-date { - padding: 4px 4px 0px 4px; + padding: 4px 4px 0 4px; } .mail-list-wrapper .mail-from { - padding: 4px 4px 0px 4px; + padding: 4px 4px 0 4px; } .mail-list-wrapper .mail-count { - padding: 4px 4px 0px 4px; + padding: 4px 4px 0 4px; text-align: right; } .mail-list-wrapper .mail-delete { @@ -2333,7 +2355,7 @@ ul.tabs li .active { #mail-display-subject span { float: left; overflow: hidden; - padding: 4px 0px 0px 10px; + padding: 4px 0 0 10px; } #mail-display-subject .mail-delete { float: right; @@ -2409,8 +2431,8 @@ footer { text-align: right; } #adminpage #pluginslist { - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; } #adminpage .plugin { list-style: none; @@ -2430,7 +2452,7 @@ footer { #adminpage table { width: 100%; border-bottom: 1px solid #000000; - margin: 5px 0px; + margin: 5px 0; } #adminpage table th { text-align: left; @@ -2456,8 +2478,8 @@ footer { .comment-edit-bb { list-style: none; display: none; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; width: 75%; } .comment-edit-bb > li { @@ -2476,49 +2498,49 @@ footer { background-color: #ccc; } .boldbb { - background-position: 0px 0px; + background-position: 0 0; } .boldbb:hover { - background-position: 0px -16px; + background-position: 0 -16px; } .italicbb { - background-position: -16px 0px; + background-position: -16px 0; } .italicbb:hover { background-position: -16px -16px; } .underlinebb { - background-position: -32px 0px; + background-position: -32px 0; } .underlinebb:hover { background-position: -32px -16px; } .quotebb { - background-position: -48px 0px; + background-position: -48px 0; } .quotebb:hover { background-position: -48px -16px; } .codebb { - background-position: -64px 0px; + background-position: -64px 0; } .codebb:hover { background-position: -64px -16px; } .imagebb { - background-position: -80px 0px; + background-position: -80px 0; } .imagebb:hover { background-position: -80px -16px; } .urlbb { - background-position: -96px 0px; + background-position: -96px 0; } .urlbb:hover { background-position: -96px -16px; } .videobb { - background-position: -112px 0px; + background-position: -112px 0; } .videobb:hover { background-position: -112px -16px; @@ -2531,7 +2553,7 @@ footer { cursor: pointer; border: 1px solid #333; width: 200px; - margin: 10px 0px 10px 0px; + margin: 10px 0 10px 0; float: left; } /* progress bar (enabled with progress: true) */ @@ -2555,16 +2577,16 @@ footer { -moz-border-radius: 0 0 5px 5px; -webkit-border-radius: 0 0 5px 5px; border-radius: 0 0 5px 5px; - -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-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); } /* the input field */ .range { width: 20px!important; font-size: 8pt; margin-left: 10px; - border: 0px; + border: 0; color: #999999; } /* buttons for the event view */ @@ -2576,7 +2598,7 @@ footer { .fbrowser { overflow: auto; position: absolute; - top: 0px; + top: 0; width: 100%; height: 100%; } @@ -2585,7 +2607,7 @@ footer { } .fbrowser .path a { padding: 5px; - margin: 0px 2px; + margin: 0 2px; display: inline-block; } .fbrowser .path a, diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index e98572434..6f68a9598 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -422,7 +422,7 @@ body { font-size: 11px; background-color: #ffffff; color: #2d2d2d; - margin: 50px 0px 0px 0px; + margin: 50px 0 0 0; display: table; } h4 { @@ -463,7 +463,7 @@ a:hover { text-decoration: underline; } blockquote { - background: #ffffff; + background: #FFFFFF; padding: 1em; margin-left: 1em; border-left: 1em solid #e6e6e6; @@ -484,14 +484,14 @@ code { width: 10em; background: #ffffff; color: #2d2d2d; - margin: 0px; + margin: 0; padding: 1em; list-style: none; border: 3px solid #364e59; z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); } /* tool */ .tool { @@ -540,9 +540,9 @@ header { position: fixed; left: 43%; right: 43%; - top: 0px; - margin: 0px; - padding: 0px; + top: 0; + margin: 0; + padding: 0; /*width: 100%; height: 12px; */ z-index: 110; color: #ffffff; @@ -577,15 +577,15 @@ nav { width: 100%; height: 32px; position: fixed; - left: 0px; - top: 0px; - padding: 0px; + left: 0; + top: 0; + padding: 0; background-color: #009100; color: #ffffff; z-index: 100; - -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-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); } nav a, nav a:active, @@ -597,24 +597,24 @@ nav a:hover { outline: none; } nav ul { - margin: 0px; - padding: 0px 20px; + margin: 0; + padding: 0 20px; } nav ul li { list-style: none; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; float: left; } nav ul li .menu-popup { - left: 0px; + left: 0; right: auto; } nav .nav-menu-icon { position: relative; height: 22px; padding: 5px; - margin: 0px 10px; + margin: 0 10px; -moz-border-radius: 5px 5px 0 0; -webkit-border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0; @@ -633,7 +633,7 @@ nav .nav-menu { position: relative; height: 16px; padding: 5px; - margin: 3px 15px 0px; + margin: 3px 15px 0; font-size: 14px; border-bottom: 3px solid #009100; } @@ -649,7 +649,7 @@ nav .nav-notify { border-radius: 5px 5px 5px 5px; font-size: 10px; padding: 1px 3px; - top: 0px; + top: 0; right: -10px; min-width: 15px; text-align: right; @@ -669,7 +669,7 @@ nav #nav-search-link .menu-popup, nav #nav-directory-link .menu-popup, nav #nav-apps-link .menu-popup, nav #nav-site-linkmenu .menu-popup { - right: 0px; + right: 0; left: auto; } nav #nav-notifications-linkmenu.on .icon.s22.notify, @@ -693,14 +693,14 @@ ul.menu-popup { width: 10em; background: #ffffff; color: #2d2d2d; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; list-style: none; border: 3px solid #364e59; z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); } ul.menu-popup a { display: block; @@ -751,9 +751,9 @@ ul.menu-popup .toolbar a:hover { border: 1px solid #364e59; overflow: auto; z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); } .autocomplete > div, .acpopupitem { @@ -819,7 +819,7 @@ aside { display: table-cell; vertical-align: top; width: 200px; - padding: 0px 10px 0px 20px; + padding: 0px 10px 0 20px; border-right: 1px solid #bdcdd4; } aside .profile-edit-side-div { @@ -846,7 +846,7 @@ aside .vcard dl { } aside .vcard dt { float: left; - margin-left: 0px; + margin-left: 0; width: 35%; text-align: right; color: #999999; @@ -857,12 +857,12 @@ aside .vcard dd { width: 60%; } aside #profile-extra-links ul { - padding: 0px; - margin: 0px; + padding: 0; + margin: 0; } aside #profile-extra-links li { - padding: 0px; - margin: 0px; + padding: 0.2em 0; + margin: 0; list-style: none; } aside #wallmessage-link { @@ -887,7 +887,7 @@ aside #dfrn-request-link { -webkit-border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px; color: #ffffff; - background: #009100 url('../../../images/connect-bg.png') no-repeat left center; + background: #009100 url('icons/connect-bg.png') no-repeat left center; font-weight: bold; text-transform: uppercase; padding: 4px 2px 2px 35px; @@ -902,7 +902,7 @@ aside #subscribe-feed-link { -webkit-border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px; color: #ffffff; - background: #009100 url('../../../images/connect-bg.png') no-repeat left center; + background: #009100 url('icons/rss-bg.png') no-repeat left center; font-weight: bold; text-transform: uppercase; padding: 4px 2px 2px 35px; @@ -924,11 +924,11 @@ aside .posted-date-selector-months { } #contact-block .contact-block-h4 { float: left; - margin: 5px 0px; + margin: 5px 0; } #contact-block .allcontact-link { float: right; - margin: 5px 0px; + margin: 5px 0; } #contact-block .contact-block-content { clear: both; @@ -937,7 +937,7 @@ aside .posted-date-selector-months { } #contact-block .contact-block-link { float: left; - margin: 0px 2px 2px 0px; + margin: 0 2px 2px 0; } #contact-block .contact-block-link img { width: 48px; @@ -1000,11 +1000,11 @@ aside .posted-date-selector-months { /* widget */ .widget { margin-bottom: 2em; - /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} - .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ + /*.action .s10 { width: 10px; overflow: hidden; padding: 0;} + .action .s16 { width: 16px; overflow: hidden; padding: 0;}*/ } .widget h3 { - padding: 0px; + padding: 0; margin: 2px; } .widget .action { @@ -1048,7 +1048,7 @@ aside .posted-date-selector-months { transition: all 0.2s ease-in-out; } .widget ul { - padding: 0px; + padding: 0; } .widget ul li { padding-left: 16px; @@ -1083,7 +1083,7 @@ section { display: table-cell; vertical-align: top; width: 770px; - padding: 0px 20px 0px 10px; + padding: 0px 20px 0 10px; } .sparkle { cursor: url('icons/lock.cur'), pointer; @@ -1216,13 +1216,13 @@ section { } .wall-item-container.comment .contact-photo-menu-button { top: 15px !important; - left: 0px !important; + left: 0 !important; } .wall-item-container.comment .wall-item-links { padding-left: 12px; } .wall-item-container.comment .commentbox { - height: 0px; + height: 0; overflow: hidden; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -1232,7 +1232,7 @@ section { } .wall-item-container.comment .commentbox .wall-item-comment-wrapper { border-top: 1px solid #999999; - height: 0px; + height: 0; overflow: hidden; } .wall-item-container.comment:hover .commentbox { @@ -1245,7 +1245,7 @@ section { transition: all 0.2s ease-in-out; } .wall-item-container.comment:hover .commentbox .wall-item-comment-wrapper { - border-top: 0px; + border-top: 0; height: auto; overflow: visible; } @@ -1289,10 +1289,10 @@ section { border: 1px solid #2d2d2d; } .wall-item-comment-wrapper.photo { - margin: 1em 2em 1em 0px; + margin: 1em 2em 1em 0; } .threaded .wall-item-comment-wrapper { - margin-left: 0px; + margin-left: 0; } .comment-edit-preview { width: 710px; @@ -1321,7 +1321,7 @@ section { padding: 0; margin: 10px 0; background-color: #ddffdd; - border-bottom: 0px; + border-bottom: 0; } .comment-edit-preview .wall-item-conv { display: none; @@ -1375,7 +1375,7 @@ section { color: #666666; } /*.filesavetags { - padding: 3px 0px 3px 0px; + padding: 3px 0 3px 0; opacity: 0.5; }*/ .wwto { @@ -1388,9 +1388,9 @@ section { padding: 1px; top: 40px; left: 30px; - -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -webkit-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); } .wwto .contact-photo { width: 25px; @@ -1409,10 +1409,10 @@ section { max-width: 650px; max-height: inital; float: none; - margin-right: 0px; + margin-right: 0; } .type-link blockquote { - margin: 1em 0px; + margin: 1em 0; max-height: 160px; overflow: hidden; padding-left: 1em; @@ -1504,10 +1504,10 @@ blockquote.shared_content { width: 500px; } .children .children .children .children .children .children { - margin-left: 0px; + margin-left: 0; } .children .children .children .children .children .children .hide-comments-outer { - margin-left: 0px; + margin-left: 0; } /*.threaded .hide-comments-outer { margin-left: 20px; }*/ span[id^="showmore-teaser"] { @@ -1550,7 +1550,7 @@ span[id^="showmore-wrap"] { display: block; width: 100%; background-color: #ffffff; - border: 0px; + border: 0; color: #2d2d2d; text-align: left; padding: 5px 10px; @@ -1585,7 +1585,7 @@ span[id^="showmore-wrap"] { width: 300px; height: 90px; padding-right: 10px; - margin: 0 10px 10px 0px; + margin: 0 10px 10px 0; } .contact-wrapper .contact-photo-wrapper { float: left; @@ -1600,7 +1600,7 @@ span[id^="showmore-wrap"] { height: 80px; } .contact-wrapper .contact-photo-menu-button { - left: 0px; + left: 0; top: 63px; } .contact-wrapper .drop { @@ -1657,7 +1657,7 @@ span[id^="showmore-wrap"] { } #jot { width: 100%; - margin: 0px 2em 20px 0px; + margin: 0 2em 20px 0; } #jot .profile-jot-text { height: 1em; @@ -1668,8 +1668,8 @@ span[id^="showmore-wrap"] { padding: 0.3em; } #jot #jot-tools { - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; height: 40px; overflow: none; width: 770px; @@ -1718,9 +1718,9 @@ span[id^="showmore-wrap"] { border-left: 1px solid #666666; } #jot #jot-tools li.submit input { - border: 0px; - margin: 0px; - padding: 0px; + border: 0; + margin: 0; + padding: 0; background-color: #cccccc; color: #666666; width: 80px; @@ -1744,8 +1744,8 @@ span[id^="showmore-wrap"] { margin-top: 10px; } #jot #jot-title { - border: 0px; - margin: 0px; + border: 0; + margin: 0; height: 20px; width: 500px; font-weight: bold; @@ -1772,8 +1772,8 @@ span[id^="showmore-wrap"] { padding-right: 20px; } #jot #jot-category { - border: 0px; - margin: 0px; + border: 0; + margin: 0; height: 20px; width: 200px; border: 1px solid #ffffff; @@ -1786,13 +1786,35 @@ span[id^="showmore-wrap"] { } /** buttons **/ /*input[type="submit"] { - border: 0px; + border: 0; background-color: @ButtonBackgroundColor; color: @ButtonColor; - padding: 0px 10px; + padding: 0 10px; .rounded(5px); height: 18px; }*/ +a.actionbutton { + border: 1px solid #999999; + background-color: #cccccc; + color: #2d2d2d; + font-size: 8pt; + padding: 2pt; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} +a.actionbutton i.icon { + display: inline-block; + vertical-align: baseline; + padding: 0; +} +a.actionbutton:hover { + text-decoration: none; + background-color: #ffffff; +} +h2 > .actionbutton { + float: right; +} /** acl **/ #photo-edit-perms-select, #photos-upload-permissions-wrapper, @@ -1817,7 +1839,7 @@ span[id^="showmore-wrap"] { background-image: url("../../../images/show_all_off.png"); background-position: 7px 7px; background-repeat: no-repeat; - padding: 7px 5px 0px 30px; + padding: 7px 5px 0 30px; color: #999999; -moz-border-radius: 5px 5px 5px 5px; -webkit-border-radius: 5px 5px 5px 5px; @@ -1852,8 +1874,8 @@ span[id^="showmore-wrap"] { .acl-list-item p { height: 12px; font-size: 10px; - margin: 0px; - padding: 2px 0px 1px; + margin: 0; + padding: 2px 0 1px; overflow: hidden; } .acl-list-item a { @@ -2004,7 +2026,7 @@ ul.tabs li .active { display: none!important; } .field.radio .field_help { - margin-left: 0px; + margin-left: 0; } #profile-edit-links li { list-style: none; @@ -2091,7 +2113,7 @@ ul.tabs li .active { .videos .video-top-wrapper { width: 200px; float: left; - margin: 0px 10px 10px 0px; + margin: 0 10px 10px 0; position: relative; } .videos .video-top-wrapper .video-js { @@ -2101,8 +2123,8 @@ ul.tabs li .active { .videos .video-top-wrapper .video-delete { position: absolute; opacity: 0; - right: 0px; - top: 0px; + right: 0; + top: 0; transition: opacity 0.5s; } .videos .video-top-wrapper:hover .video-delete { @@ -2129,7 +2151,7 @@ ul.tabs li .active { } #photo-top-upload-link, .photos-upload-link { - margin: 1em 0px; + margin: 1em 0; display: block; } .photos-upload-link a, @@ -2140,7 +2162,7 @@ ul.tabs li .active { .photo-top-image-wrapper, .photo-album-image-wrapper { float: left; - margin: 0px 10px 10px 0px; + margin: 0 10px 10px 0; width: 150px; height: 150px; position: relative; @@ -2172,10 +2194,10 @@ ul.tabs li .active { .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); + bottom: 0; + -webkit-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0 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; @@ -2186,7 +2208,7 @@ ul.tabs li .active { display: block; width: 660px; padding: 50px; - margin-bottom: 0px; + margin-bottom: 0; text-align: center; background-color: #999999; } @@ -2270,7 +2292,7 @@ ul.tabs li .active { height: 80px; } .profile-match-wrapper .contact-photo-menu-button { - left: 0px; + left: 0; top: 63px; } /* messages */ @@ -2284,7 +2306,7 @@ ul.tabs li .active { text-align: center; display: block; font-weight: bold; - padding: 1em 0px; + padding: 1em 0; } .mail-list-wrapper { background-color: #f6f7f8; @@ -2301,7 +2323,7 @@ ul.tabs li .active { } .mail-list-wrapper .mail-subject { width: 30%; - padding: 4px 0px 0px 4px; + padding: 4px 0 0 4px; } .mail-list-wrapper .mail-subject a { display: block; @@ -2310,13 +2332,13 @@ ul.tabs li .active { font-weight: bold; } .mail-list-wrapper .mail-date { - padding: 4px 4px 0px 4px; + padding: 4px 4px 0 4px; } .mail-list-wrapper .mail-from { - padding: 4px 4px 0px 4px; + padding: 4px 4px 0 4px; } .mail-list-wrapper .mail-count { - padding: 4px 4px 0px 4px; + padding: 4px 4px 0 4px; text-align: right; } .mail-list-wrapper .mail-delete { @@ -2333,7 +2355,7 @@ ul.tabs li .active { #mail-display-subject span { float: left; overflow: hidden; - padding: 4px 0px 0px 10px; + padding: 4px 0 0 10px; } #mail-display-subject .mail-delete { float: right; @@ -2409,8 +2431,8 @@ footer { text-align: right; } #adminpage #pluginslist { - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; } #adminpage .plugin { list-style: none; @@ -2430,7 +2452,7 @@ footer { #adminpage table { width: 100%; border-bottom: 1px solid #000000; - margin: 5px 0px; + margin: 5px 0; } #adminpage table th { text-align: left; @@ -2456,8 +2478,8 @@ footer { .comment-edit-bb { list-style: none; display: none; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; width: 75%; } .comment-edit-bb > li { @@ -2476,49 +2498,49 @@ footer { background-color: #ccc; } .boldbb { - background-position: 0px 0px; + background-position: 0 0; } .boldbb:hover { - background-position: 0px -16px; + background-position: 0 -16px; } .italicbb { - background-position: -16px 0px; + background-position: -16px 0; } .italicbb:hover { background-position: -16px -16px; } .underlinebb { - background-position: -32px 0px; + background-position: -32px 0; } .underlinebb:hover { background-position: -32px -16px; } .quotebb { - background-position: -48px 0px; + background-position: -48px 0; } .quotebb:hover { background-position: -48px -16px; } .codebb { - background-position: -64px 0px; + background-position: -64px 0; } .codebb:hover { background-position: -64px -16px; } .imagebb { - background-position: -80px 0px; + background-position: -80px 0; } .imagebb:hover { background-position: -80px -16px; } .urlbb { - background-position: -96px 0px; + background-position: -96px 0; } .urlbb:hover { background-position: -96px -16px; } .videobb { - background-position: -112px 0px; + background-position: -112px 0; } .videobb:hover { background-position: -112px -16px; @@ -2531,7 +2553,7 @@ footer { cursor: pointer; border: 1px solid #333; width: 200px; - margin: 10px 0px 10px 0px; + margin: 10px 0 10px 0; float: left; } /* progress bar (enabled with progress: true) */ @@ -2555,16 +2577,16 @@ footer { -moz-border-radius: 0 0 5px 5px; -webkit-border-radius: 0 0 5px 5px; border-radius: 0 0 5px 5px; - -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-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); } /* the input field */ .range { width: 20px!important; font-size: 8pt; margin-left: 10px; - border: 0px; + border: 0; color: #999999; } /* buttons for the event view */ @@ -2576,7 +2598,7 @@ footer { .fbrowser { overflow: auto; position: absolute; - top: 0px; + top: 0; width: 100%; height: 100%; } @@ -2585,7 +2607,7 @@ footer { } .fbrowser .path a { padding: 5px; - margin: 0px 2px; + margin: 0 2px; display: inline-block; } .fbrowser .path a, diff --git a/view/theme/quattro/icons/connect-bg.png b/view/theme/quattro/icons/connect-bg.png new file mode 100644 index 000000000..0611c73e5 Binary files /dev/null and b/view/theme/quattro/icons/connect-bg.png differ diff --git a/view/theme/quattro/icons/rss-bg.png b/view/theme/quattro/icons/rss-bg.png new file mode 100644 index 000000000..1528c9c84 Binary files /dev/null and b/view/theme/quattro/icons/rss-bg.png differ diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index 1d72a7146..f6093c5c2 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -420,9 +420,9 @@ body { font-family: Liberation Sans, helvetica, arial, clean, sans-serif; font-size: 11px; - background-color: #f6ecf9; + background-color: #F6ECF9; color: #2d2d2d; - margin: 50px 0px 0px 0px; + margin: 50px 0 0 0; display: table; } h4 { @@ -463,7 +463,7 @@ a:hover { text-decoration: underline; } blockquote { - background: #ffffff; + background: #FFFFFF; padding: 1em; margin-left: 1em; border-left: 1em solid #e6e6e6; @@ -484,14 +484,14 @@ code { width: 10em; background: #ffffff; color: #2d2d2d; - margin: 0px; + margin: 0; padding: 1em; list-style: none; border: 3px solid #364e59; z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); } /* tool */ .tool { @@ -540,9 +540,9 @@ header { position: fixed; left: 43%; right: 43%; - top: 0px; - margin: 0px; - padding: 0px; + top: 0; + margin: 0; + padding: 0; /*width: 100%; height: 12px; */ z-index: 110; color: #ffffff; @@ -577,15 +577,15 @@ nav { width: 100%; height: 32px; position: fixed; - left: 0px; - top: 0px; - padding: 0px; + left: 0; + top: 0; + padding: 0; background-color: #521f5c; color: #ffffff; z-index: 100; - -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-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); } nav a, nav a:active, @@ -597,24 +597,24 @@ nav a:hover { outline: none; } nav ul { - margin: 0px; - padding: 0px 20px; + margin: 0; + padding: 0 20px; } nav ul li { list-style: none; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; float: left; } nav ul li .menu-popup { - left: 0px; + left: 0; right: auto; } nav .nav-menu-icon { position: relative; height: 22px; padding: 5px; - margin: 0px 10px; + margin: 0 10px; -moz-border-radius: 5px 5px 0 0; -webkit-border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0; @@ -633,7 +633,7 @@ nav .nav-menu { position: relative; height: 16px; padding: 5px; - margin: 3px 15px 0px; + margin: 3px 15px 0; font-size: 14px; border-bottom: 3px solid #521f5c; } @@ -649,7 +649,7 @@ nav .nav-notify { border-radius: 5px 5px 5px 5px; font-size: 10px; padding: 1px 3px; - top: 0px; + top: 0; right: -10px; min-width: 15px; text-align: right; @@ -669,7 +669,7 @@ nav #nav-search-link .menu-popup, nav #nav-directory-link .menu-popup, nav #nav-apps-link .menu-popup, nav #nav-site-linkmenu .menu-popup { - right: 0px; + right: 0; left: auto; } nav #nav-notifications-linkmenu.on .icon.s22.notify, @@ -693,14 +693,14 @@ ul.menu-popup { width: 10em; background: #ffffff; color: #2d2d2d; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; list-style: none; border: 3px solid #364e59; z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); } ul.menu-popup a { display: block; @@ -751,9 +751,9 @@ ul.menu-popup .toolbar a:hover { border: 1px solid #364e59; overflow: auto; z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); } .autocomplete > div, .acpopupitem { @@ -819,7 +819,7 @@ aside { display: table-cell; vertical-align: top; width: 200px; - padding: 0px 10px 0px 20px; + padding: 0px 10px 0 20px; border-right: 1px solid #bdcdd4; } aside .profile-edit-side-div { @@ -846,7 +846,7 @@ aside .vcard dl { } aside .vcard dt { float: left; - margin-left: 0px; + margin-left: 0; width: 35%; text-align: right; color: #999999; @@ -857,12 +857,12 @@ aside .vcard dd { width: 60%; } aside #profile-extra-links ul { - padding: 0px; - margin: 0px; + padding: 0; + margin: 0; } aside #profile-extra-links li { - padding: 0px; - margin: 0px; + padding: 0.2em 0; + margin: 0; list-style: none; } aside #wallmessage-link { @@ -887,7 +887,7 @@ aside #dfrn-request-link { -webkit-border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px; color: #ffffff; - background: #521f5c url('../../../images/connect-bg.png') no-repeat left center; + background: #521f5c url('icons/connect-bg.png') no-repeat left center; font-weight: bold; text-transform: uppercase; padding: 4px 2px 2px 35px; @@ -902,7 +902,7 @@ aside #subscribe-feed-link { -webkit-border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px; color: #ffffff; - background: #521f5c url('../../../images/connect-bg.png') no-repeat left center; + background: #521f5c url('icons/rss-bg.png') no-repeat left center; font-weight: bold; text-transform: uppercase; padding: 4px 2px 2px 35px; @@ -924,11 +924,11 @@ aside .posted-date-selector-months { } #contact-block .contact-block-h4 { float: left; - margin: 5px 0px; + margin: 5px 0; } #contact-block .allcontact-link { float: right; - margin: 5px 0px; + margin: 5px 0; } #contact-block .contact-block-content { clear: both; @@ -937,7 +937,7 @@ aside .posted-date-selector-months { } #contact-block .contact-block-link { float: left; - margin: 0px 2px 2px 0px; + margin: 0 2px 2px 0; } #contact-block .contact-block-link img { width: 48px; @@ -1000,11 +1000,11 @@ aside .posted-date-selector-months { /* widget */ .widget { margin-bottom: 2em; - /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} - .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ + /*.action .s10 { width: 10px; overflow: hidden; padding: 0;} + .action .s16 { width: 16px; overflow: hidden; padding: 0;}*/ } .widget h3 { - padding: 0px; + padding: 0; margin: 2px; } .widget .action { @@ -1048,7 +1048,7 @@ aside .posted-date-selector-months { transition: all 0.2s ease-in-out; } .widget ul { - padding: 0px; + padding: 0; } .widget ul li { padding-left: 16px; @@ -1083,7 +1083,7 @@ section { display: table-cell; vertical-align: top; width: 770px; - padding: 0px 20px 0px 10px; + padding: 0px 20px 0 10px; } .sparkle { cursor: url('icons/lock.cur'), pointer; @@ -1216,13 +1216,13 @@ section { } .wall-item-container.comment .contact-photo-menu-button { top: 15px !important; - left: 0px !important; + left: 0 !important; } .wall-item-container.comment .wall-item-links { padding-left: 12px; } .wall-item-container.comment .commentbox { - height: 0px; + height: 0; overflow: hidden; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -1232,7 +1232,7 @@ section { } .wall-item-container.comment .commentbox .wall-item-comment-wrapper { border-top: 1px solid #999999; - height: 0px; + height: 0; overflow: hidden; } .wall-item-container.comment:hover .commentbox { @@ -1245,7 +1245,7 @@ section { transition: all 0.2s ease-in-out; } .wall-item-container.comment:hover .commentbox .wall-item-comment-wrapper { - border-top: 0px; + border-top: 0; height: auto; overflow: visible; } @@ -1289,10 +1289,10 @@ section { border: 1px solid #2d2d2d; } .wall-item-comment-wrapper.photo { - margin: 1em 2em 1em 0px; + margin: 1em 2em 1em 0; } .threaded .wall-item-comment-wrapper { - margin-left: 0px; + margin-left: 0; } .comment-edit-preview { width: 710px; @@ -1321,7 +1321,7 @@ section { padding: 0; margin: 10px 0; background-color: #c0a3c7; - border-bottom: 0px; + border-bottom: 0; } .comment-edit-preview .wall-item-conv { display: none; @@ -1375,7 +1375,7 @@ section { color: #666666; } /*.filesavetags { - padding: 3px 0px 3px 0px; + padding: 3px 0 3px 0; opacity: 0.5; }*/ .wwto { @@ -1388,9 +1388,9 @@ section { padding: 1px; top: 40px; left: 30px; - -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -webkit-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); } .wwto .contact-photo { width: 25px; @@ -1409,10 +1409,10 @@ section { max-width: 650px; max-height: inital; float: none; - margin-right: 0px; + margin-right: 0; } .type-link blockquote { - margin: 1em 0px; + margin: 1em 0; max-height: 160px; overflow: hidden; padding-left: 1em; @@ -1504,10 +1504,10 @@ blockquote.shared_content { width: 500px; } .children .children .children .children .children .children { - margin-left: 0px; + margin-left: 0; } .children .children .children .children .children .children .hide-comments-outer { - margin-left: 0px; + margin-left: 0; } /*.threaded .hide-comments-outer { margin-left: 20px; }*/ span[id^="showmore-teaser"] { @@ -1550,7 +1550,7 @@ span[id^="showmore-wrap"] { display: block; width: 100%; background-color: #ffffff; - border: 0px; + border: 0; color: #2d2d2d; text-align: left; padding: 5px 10px; @@ -1585,7 +1585,7 @@ span[id^="showmore-wrap"] { width: 300px; height: 90px; padding-right: 10px; - margin: 0 10px 10px 0px; + margin: 0 10px 10px 0; } .contact-wrapper .contact-photo-wrapper { float: left; @@ -1600,7 +1600,7 @@ span[id^="showmore-wrap"] { height: 80px; } .contact-wrapper .contact-photo-menu-button { - left: 0px; + left: 0; top: 63px; } .contact-wrapper .drop { @@ -1657,7 +1657,7 @@ span[id^="showmore-wrap"] { } #jot { width: 100%; - margin: 0px 2em 20px 0px; + margin: 0 2em 20px 0; } #jot .profile-jot-text { height: 1em; @@ -1668,8 +1668,8 @@ span[id^="showmore-wrap"] { padding: 0.3em; } #jot #jot-tools { - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; height: 40px; overflow: none; width: 770px; @@ -1718,9 +1718,9 @@ span[id^="showmore-wrap"] { border-left: 1px solid #666666; } #jot #jot-tools li.submit input { - border: 0px; - margin: 0px; - padding: 0px; + border: 0; + margin: 0; + padding: 0; background-color: #cccccc; color: #666666; width: 80px; @@ -1744,12 +1744,12 @@ span[id^="showmore-wrap"] { margin-top: 10px; } #jot #jot-title { - border: 0px; - margin: 0px; + border: 0; + margin: 0; height: 20px; width: 500px; font-weight: bold; - border: 1px solid #f6ecf9; + border: 1px solid #F6ECF9; } #jot #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -1772,11 +1772,11 @@ span[id^="showmore-wrap"] { padding-right: 20px; } #jot #jot-category { - border: 0px; - margin: 0px; + border: 0; + margin: 0; height: 20px; width: 200px; - border: 1px solid #f6ecf9; + border: 1px solid #F6ECF9; } #jot #jot-category:hover { border: 1px solid #999999; @@ -1786,13 +1786,35 @@ span[id^="showmore-wrap"] { } /** buttons **/ /*input[type="submit"] { - border: 0px; + border: 0; background-color: @ButtonBackgroundColor; color: @ButtonColor; - padding: 0px 10px; + padding: 0 10px; .rounded(5px); height: 18px; }*/ +a.actionbutton { + border: 1px solid #999999; + background-color: #cccccc; + color: #2d2d2d; + font-size: 8pt; + padding: 2pt; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} +a.actionbutton i.icon { + display: inline-block; + vertical-align: baseline; + padding: 0; +} +a.actionbutton:hover { + text-decoration: none; + background-color: #ffffff; +} +h2 > .actionbutton { + float: right; +} /** acl **/ #photo-edit-perms-select, #photos-upload-permissions-wrapper, @@ -1817,7 +1839,7 @@ span[id^="showmore-wrap"] { background-image: url("../../../images/show_all_off.png"); background-position: 7px 7px; background-repeat: no-repeat; - padding: 7px 5px 0px 30px; + padding: 7px 5px 0 30px; color: #999999; -moz-border-radius: 5px 5px 5px 5px; -webkit-border-radius: 5px 5px 5px 5px; @@ -1852,8 +1874,8 @@ span[id^="showmore-wrap"] { .acl-list-item p { height: 12px; font-size: 10px; - margin: 0px; - padding: 2px 0px 1px; + margin: 0; + padding: 2px 0 1px; overflow: hidden; } .acl-list-item a { @@ -2004,7 +2026,7 @@ ul.tabs li .active { display: none!important; } .field.radio .field_help { - margin-left: 0px; + margin-left: 0; } #profile-edit-links li { list-style: none; @@ -2091,7 +2113,7 @@ ul.tabs li .active { .videos .video-top-wrapper { width: 200px; float: left; - margin: 0px 10px 10px 0px; + margin: 0 10px 10px 0; position: relative; } .videos .video-top-wrapper .video-js { @@ -2101,8 +2123,8 @@ ul.tabs li .active { .videos .video-top-wrapper .video-delete { position: absolute; opacity: 0; - right: 0px; - top: 0px; + right: 0; + top: 0; transition: opacity 0.5s; } .videos .video-top-wrapper:hover .video-delete { @@ -2129,7 +2151,7 @@ ul.tabs li .active { } #photo-top-upload-link, .photos-upload-link { - margin: 1em 0px; + margin: 1em 0; display: block; } .photos-upload-link a, @@ -2140,7 +2162,7 @@ ul.tabs li .active { .photo-top-image-wrapper, .photo-album-image-wrapper { float: left; - margin: 0px 10px 10px 0px; + margin: 0 10px 10px 0; width: 150px; height: 150px; position: relative; @@ -2172,10 +2194,10 @@ ul.tabs li .active { .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); + bottom: 0; + -webkit-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0 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; @@ -2186,7 +2208,7 @@ ul.tabs li .active { display: block; width: 660px; padding: 50px; - margin-bottom: 0px; + margin-bottom: 0; text-align: center; background-color: #999999; } @@ -2270,7 +2292,7 @@ ul.tabs li .active { height: 80px; } .profile-match-wrapper .contact-photo-menu-button { - left: 0px; + left: 0; top: 63px; } /* messages */ @@ -2284,7 +2306,7 @@ ul.tabs li .active { text-align: center; display: block; font-weight: bold; - padding: 1em 0px; + padding: 1em 0; } .mail-list-wrapper { background-color: #f6f7f8; @@ -2301,7 +2323,7 @@ ul.tabs li .active { } .mail-list-wrapper .mail-subject { width: 30%; - padding: 4px 0px 0px 4px; + padding: 4px 0 0 4px; } .mail-list-wrapper .mail-subject a { display: block; @@ -2310,13 +2332,13 @@ ul.tabs li .active { font-weight: bold; } .mail-list-wrapper .mail-date { - padding: 4px 4px 0px 4px; + padding: 4px 4px 0 4px; } .mail-list-wrapper .mail-from { - padding: 4px 4px 0px 4px; + padding: 4px 4px 0 4px; } .mail-list-wrapper .mail-count { - padding: 4px 4px 0px 4px; + padding: 4px 4px 0 4px; text-align: right; } .mail-list-wrapper .mail-delete { @@ -2333,7 +2355,7 @@ ul.tabs li .active { #mail-display-subject span { float: left; overflow: hidden; - padding: 4px 0px 0px 10px; + padding: 4px 0 0 10px; } #mail-display-subject .mail-delete { float: right; @@ -2409,8 +2431,8 @@ footer { text-align: right; } #adminpage #pluginslist { - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; } #adminpage .plugin { list-style: none; @@ -2430,7 +2452,7 @@ footer { #adminpage table { width: 100%; border-bottom: 1px solid #000000; - margin: 5px 0px; + margin: 5px 0; } #adminpage table th { text-align: left; @@ -2456,8 +2478,8 @@ footer { .comment-edit-bb { list-style: none; display: none; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; width: 75%; } .comment-edit-bb > li { @@ -2476,49 +2498,49 @@ footer { background-color: #ccc; } .boldbb { - background-position: 0px 0px; + background-position: 0 0; } .boldbb:hover { - background-position: 0px -16px; + background-position: 0 -16px; } .italicbb { - background-position: -16px 0px; + background-position: -16px 0; } .italicbb:hover { background-position: -16px -16px; } .underlinebb { - background-position: -32px 0px; + background-position: -32px 0; } .underlinebb:hover { background-position: -32px -16px; } .quotebb { - background-position: -48px 0px; + background-position: -48px 0; } .quotebb:hover { background-position: -48px -16px; } .codebb { - background-position: -64px 0px; + background-position: -64px 0; } .codebb:hover { background-position: -64px -16px; } .imagebb { - background-position: -80px 0px; + background-position: -80px 0; } .imagebb:hover { background-position: -80px -16px; } .urlbb { - background-position: -96px 0px; + background-position: -96px 0; } .urlbb:hover { background-position: -96px -16px; } .videobb { - background-position: -112px 0px; + background-position: -112px 0; } .videobb:hover { background-position: -112px -16px; @@ -2531,7 +2553,7 @@ footer { cursor: pointer; border: 1px solid #333; width: 200px; - margin: 10px 0px 10px 0px; + margin: 10px 0 10px 0; float: left; } /* progress bar (enabled with progress: true) */ @@ -2555,16 +2577,16 @@ footer { -moz-border-radius: 0 0 5px 5px; -webkit-border-radius: 0 0 5px 5px; border-radius: 0 0 5px 5px; - -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-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7); } /* the input field */ .range { width: 20px!important; font-size: 8pt; margin-left: 10px; - border: 0px; + border: 0; color: #999999; } /* buttons for the event view */ @@ -2576,7 +2598,7 @@ footer { .fbrowser { overflow: auto; position: absolute; - top: 0px; + top: 0; width: 100%; height: 100%; } @@ -2585,7 +2607,7 @@ footer { } .fbrowser .path a { padding: 5px; - margin: 0px 2px; + margin: 0 2px; display: inline-block; } .fbrowser .path a, diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index c698497a1..631a63333 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -6,12 +6,12 @@ body { font-size: 11px; background-color: @BodyBackground; color: @BodyColor; - margin: 50px 0px 0px 0px; + margin: 50px 0 0 0; display:table; } h4 { font-size: 1.1em } -.shadow(@x: 0px, @y: 5px){ +.shadow(@x: 0, @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); @@ -76,7 +76,7 @@ code { width: 10em; background: @MenuBg; color: @Menu; - margin: 0px; + margin: 0; padding: 1em; list-style: none; border: 3px solid @MenuBorder; @@ -126,8 +126,8 @@ div.jGrowl div.info { /* header */ header { - position: fixed; left: 43%; right: 43%; top: 0px; - margin: 0px; padding: 0px; + position: fixed; left: 43%; right: 43%; top: 0; + margin: 0; padding: 0; /*width: 100%; height: 12px; */ z-index: 110; color: @Grey1; @@ -147,23 +147,23 @@ header { /* nav */ nav { width: 100%; height: 32px; - position: fixed; left: 0px; top: 0px; - padding: 0px; + position: fixed; left: 0; top: 0; + padding: 0; background-color: @NavbarBackground; color: @Grey1; z-index: 100; - .shadow(0px, 0px); + .shadow(0px, 0); a, a:active, a:visited, a:link, a:hover { color: @Banner; text-decoration: none; outline: none; } ul { - margin: 0px; - padding: 0px 20px; + margin: 0; + padding: 0 20px; li { list-style: none; - margin: 0px; padding: 0px; + margin: 0; padding: 0; float: left; - .menu-popup{ left: 0px; right: auto; } + .menu-popup{ left: 0; right: auto; } } } @@ -172,7 +172,7 @@ nav { position: relative; height: 22px; padding: 5px; - margin: 0px 10px; + margin: 0 10px; .roundtop(); &.selected { @@ -187,7 +187,7 @@ nav { position: relative; height: 16px; padding: 5px; - margin: 3px 15px 0px; + margin: 3px 15px 0; font-size: 14px; border-bottom: 3px solid @NavbarBackground; &.selected { @@ -203,7 +203,7 @@ nav { .rounded(); font-size: 10px; padding: 1px 3px; - top: 0px; + top: 0; right: -10px; min-width: 15px; text-align: right; @@ -218,7 +218,7 @@ nav { #nav-apps-link, #nav-site-linkmenu { float: right; - .menu-popup{ right: 0px; left: auto; } + .menu-popup{ right: 0; left: auto; } } #nav-notifications-linkmenu.on .icon.s22.notify, @@ -237,8 +237,8 @@ ul.menu-popup { width: 10em; background: @MenuBg; color: @Menu; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; list-style: none; border: 3px solid @MenuBorder; z-index: 100000; @@ -324,7 +324,7 @@ aside { display: table-cell; vertical-align: top; width: 200px; - padding:0px 10px 0px 20px; + padding:0px 10px 0 20px; border-right: 1px solid @AsideBorder; .profile-edit-side-div { display: none; } @@ -335,14 +335,14 @@ aside { .p-addr { margin-bottom: 5px; } .account-type { font-size: 14px; margin-bottom: 13px; } dl { height: auto; overflow: auto; } - dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; } + dt {float: left; margin-left: 0; 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; } + ul { padding: 0; margin: 0; } + li { padding: 0.2em 0; margin: 0; list-style: none; } } #wallmessage-link { @@ -361,7 +361,7 @@ aside { display: block; .rounded(); color: @AsideConnect; - background: @AsideConnectBg url('../../../images/connect-bg.png') no-repeat left center; + background: @AsideConnectBg url('icons/connect-bg.png') no-repeat left center; font-weight: bold; text-transform:uppercase; padding: 4px 2px 2px 35px; @@ -372,7 +372,7 @@ aside { display: block; .rounded(); color: @AsideConnect; - background: @AsideConnectBg url('../../../images/connect-bg.png') no-repeat left center; + background: @AsideConnectBg url('icons/rss-bg.png') no-repeat left center; font-weight: bold; text-transform:uppercase; padding: 4px 2px 2px 35px; @@ -387,8 +387,8 @@ aside { #contact-block { overflow: auto; height: auto; - .contact-block-h4 { float: left; margin: 5px 0px; } - .allcontact-link { float: right; margin: 5px 0px; } + .contact-block-h4 { float: left; margin: 5px 0; } + .allcontact-link { float: right; margin: 5px 0; } .contact-block-content { clear: both; overflow: hidden; @@ -397,7 +397,7 @@ aside { /*.contact-block-div { width:60px; height: 60px; }*/ .contact-block-link { float: left; - margin: 0px 2px 2px 0px; + margin: 0 2px 2px 0; img { width: 48px; height: 48px; } } } @@ -453,22 +453,22 @@ aside { .widget { margin-bottom: 2em; - h3 { padding: 0px; margin: 2px;} + h3 { padding: 0; 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 { padding: 0;} 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;}*/ + /*.action .s10 { width: 10px; overflow: hidden; padding: 0;} + .action .s16 { width: 16px; overflow: hidden; padding: 0;}*/ .notify { display: none; @@ -498,7 +498,7 @@ section { display: table-cell; vertical-align: top; width: 770px; - padding:0px 20px 0px 10px; + padding:0px 20px 0 10px; } .sparkle { @@ -583,16 +583,16 @@ section { .contact-photo-menu-button { top: 15px !important; - left: 0px !important; + left: 0 !important; } .wall-item-links { padding-left: 12px; } .commentbox { - height: 0px; + height: 0; overflow: hidden; .wall-item-comment-wrapper { border-top: 1px solid @CommentBoxEmptyBorderColor; - height: 0px; overflow: hidden; + height: 0; overflow: hidden; } .transition(); } @@ -600,7 +600,7 @@ section { &:hover .commentbox { height:auto; overflow: visible; .wall-item-comment-wrapper { - border-top: 0px; + border-top: 0; height:auto;overflow: visible; } .transition(); @@ -640,11 +640,11 @@ section { } &.photo { - margin: 1em 2em 1em 0px; + margin: 1em 2em 1em 0; } } -.threaded .wall-item-comment-wrapper { margin-left: 0px; } +.threaded .wall-item-comment-wrapper { margin-left: 0; } .comment-edit-preview { width: 710px; @@ -665,7 +665,7 @@ section { .tread-wrapper { width: 90%; padding: 0; margin: 10px 0; background-color: @JotPreviewBackgroundColor; - border-bottom: 0px; + border-bottom: 0; } .wall-item-conv { display: none; } } @@ -705,7 +705,7 @@ section { a { color: @MentionColor; } } /*.filesavetags { - padding: 3px 0px 3px 0px; + padding: 3px 0 3px 0; opacity: 0.5; }*/ @@ -720,7 +720,7 @@ section { top: 40px; left: 30px; - .shadow(0px, 0px); + .shadow(0px, 0); } .wwto .contact-photo { width: 25px; height: 25px; } @@ -736,13 +736,13 @@ section { max-width: 650px; max-height: inital; float: none; - margin-right: 0px; + margin-right: 0; } } .type-link { blockquote { - margin: 1em 0px; + margin: 1em 0; max-height: 160px; overflow: hidden; padding-left: 1em; @@ -830,8 +830,8 @@ blockquote.shared_content { } .children { - margin-left: 0px; - .hide-comments-outer { margin-left: 0px; } + margin-left: 0; + .hide-comments-outer { margin-left: 0; } } } } @@ -873,7 +873,7 @@ span[id^="showmore-wrap"] { display: block; width: 100%; background-color: @MenuBg; - border: 0px; + border: 0; color: @MenuItem; text-align: left; padding: 5px 10px; @@ -906,7 +906,7 @@ span[id^="showmore-wrap"] { width: 300px; height: 90px; padding-right: 10px; - margin: 0 10px 10px 0px; + margin: 0 10px 10px 0; .contact-photo-wrapper { float: left; margin-right: 10px; @@ -916,7 +916,7 @@ span[id^="showmore-wrap"] { img { width: 80px; height: 80px; } } .contact-photo-menu-button { - left: 0px; + left: 0; top: 63px; } .drop { @@ -962,7 +962,7 @@ span[id^="showmore-wrap"] { #jot { width: 100%; - margin: 0px 2em 20px 0px; + margin: 0 2em 20px 0; .profile-jot-text { height: 1em; width: 99%; font-size: 10px; @@ -972,7 +972,7 @@ span[id^="showmore-wrap"] { } #jot-tools { - margin: 0px; padding: 0px; + margin: 0; padding: 0; height: 40px; overflow: none; width: 770px; background-color: @JotToolsBackgroundColor; @@ -1019,7 +1019,7 @@ span[id^="showmore-wrap"] { border-right: 1px solid @Grey4; border-left: 1px solid @Grey4; input { - border: 0px; margin: 0px; padding: 0px; + border: 0; margin: 0; padding: 0; background-color: @JotSubmitBackgroundColor; color: @JotSubmitText; width: 80px; height: 40px; @@ -1043,8 +1043,8 @@ span[id^="showmore-wrap"] { } #jot-title { - border: 0px; - margin: 0px; + border: 0; + margin: 0; height: 20px; width: 500px; font-weight: bold; @@ -1072,8 +1072,8 @@ span[id^="showmore-wrap"] { } #jot-category { - border: 0px; - margin: 0px; + border: 0; + margin: 0; height: 20px; width: 200px; border: 1px solid @BodyBackground; @@ -1085,14 +1085,35 @@ span[id^="showmore-wrap"] { /** buttons **/ /*input[type="submit"] { - border: 0px; + border: 0; background-color: @ButtonBackgroundColor; color: @ButtonColor; - padding: 0px 10px; + padding: 0 10px; .rounded(5px); height: 18px; }*/ +a.actionbutton { + border: 1px solid @Grey3; + background-color: @Grey2; + color: @Grey5; + font-size: 8pt; + padding: 2pt; + .rounded(); + + i.icon { + display: inline-block; + vertical-align: baseline; + padding: 0; + } + + &:hover { + text-decoration: none; + background-color: @Grey1; + } +} +h2 > .actionbutton { float: right; } + /** acl **/ #photo-edit-perms-select, @@ -1121,7 +1142,7 @@ span[id^="showmore-wrap"] { background-image: url("../../../images/show_all_off.png"); background-position: 7px 7px; background-repeat: no-repeat; - padding: 7px 5px 0px 30px; + padding: 7px 5px 0 30px; color: #999999; .rounded(5px); } @@ -1155,7 +1176,7 @@ span[id^="showmore-wrap"] { float: left; margin: 4px; } -.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} +.acl-list-item p { height: 12px; font-size: 10px; margin: 0; padding: 2px 0 1px; overflow: hidden;} .acl-list-item a { font-size: 8px; display: block; @@ -1297,7 +1318,7 @@ ul.tabs { } .hidden { display: none!important; } - &.radio .field_help { margin-left: 0px; } + &.radio .field_help { margin-left: 0; } } @@ -1387,7 +1408,7 @@ ul.tabs { .videos { .video-top-wrapper { width: 200px; float: left; - margin: 0px 10px 10px 0px; + margin: 0 10px 10px 0; position: relative; .video-js { @@ -1398,8 +1419,8 @@ ul.tabs { .video-delete { position: absolute; opacity: 0; - right: 0px; - top: 0px; + right: 0; + top: 0; transition: opacity 0.5s; } @@ -1431,7 +1452,7 @@ ul.tabs { } #photo-top-upload-link, -.photos-upload-link { margin: 1em 0px; display: block; } +.photos-upload-link { margin: 1em 0; display: block; } .photos-upload-link a, #photo-top-upload-link { background: url("../../../images/icons/16/add.png") no-repeat left center; @@ -1442,7 +1463,7 @@ ul.tabs { .photo-top-image-wrapper, .photo-album-image-wrapper { float: left; - margin: 0px 10px 10px 0px; + margin: 0 10px 10px 0; width:@photosize; height: @photosize; position: relative; overflow: hidden; @@ -1463,15 +1484,15 @@ ul.tabs { &:hover .photo-top-album-name, &:hover .caption { - bottom: 0px; - .shadow(0px, 0px); + bottom: 0; + .shadow(0px, 0); .transition(0.5s); } } #photo-photo { display: block; width: 660px; - padding: 50px; margin-bottom: 0px; + padding: 50px; margin-bottom: 0; text-align: center; background-color: @Grey3; img { max-width: 560px; } @@ -1539,7 +1560,7 @@ ul.tabs { img { width: 80px; height: 80px; } } .contact-photo-menu-button { - left: 0px; + left: 0; top: 63px; } } @@ -1554,7 +1575,7 @@ ul.tabs { text-align: center; display: block; font-weight: bold; - padding: 1em 0px; + padding: 1em 0; } } @@ -1567,13 +1588,13 @@ ul.tabs { .mail-subject { width: 30%; - padding:4px 0px 0px 4px; + padding:4px 0 0 4px; a { display: block; } &.unseen a { font-weight: bold; } } - .mail-date { padding: 4px 4px 0px 4px; } - .mail-from { padding: 4px 4px 0px 4px; } - .mail-count { padding: 4px 4px 0px 4px; text-align: right;} + .mail-date { padding: 4px 4px 0 4px; } + .mail-from { padding: 4px 4px 0 4px; } + .mail-count { padding: 4px 4px 0 4px; text-align: right;} .mail-delete { float: right; } } @@ -1583,7 +1604,7 @@ ul.tabs { color: @MailDisplaySubjectColor; margin-bottom: 10px; width: 100%; height: auto; overflow: hidden; - span { float: left; overflow: hidden; padding: 4px 0px 0px 10px;} + span { float: left; overflow: hidden; padding: 4px 0 0 10px;} .mail-delete { float: right; .opaque(0.5);} &:hover .mail-delete { .opaque(1); } @@ -1643,7 +1664,7 @@ footer { height: 100px; display: table-row; } text-align: right; } #pluginslist { - margin: 0px; padding: 0px; + margin: 0; padding: 0; } .plugin { list-style: none; @@ -1663,7 +1684,7 @@ footer { height: 100px; display: table-row; } table { width:100%; border-bottom: 1px solid #000000; - margin: 5px 0px; + margin: 5px 0; th { text-align: left; } @@ -1686,8 +1707,8 @@ footer { height: 100px; display: table-row; } .comment-edit-bb { list-style: none; display: none; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; width: 75%; } .comment-edit-bb > li { @@ -1704,21 +1725,21 @@ footer { height: 100px; display: table-row; } text-decoration: none; :hover {background-color: #ccc;} } -.boldbb { background-position: 0px 0px; } -.boldbb:hover { background-position: 0px -16px; } -.italicbb { background-position: -16px 0px; } +.boldbb { background-position: 0 0; } +.boldbb:hover { background-position: 0 -16px; } +.italicbb { background-position: -16px 0; } .italicbb:hover { background-position: -16px -16px; } -.underlinebb { background-position: -32px 0px; } +.underlinebb { background-position: -32px 0; } .underlinebb:hover { background-position: -32px -16px; } -.quotebb { background-position: -48px 0px; } +.quotebb { background-position: -48px 0; } .quotebb:hover { background-position: -48px -16px; } -.codebb { background-position: -64px 0px; } +.codebb { background-position: -64px 0; } .codebb:hover { background-position: -64px -16px; } -.imagebb { background-position: -80px 0px; } +.imagebb { background-position: -80px 0; } .imagebb:hover { background-position: -80px -16px; } -.urlbb { background-position: -96px 0px; } +.urlbb { background-position: -96px 0; } .urlbb:hover { background-position: -96px -16px; } -.videobb { background-position: -112px 0px; } +.videobb { background-position: -112px 0; } .videobb:hover { background-position: -112px -16px; } @@ -1730,7 +1751,7 @@ footer { height: 100px; display: table-row; } cursor:pointer; border:1px solid #333; width:200px; - margin:10px 0px 10px 0px; + margin:10px 0 10px 0; float: left; } @@ -1762,7 +1783,7 @@ footer { height: 100px; display: table-row; } width: 20px!important; font-size: 8pt; margin-left: 10px; - border: 0px; + border: 0; color: @FieldHelpColor; } @@ -1776,13 +1797,13 @@ footer { height: 100px; display: table-row; } .fbrowser { overflow: auto; position: absolute; - top: 0px; + top: 0; width: 100%; height: 100%; } .fbrowser .path { background-color: @NavbarBackground; - a { padding: 5px; margin: 0px 2px; display: inline-block; } + a { padding: 5px; margin: 0 2px; display: inline-block; } a, a:active, a:visited, a:link, a:hover { color: @Banner; text-decoration: none; outline: none; } } .fbrowser .folders ul { list-style: url("icons/folder.png"); padding-left: 22px;} diff --git a/view/theme/quattro/templates/event_form.tpl b/view/theme/quattro/templates/event_form.tpl new file mode 100644 index 000000000..7cca2be36 --- /dev/null +++ b/view/theme/quattro/templates/event_form.tpl @@ -0,0 +1,46 @@ + +

{{$title}}

+ +

{{$desc}}

+ +
+ + + + + + + {{include file="field_custom.tpl" field=array('start_text', $s_text, $s_dsel, "")}} + {{include file="field_custom.tpl" field=array('finish_text', $f_text, $f_dsel, "")}} + + {{include file="field_checkbox.tpl" field=array('nofinish', $n_text, $n_checked, "")}} + {{include file="field_checkbox.tpl" field=array('adjust', $a_text, $a_checked, "")}} +
+ {{include file="field_input.tpl" field=array('summary', $t_text, $t_orig, "")}} + {{include file="field_textarea.tpl" field=array('desc', $d_text, $d_orig, "")}} + + {{include file="field_textarea.tpl" field=array('location', $l_text, $l_orig, "")}} +
+ {{include file="field_checkbox.tpl" field=array('share', $sh_text, $sh_checked, "")}} + + {{$acl}} + +
+ + +
+
+ + diff --git a/view/theme/quattro/templates/events-js.tpl b/view/theme/quattro/templates/events-js.tpl new file mode 100644 index 000000000..ec8aa586c --- /dev/null +++ b/view/theme/quattro/templates/events-js.tpl @@ -0,0 +1,7 @@ + +{{$tabs}} +

{{$title}} {{$new_event.1}}

+ + + +
diff --git a/view/theme/quattro/templates/events.tpl b/view/theme/quattro/templates/events.tpl new file mode 100644 index 000000000..7a50498eb --- /dev/null +++ b/view/theme/quattro/templates/events.tpl @@ -0,0 +1,24 @@ + +{{$tabs}} +

{{$title}} {{$new_event.1}}

+ + +
+ + {{$calendar}} + +
+
+ + +{{foreach $events as $event}} +
+ {{if $event.is_first}}
{{$event.d}}
{{/if}} + {{if $event.item.author_name}}{{$event.item.author_name}}{{/if}} + {{$event.html}} + {{if $event.item.plink}}{{/if}} + {{if $event.edit}}{{/if}} +
+
+ +{{/foreach}} diff --git a/view/theme/quattro/templates/jot.tpl b/view/theme/quattro/templates/jot.tpl index f72e3ccb4..41d633b25 100644 --- a/view/theme/quattro/templates/jot.tpl +++ b/view/theme/quattro/templates/jot.tpl @@ -6,7 +6,7 @@ {{/if}}
- + @@ -29,19 +29,21 @@
  • {{$shortweblink}}
  • {{$shortvideo}}
  • {{$shortaudio}}
  • -
  • {{$preview}}
  • {{$jotplugins}} + {{if !$is_edit}}
  • + {{/if}}
  • - +