diff --git a/include/nav.php b/include/nav.php index 7fa9754ef1..6512d35609 100644 --- a/include/nav.php +++ b/include/nav.php @@ -27,7 +27,6 @@ function nav(&$a) { $a->page['nav'] .= replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(), - '$langselector' => lang_selector(), '$sitelocation' => $nav_info['sitelocation'], '$nav' => $nav_info['nav'], '$banner' => $nav_info['banner'], @@ -48,7 +47,7 @@ function nav_info(&$a) { /** * - * Our network is distributed, and as you visit friends some of the + * Our network is distributed, and as you visit friends some of the * sites look exactly the same - it isn't always easy to know where you are. * Display the current site location as a navigation aid. * @@ -207,7 +206,7 @@ function nav_info(&$a) { $banner = get_config('system','banner'); - if($banner === false) + if($banner === false) $banner .= 'logoFriendica'; call_hooks('nav_info', $nav); @@ -224,7 +223,7 @@ function nav_info(&$a) { /* * Set a menu item in navbar as selected - * + * */ function nav_set_selected($item){ $a = get_app(); diff --git a/include/pgettext.php b/include/pgettext.php index 4f8db43d47..f72cbb08a7 100644 --- a/include/pgettext.php +++ b/include/pgettext.php @@ -11,7 +11,7 @@ require_once("include/dba.php"); * * Get the language setting directly from system variables, bypassing get_config() * as database may not yet be configured. - * + * * If possible, we use the value from the browser. * */ @@ -21,22 +21,22 @@ if(! function_exists('get_browser_language')) { function get_browser_language() { if (x($_SERVER,'HTTP_ACCEPT_LANGUAGE')) { - // break up string into pieces (languages and q factors) - preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', + // break up string into pieces (languages and q factors) + preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse); - if (count($lang_parse[1])) { - // create a list like "en" => 0.8 - $langs = array_combine($lang_parse[1], $lang_parse[4]); - - // set default to 1 for any without q factor - foreach ($langs as $lang => $val) { - if ($val === '') $langs[$lang] = 1; - } + if (count($lang_parse[1])) { + // create a list like "en" => 0.8 + $langs = array_combine($lang_parse[1], $lang_parse[4]); - // sort list based on value - arsort($langs, SORT_NUMERIC); - } + // set default to 1 for any without q factor + foreach ($langs as $lang => $val) { + if ($val === '') $langs[$lang] = 1; + } + + // sort list based on value + arsort($langs, SORT_NUMERIC); + } } if(isset($langs) && count($langs)) { @@ -94,7 +94,7 @@ if(! function_exists('load_translation_table')) { * load string translation table for alternate language * * first plugin strings are loaded, then globals - * + * * @param string $lang language code to load */ function load_translation_table($lang) { @@ -111,7 +111,7 @@ function load_translation_table($lang) { } } } - + if(file_exists("view/$lang/strings.php")) { include("view/$lang/strings.php"); } @@ -145,7 +145,7 @@ function tt($singular, $plural, $count){ $k = $f($count); return is_array($t)?$t[$k]:$t; } - + if ($count!=1){ return $plural; } else { @@ -153,11 +153,34 @@ function tt($singular, $plural, $count){ } }} -// provide a fallback which will not collide with -// a function defined in any language file +// provide a fallback which will not collide with +// a function defined in any language file if(! function_exists('string_plural_select_default')) { function string_plural_select_default($n) { return ($n != 1); }} + +/** + * Return installed languages as associative array + * [ + * lang => lang, + * ... + * ] + */ +function get_avaiable_languages() { + $lang_choices = array(); + $langs = glob('view/*/strings.php'); /**/ + + if(is_array($langs) && count($langs)) { + if(! in_array('view/en/strings.php',$langs)) + $langs[] = 'view/en/'; + asort($langs); + foreach($langs as $l) { + $t = explode("/",$l); + $lang_choices[$t[1]] = $t[1]; + } + } + return $lang_choices; +} diff --git a/include/text.php b/include/text.php index f89a64a570..e6af5f3db7 100644 --- a/include/text.php +++ b/include/text.php @@ -1738,50 +1738,6 @@ function unamp($s) { }} - - -if(! function_exists('lang_selector')) { -/** - * get html for language selector - * @global string $lang - * @return string - * @template lang_selector.tpl - */ -function lang_selector() { - global $lang; - - $langs = glob('view/*/strings.php'); - - $lang_options = array(); - $selected = ""; - - if(is_array($langs) && count($langs)) { - $langs[] = ''; - if(! in_array('view/en/strings.php',$langs)) - $langs[] = 'view/en/'; - asort($langs); - foreach($langs as $l) { - if($l == '') { - $lang_options[""] = t('default'); - continue; - } - $ll = substr($l,5); - $ll = substr($ll,0,strrpos($ll,'/')); - $selected = (($ll === $lang && (x($_SESSION, 'language'))) ? $ll : $selected); - $lang_options[$ll]=$ll; - } - } - - $tpl = get_markup_template("lang_selector.tpl"); - $o = replace_macros($tpl, array( - '$title' => t('Select an alternate language'), - '$langs' => array($lang_options, $selected), - - )); - return $o; -}} - - if(! function_exists('return_bytes')) { /** * return number of bytes in size (K, M, G) diff --git a/index.php b/index.php index 02316e1e95..9fe248e8e2 100644 --- a/index.php +++ b/index.php @@ -102,13 +102,13 @@ session_start(); * Language was set earlier, but we can over-ride it in the session. * We have to do it here because the session was just now opened. */ - -if(array_key_exists('system_language',$_POST)) { - if(strlen($_POST['system_language'])) - $_SESSION['language'] = $_POST['system_language']; - else - unset($_SESSION['language']); +if (x($_SESSION,'authenticated') && !x($_SESSION,'language')) { + // we didn't loaded user data yet, but we need user language + $r = q("SELECT language FROM user WHERE uid=%d", intval($_SESSION['uid'])); + $_SESSION['language'] = $lang; + if (count($r)>0) $_SESSION['language'] = $r[0]['language']; } + if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) { $lang = $_SESSION['language']; load_translation_table($lang); diff --git a/mod/admin.php b/mod/admin.php index 0b38ae5668..5a2ccf8932 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -603,18 +603,7 @@ function admin_page_site_post(&$a){ function admin_page_site(&$a) { /* Installed langs */ - $lang_choices = array(); - $langs = glob('view/*/strings.php'); /**/ - - if(is_array($langs) && count($langs)) { - if(! in_array('view/en/strings.php',$langs)) - $langs[] = 'view/en/'; - asort($langs); - foreach($langs as $l) { - $t = explode("/",$l); - $lang_choices[$t[1]] = $t[1]; - } - } + $lang_choices = get_avaiable_languages(); if (strlen(get_config('system','directory_submit_url')) AND !strlen(get_config('system','directory'))) { diff --git a/mod/navigation.php b/mod/navigation.php index c14902c5f4..5db69b171e 100644 --- a/mod/navigation.php +++ b/mod/navigation.php @@ -12,8 +12,7 @@ function navigation_content(&$a) { $tpl = get_markup_template('navigation.tpl'); return replace_macros($tpl, array( - '$baseurl' => $a->get_baseurl(), - '$langselector' => lang_selector(), + '$baseurl' => $a->get_baseurl(), '$sitelocation' => $nav_info['sitelocation'], '$nav' => $nav_info['nav'], '$banner' => $nav_info['banner'], diff --git a/mod/settings.php b/mod/settings.php index 6601858ee4..77a5755855 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -386,6 +386,8 @@ function settings_post(&$a) { $username = ((x($_POST,'username')) ? notags(trim($_POST['username'])) : ''); $email = ((x($_POST,'email')) ? notags(trim($_POST['email'])) : ''); $timezone = ((x($_POST,'timezone')) ? notags(trim($_POST['timezone'])) : ''); + $language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : ''); + $defloc = ((x($_POST,'defloc')) ? notags(trim($_POST['defloc'])) : ''); $openid = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : ''); $maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0); @@ -532,7 +534,15 @@ function settings_post(&$a) { } } - $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `def_gid` = %d, `blockwall` = %d, `hidewall` = %d, `blocktags` = %d, `unkmail` = %d, `cntunkmail` = %d WHERE `uid` = %d", + + $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', + `openid` = '%s', `timezone` = '%s', + `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', + `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', + `allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s', + `def_gid` = %d, `blockwall` = %d, `hidewall` = %d, `blocktags` = %d, + `unkmail` = %d, `cntunkmail` = %d, `language` = '%s' + WHERE `uid` = %d", dbesc($username), dbesc($email), dbesc($openid), @@ -554,11 +564,15 @@ function settings_post(&$a) { intval($blocktags), intval($unkmail), intval($cntunkmail), + dbesc($language), intval(local_user()) ); if($r) info( t('Settings updated.') . EOL); + // clear session language + unset($_SESSION['language']); + $r = q("UPDATE `profile` SET `publish` = %d, `name` = '%s', @@ -985,6 +999,7 @@ function settings_content(&$a) { $email = $a->user['email']; $nickname = $a->user['nickname']; $timezone = $a->user['timezone']; + $language = $a->user['language']; $notify = $a->user['notify-flags']; $defloc = $a->user['default-location']; $openid = $a->user['openid']; @@ -1168,6 +1183,8 @@ function settings_content(&$a) { else $public_post_link = '&public=1'; + /* Installed langs */ + $lang_choices = get_avaiable_languages(); $o .= replace_macros($stpl, array( '$ptitle' => t('Account Settings'), @@ -1190,6 +1207,7 @@ function settings_content(&$a) { '$username' => array('username', t('Full Name:'), $username,''), '$email' => array('email', t('Email Address:'), $email, '', '', '', 'email'), '$timezone' => array('timezone_select' , t('Your Timezone:'), select_timezone($timezone), ''), + '$language' => array('language', t('Your Language:'), $language, t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices), '$defloc' => array('defloc', t('Default Post Location:'), $defloc, ''), '$allowloc' => array('allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''), @@ -1245,7 +1263,7 @@ function settings_content(&$a) { '$notify8' => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''), '$desktop_notifications' => array('desktop_notifications', t('Activate desktop notifications') , false, t('Show desktop popup on new notifications')), - + '$email_textonly' => array('email_textonly', t('Text-only notification emails'), get_pconfig(local_user(),'system','email_textonly'), t('Send text only notification emails, without the html part')), diff --git a/view/templates/lang_selector.tpl b/view/templates/lang_selector.tpl deleted file mode 100644 index f5fe8bea56..0000000000 --- a/view/templates/lang_selector.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
lang
- diff --git a/view/templates/settings.tpl b/view/templates/settings.tpl index 26c44f91c3..c385284570 100644 --- a/view/templates/settings.tpl +++ b/view/templates/settings.tpl @@ -27,6 +27,7 @@ {{include file="field_input.tpl" field=$email}} {{include file="field_password.tpl" field=$password4}} {{include file="field_custom.tpl" field=$timezone}} +{{include file="field_select.tpl" field=$language}} {{include file="field_input.tpl" field=$defloc}} {{include file="field_checkbox.tpl" field=$allowloc}} @@ -147,7 +148,7 @@ (function(){ var elm = $("#id_{{$desktop_notifications.0}}_onoff"); var ckbox = $("#id_{{$desktop_notifications.0}}"); - + if (getNotificationPermission() === 'granted') { ckbox.val(1); elm.find(".off").addClass("hidden"); @@ -156,18 +157,18 @@ if (getNotificationPermission() === null) { elm.parent(".field.yesno").hide(); } - + $("#id_{{$desktop_notifications.0}}_onoff").on("click", function(e){ - + if (Notification.permission === 'granted') { localStorage.setItem('notification-permissions', ckbox.val()==1 ? 'granted' : 'denied'); } else if (Notification.permission === 'denied') { localStorage.setItem('notification-permissions', 'denied'); - + ckbox.val(0); elm.find(".on").addClass("hidden"); elm.find(".off").removeClass("hidden"); - + } else if (Notification.permission === 'default') { Notification.requestPermission(function(choice) { if (choice === 'granted') { @@ -181,10 +182,10 @@ } }); } - + //console.log(getNotificationPermission()); - - + + }) })(); diff --git a/view/theme/decaf-mobile/style.css b/view/theme/decaf-mobile/style.css index b32523fdb8..97743e943e 100644 --- a/view/theme/decaf-mobile/style.css +++ b/view/theme/decaf-mobile/style.css @@ -44,7 +44,7 @@ input { border: 1px solid #666666; -moz-border-radius: 3px; -webkit-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; padding: 3px; } @@ -74,7 +74,7 @@ img { border :0px; } background: #EEE; color: #444; padding: 10px; - margin-top: 20px; + margin-top: 20px; } blockquote { @@ -96,7 +96,7 @@ code { background: #EEE; color: #444; padding: 10px; - margin-top: 20px; + margin-top: 20px; } blockquote { @@ -200,10 +200,10 @@ nav #banner #logo-text a:hover { text-decoration: none; } border: 1px solid #babdb6; border-bottom: 0px; background-color: #aec0d3; - color: #565854; + color: #565854; -moz-border-radius: 3px 3px 0px 0px; -webkit-border-radius: 3px 3px 0px 0px; - border-radius: 3px 3px 0px 0px; + border-radius: 3px 3px 0px 0px; } .nav-commlink.selected { @@ -376,7 +376,7 @@ section { background-repeat: no-repeat; min-height: 112px; - border-top: 1px solid #babdb6; + border-top: 1px solid #babdb6; overflow-x:hidden; } @@ -388,7 +388,7 @@ footer { .tabs { /*background-image: url(head.jpg); - background-repeat: repeat-x; + background-repeat: repeat-x; background-position: 0px -20px;*/ border-bottom: 1px solid #babdb6; padding:0px; @@ -416,7 +416,7 @@ footer { } .tab.active { font-weight: bold; - + } #events-tab { display: none; @@ -465,14 +465,14 @@ navigation-messages-wrapper, } /* from default */ -#jot-perms-icon, +#jot-perms-icon, #profile-location, #profile-nolocation, -#profile-youtube, -#profile-video, +#profile-youtube, +#profile-video, #profile-audio, #profile-link, -#profile-title, +#profile-title, #wall-image-upload, #wall-file-upload, #profile-upload-wrapper, @@ -502,12 +502,12 @@ navigation-messages-wrapper, #jot-category:-moz-placeholder{font-weight: normal;}*/ #profile-jot-text::-webkit-input-placeholder{font-weight: bold;} #profile-jot-text:-moz-placeholder{font-weight: bold; font-size:18px; color: graytext} - + #jot-title:hover, #jot-title:focus, #jot-category:hover, #jot-category:focus { - border: 1px solid #cccccc; + border: 1px solid #cccccc; } /*.jothidden { display:none; }*/ @@ -532,7 +532,7 @@ navigation-messages-wrapper, padding: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; border: 1px solid #CCCCCC; background: #F8F8F8; font-weight: bold; @@ -542,7 +542,7 @@ navigation-messages-wrapper, /* padding: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; border: 1px solid #CCCCCC;*/ background: #F8F8F8; font-weight: bold; @@ -630,7 +630,7 @@ navigation-messages-wrapper, } #login-submit-button { - margin-top: 10px; + margin-top: 10px; margin-left: 200px; }*/ @@ -1041,7 +1041,7 @@ input#dfrn-url { clear: left; color: #666666; display: block; - margin-bottom: 20px + margin-bottom: 20px } #profile-edit-profile-name-end, @@ -1126,7 +1126,7 @@ input#dfrn-url { /* width: 120px; height: 120px;*/ padding-left: 15px; - padding-right: 15px; + padding-right: 15px; width: 95px; height: 200px; } @@ -1264,7 +1264,7 @@ input#dfrn-url { display: block; position: absolute; background-image: url("photo-menu.jpg"); - background-position: top left; + background-position: top left; background-repeat: no-repeat; margin: 0px; padding: 0px; width: 16px; @@ -1273,7 +1273,7 @@ input#dfrn-url { overflow: hidden; text-indent: 40px; display: none; - + } .wall-item-photo-menu { width: auto; @@ -1318,7 +1318,7 @@ input#dfrn-url { margin-top: 1em; left: 105px; position: absolute; - top: 1px; + top: 1px; } .comment .wall-item-lock { margin-top: 0px; @@ -1370,11 +1370,11 @@ input#dfrn-url { } .star-item { margin-left: 10px; - float: left; + float: left; } .tag-item { margin-left: 10px; - float: left; + float: left; } .filer-item { @@ -1412,7 +1412,7 @@ input#dfrn-url { border-radius: 7px; } .comment .wall-item-photo { - width: 50px !important; + width: 50px !important; height: 50px !important; } .wall-item-content { @@ -1433,7 +1433,7 @@ input#dfrn-url { .wall-item-title { /*float: left;*/ font-weight: bold; - font-size: 1.6em; + font-size: 1.6em; /*width: 450px;*/ } @@ -1522,7 +1522,7 @@ input#dfrn-url { background-repeat: repeat-x;*/ border-bottom-left-radius: 10px; border-bottom-right-radius: 10px; -} +} .comment-edit-wrapper { @@ -1566,7 +1566,7 @@ input#dfrn-url { /* float: left;*/ -moz-border-radius: 3px; -webkit-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; border: 1px solid #cccccc; padding: 3px 1px 1px 3px; } @@ -1624,7 +1624,7 @@ input#dfrn-url { padding-top: 0.5em; margin-top: 1em; margin-bottom: 1em; - + } .shared_header img { float: left; @@ -2149,7 +2149,7 @@ input#profile-jot-email { .contact-photo-menu-button { /* position: absolute; background-image: url("photo-menu.jpg"); - background-position: top left; + background-position: top left; background-repeat: no-repeat; margin: 0px; padding: 0px; width: 16px; @@ -2158,7 +2158,7 @@ input#profile-jot-email { overflow: hidden; text-indent: 40px; display: none;*/ - + } .contact-photo-menu { width: 130px; @@ -2217,7 +2217,7 @@ input#profile-jot-email { padding: 3px 0px 0px 5px; -moz-border-radius: 3px; -webkit-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; } @@ -2351,7 +2351,7 @@ input#profile-jot-email { margin: 4px; } .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} -.acl-list-item a { +.acl-list-item a { font-size: 8px; display: block; width: 40px; @@ -2670,15 +2670,15 @@ aside input[type='text'] { margin-top: 15px; margin-right: 15px; margin-left: 15px; -/* width: 200px; height: 200px; - overflow: hidden; +/* width: 200px; height: 200px; + overflow: hidden; position: relative; */ } .photo-album-image-wrapper .caption { - display: none; + display: none; width: 100%; /* position: absolute; */ - bottom: 0px; + bottom: 0px; padding: 0.5em 0.5em 0px 0.5em; background-color: rgba(245, 245, 255, 0.8); border-bottom: 2px solid #CCC; @@ -2694,7 +2694,7 @@ aside input[type='text'] { } .photo-top-image-wrapper { -/* position: relative; +/* position: relative; float: left;*/ display: inline-block; vertical-align: top; @@ -2702,7 +2702,7 @@ aside input[type='text'] { margin-right: 15px; margin-left: 15px; margin-bottom: 15px; -/* width: 200px; height: 200px; +/* width: 200px; height: 200px; overflow: hidden; */ } .photo-top-image-wrapper img { @@ -2715,7 +2715,7 @@ aside input[type='text'] { width: 100%; min-height: 2em; /* position: absolute; */ - bottom: 0px; + bottom: 0px; padding: 0px 3px; padding-top: 0.5em; background-color: rgb(255, 255, 255); @@ -2794,7 +2794,7 @@ aside input[type='text'] { } #profile-jot-banner-end { - /* clear: both; */ + /* clear: both; */ } #photos-upload-select-files-text { @@ -3135,7 +3135,7 @@ aside input[type='text'] { } /* end from default */ - + .fn { padding: 1em 0px 5px 12px; @@ -3154,7 +3154,7 @@ aside input[type='text'] { #birthday-title { float: left; - font-weight: bold; + font-weight: bold; } #birthday-adjust { @@ -3281,7 +3281,7 @@ aside input[type='text'] { clear: both; } - + .calendar { font-family: Courier, monospace; } @@ -3394,11 +3394,6 @@ aside input[type='text'] { margin-bottom: 15px; } -#language-selector { - position: absolute; - top: 0px; - left: 16px; -} #group-members { margin-top: 20px; @@ -3496,7 +3491,7 @@ aside input[type='text'] { #netsearch-box { - margin-top: 20px; + margin-top: 20px; } #netsearch-box #search-submit { @@ -3576,20 +3571,6 @@ aside input[type='text'] { text-decoration: underline; } -#lang-select-icon { - cursor: pointer; - position: fixed; - left: 0px; - top: 0px; - opacity: 0.2; - filter:alpha(opacity=20); -} - -#lang-select-icon:hover { - opacity: 1; - filter:alpha(opacity=100); -} - .notif-image { height: 80px; width: 80px; @@ -3601,7 +3582,6 @@ aside input[type='text'] { } - /** * Plugins settings */ @@ -3610,7 +3590,7 @@ aside input[type='text'] { .settings-heading { border-bottom: 1px solid #babdb6; } - + /** @@ -3691,7 +3671,7 @@ aside input[type='text'] { font-weight: bold; background-color: #FF0000; padding: 0em 0.3em; - + } #adminpage dl { clear: left; @@ -3751,7 +3731,7 @@ aside input[type='text'] { /* * UPDATE */ -.popup { +.popup { width: 100%; height: 100%; top:0px; left:0px; position: absolute; @@ -3772,7 +3752,7 @@ aside input[type='text'] { border: 4px solid #000000; background-color: #FFFFFF; } -.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } +.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } .popup .panel .panel_in { width: 100%; height: 100%; position: relative; } .popup .panel .panel_actions { width: 100%; bottom: 4px; left: 0px; position: absolute; } .panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px} @@ -3785,7 +3765,7 @@ aside input[type='text'] { height: auto; overflow: auto; border-bottom: 2px solid #cccccc; padding-bottom: 1em; - margin-bottom: 1em; + margin-bottom: 1em; } .oauthapp img { float: left; @@ -4277,7 +4257,7 @@ ul.notifications-menu-popup { } #recip { - + } .autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; } .autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px; _margin:0; _overflow-x:hidden; } diff --git a/view/theme/decaf-mobile/templates/lang_selector.tpl b/view/theme/decaf-mobile/templates/lang_selector.tpl deleted file mode 100644 index d9a90e7b83..0000000000 --- a/view/theme/decaf-mobile/templates/lang_selector.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
- diff --git a/view/theme/decaf-mobile/templates/settings.tpl b/view/theme/decaf-mobile/templates/settings.tpl index 6196f80a3c..94a8d55422 100644 --- a/view/theme/decaf-mobile/templates/settings.tpl +++ b/view/theme/decaf-mobile/templates/settings.tpl @@ -27,6 +27,7 @@ {{include file="field_input.tpl" field=$email}} {{include file="field_password.tpl" field=$password4}} {{include file="field_custom.tpl" field=$timezone}} +{{include file="field_select.tpl" field=$language}} {{include file="field_input.tpl" field=$defloc}} {{include file="field_checkbox.tpl" field=$allowloc}} diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 4af085d895..dad55a325d 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -125,8 +125,6 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #notify-update{background-position:-60px 0px;} #home-update{background-position:-90px 0px;} #intro-update{background-position:-120px 0px;} -#lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;} -#language-selector{position:fixed;bottom:2px;left:52px;z-index:10;} .menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.2;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;} .menu-popup .menu-sep{border-top:1px solid #4e4f4e;} .menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index c107219a2d..647804b6bc 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -2,7 +2,7 @@ * dispy dark * Description: Dispy Dark: dark, sleek, functional * author, maintainer: simon - * + * * Author's notes: * A few things of note here. The less file is our working copy, * and the CSS is *generated* from it. The CSS is the one that's @@ -798,19 +798,7 @@ nav #nav-notifications-linkmenu { #intro-update { background-position: -120px 0px; } -#lang-select-icon { - cursor: pointer; - position: fixed; - left: 28px; - bottom: 6px; - z-index: 10; -} -#language-selector { - position: fixed; - bottom: 2px; - left: 52px; - z-index: 10; -} + .menu-popup { position: absolute; display: none; @@ -1696,7 +1684,7 @@ div { margin: 0 6px 0 -3px; } .profile-match-photo { - + } [id$="-end"], [class$="-end"] { clear: both; @@ -2100,7 +2088,7 @@ div { #register-form label, #profile-edit-form label { width: 23em; -} +} #register-form span, #profile-edit-form span { color: @menu_bg_colour; diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index a3929b0ed0..7f8a924602 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -125,8 +125,6 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #notify-update{background-position:-60px 0px;} #home-update{background-position:-90px 0px;} #intro-update{background-position:-120px 0px;} -#lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;} -#language-selector{position:fixed;bottom:2px;left:52px;z-index:10;} .menu-popup{position:absolute;display:none;background:white;color:#111111;margin:0px;padding:0px;font-size:small;line-height:1.2;border:3px solid #3465a4;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#111111;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeeec;background-color:#3465a4;} .menu-popup .menu-sep{border-top:1px solid #4e4f4e;} .menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index 8ed02ec72a..949a9abcaa 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -799,19 +799,7 @@ nav #nav-notifications-linkmenu { #intro-update { background-position: -120px 0px; } -#lang-select-icon { - cursor: pointer; - position: fixed; - left: 28px; - bottom: 6px; - z-index: 10; -} -#language-selector { - position: fixed; - bottom: 2px; - left: 52px; - z-index: 10; -} + .menu-popup { position: absolute; display: none; @@ -1697,7 +1685,7 @@ div { margin: 0 6px 0 -3px; } .profile-match-photo { - + } [id$="-end"], [class$="-end"] { clear: both; @@ -2101,7 +2089,7 @@ div { #register-form label, #profile-edit-form label { width: 23em; -} +} #register-form span, #profile-edit-form span { color: @menu_bg_colour; diff --git a/view/theme/dispy/templates/lang_selector.tpl b/view/theme/dispy/templates/lang_selector.tpl deleted file mode 100644 index d9a90e7b83..0000000000 --- a/view/theme/dispy/templates/lang_selector.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
- diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 62b248e8c4..295d9c4050 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2713,12 +2713,6 @@ aside input[type='text'] { margin-bottom: 15px; } -#language-selector { - position: absolute; - top: 0px; - left: 16px; -} - #group-members { margin-top: 20px; padding: 10px; @@ -2888,19 +2882,6 @@ aside input[type='text'] { text-decoration: underline; } -#lang-select-icon { - cursor: pointer; - position: absolute; - left: 0px; - top: 0px; - opacity: 0.2; - filter:alpha(opacity=20); -} - -#lang-select-icon:hover { - opacity: 1; - filter:alpha(opacity=100); -} .notif-image { height: 80px; diff --git a/view/theme/duepuntozero/templates/lang_selector.tpl b/view/theme/duepuntozero/templates/lang_selector.tpl deleted file mode 100644 index d9a90e7b83..0000000000 --- a/view/theme/duepuntozero/templates/lang_selector.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
- diff --git a/view/theme/facepark/style.css b/view/theme/facepark/style.css index d1ce000b41..7bbb416f83 100644 --- a/view/theme/facepark/style.css +++ b/view/theme/facepark/style.css @@ -22,7 +22,7 @@ a:hover {text-decoration: underline; } input { /*border: 1px solid #666666;*/ /*-moz-border-radius: 3px;*/ - border-radius: 3px; + border-radius: 3px; padding: 3px; background-color: #0B4E7A; color: #ffffff; @@ -54,7 +54,7 @@ code { background: #EEE; color: #444; padding: 10px; - margin-top: 20px; + margin-top: 20px; } blockquote { @@ -148,9 +148,9 @@ nav #banner #logo-text a:hover { text-decoration: none; } border-bottom: 0px; background-color: #FFFFFF; /*font-weight: bold;*/ - color: #FFFFFF; + color: #FFFFFF; -moz-border-radius: 3px 3px 0px 0px; - border-radius: 3px 3px 0px 0px; + border-radius: 3px 3px 0px 0px; } nav .nav-link { float: right; @@ -172,7 +172,7 @@ nav .nav-link { font-size:12px ; font-weight: bold; float: left; - margin-top: 62px; + margin-top: 62px; } @@ -217,12 +217,12 @@ section { background-position: top right; background-repeat: no-repeat; min-height: 112px; - + } .tabs { height: 27px; background-image: url(head.jpg); - background-repeat: repeat-x; + background-repeat: repeat-x; background-position: 0px -20px; border-bottom: 1px solid #babdb6; padding:0px; @@ -260,14 +260,14 @@ div.wall-item-content-wrapper.shiny { } /* from default */ -#jot-perms-icon, +#jot-perms-icon, #profile-location, #profile-nolocation, -#profile-youtube, -#profile-video, +#profile-youtube, +#profile-video, #profile-audio, #profile-link, -#profile-title, +#profile-title, #wall-image-upload, #wall-file-upload, #profile-upload-wrapper, @@ -294,11 +294,11 @@ div.wall-item-content-wrapper.shiny { #jot-title::-webkit-input-placeholder{font-weight: normal;} #jot-title:-moz-placeholder{font-weight: normal;} - - + + #jot-title:hover, #jot-title:focus { - border: 1px solid #cccccc; + border: 1px solid #cccccc; } .jothidden { display:none; } @@ -322,7 +322,7 @@ div.wall-item-content-wrapper.shiny { .group-selected, .nets-selected { padding: 3px; -moz-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; border: 1px solid #CCCCCC; background: #F8F8F8; font-weight: bold; @@ -778,7 +778,7 @@ input#dfrn-url { clear: left; color: #666666; display: block; - margin-bottom: 20px + margin-bottom: 20px } #profile-edit-profile-name-end, @@ -901,7 +901,7 @@ input#dfrn-url { /*border: 1px solid #CCC;*/ position: relative; -moz-border-radius: 3px; - /*border-radius: 3px; */ + /*border-radius: 3px; */ } @@ -930,7 +930,7 @@ input#dfrn-url { display: block; position: absolute; background-image: url("photo-menu.jpg"); - background-position: top left; + background-position: top left; background-repeat: no-repeat; margin: 0px; padding: 0px; width: 16px; @@ -939,7 +939,7 @@ input#dfrn-url { overflow: hidden; text-indent: 40px; display: none; - + } .wall-item-photo-menu { width: auto; @@ -991,7 +991,7 @@ input#dfrn-url { /*margin-top: 10px;*/ left: 105px; position: absolute; - top: 1px; + top: 1px; } .comment .wall-item-lock { left: 65px; @@ -1044,11 +1044,11 @@ input#dfrn-url { } .star-item { margin-left: 10px; - float: left; + float: left; } .tag-item { margin-left: 10px; - float: left; + float: left; } @@ -1081,7 +1081,7 @@ input#dfrn-url { border: none; } .comment .wall-item-photo { - width: 50px !important; + width: 50px !important; height: 50px !important; } .wall-item-content { @@ -1123,7 +1123,7 @@ input#dfrn-url { .comment .wall-item-tools { background:none; -} +} .comment-edit-wrapper { margin-top: 15px; @@ -1151,7 +1151,7 @@ input#dfrn-url { float: left; margin-top: 10px; -moz-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; border: 1px solid #cccccc; padding: 3px 1px 1px 3px; } @@ -1549,7 +1549,7 @@ input#dfrn-url { .contact-photo-menu-button { position: absolute; background-image: url("photo-menu.jpg"); - background-position: top left; + background-position: top left; background-repeat: no-repeat; margin: 0px; padding: 0px; width: 16px; @@ -1558,7 +1558,7 @@ input#dfrn-url { overflow: hidden; text-indent: 40px; display: none; - + } .contact-photo-menu { width: auto; @@ -1595,7 +1595,7 @@ input#dfrn-url { border: 1px solid #cccccc; padding: 3px 0px 0px 5px; -moz-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; } @@ -1646,7 +1646,7 @@ input#dfrn-url { overflow: auto; } #acl-list-content { - + } .acl-list-item { display: block; @@ -1663,7 +1663,7 @@ input#dfrn-url { margin: 4px; } .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} -.acl-list-item a { +.acl-list-item a { font-size: 8px; display: block; width: 40px; @@ -1962,15 +1962,15 @@ aside input[type='text'] { float: left; margin-top: 15px; margin-right: 15px; - width: 200px; height: 200px; - overflow: hidden; + width: 200px; height: 200px; + overflow: hidden; position: relative; } .photo-album-image-wrapper .caption { - display: none; + display: none; width: 100%; - position: absolute; - bottom: 0px; + position: absolute; + bottom: 0px; padding: 0.5em 0.5em 0px 0.5em; background-color: rgba(245, 245, 255, 0.8); border-bottom: 2px solid #CCC; @@ -1989,14 +1989,14 @@ aside input[type='text'] { float: left; margin-top: 15px; margin-right: 15px; - width: 200px; height: 200px; - overflow: hidden; + width: 200px; height: 200px; + overflow: hidden; } .photo-top-album-name { width: 100%; min-height: 2em; - position: absolute; - bottom: 0px; + position: absolute; + bottom: 0px; padding: 0px 3px; padding-top: 0.5em; background-color: rgb(255, 255, 255); @@ -2075,7 +2075,7 @@ aside input[type='text'] { } #profile-jot-banner-end { - /* clear: both; */ + /* clear: both; */ } #photos-upload-select-files-text { @@ -2299,7 +2299,7 @@ aside input[type='text'] { } /* end from default */ - + .fn { padding: 0px 0px 5px 12px; @@ -2318,7 +2318,7 @@ aside input[type='text'] { #birthday-title { float: left; - font-weight: bold; + font-weight: bold; } #birthday-adjust { @@ -2411,7 +2411,7 @@ aside input[type='text'] { clear: both; } - + .calendar { font-family: Courier, monospace; } @@ -2493,11 +2493,6 @@ aside input[type='text'] { margin-bottom: 15px; } -#language-selector { - position: absolute; - top: 0px; - left: 16px; -} #group-members { margin-top: 20px; @@ -2595,7 +2590,7 @@ aside input[type='text'] { #netsearch-box { - margin-top: 20px; + margin-top: 20px; } #netsearch-box #search-submit { @@ -2668,19 +2663,6 @@ aside input[type='text'] { text-decoration: underline; } -#lang-select-icon { - cursor: pointer; - position: absolute; - left: 0px; - top: 0px; - opacity: 0.2; - filter:alpha(opacity=20); -} - -#lang-select-icon:hover { - opacity: 1; - filter:alpha(opacity=100); -} .notif-image { height: 80px; @@ -2702,7 +2684,7 @@ aside input[type='text'] { .settings-heading { border-bottom: 1px solid #babdb6; } - + /** * Form fields @@ -2728,7 +2710,7 @@ aside input[type='text'] { display: block; margin-left: 200px; color: #666666; - + } @@ -2774,7 +2756,7 @@ aside input[type='text'] { font-weight: bold; background-color: #FF0000; padding: 0em 0.3em; - + } #adminpage dl { clear: left; @@ -2829,7 +2811,7 @@ aside input[type='text'] { /* * UPDATE */ -.popup { +.popup { width: 100%; height: 100%; top:0px; left:0px; position: absolute; @@ -2850,7 +2832,7 @@ aside input[type='text'] { border: 4px solid #000000; background-color: #FFFFFF; } -.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } +.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } .popup .panel .panel_in { width: 100%; height: 100%; position: relative; } .popup .panel .panel_actions { width: 100%; bottom: 4px; left: 0px; position: absolute; } .panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px} @@ -2863,7 +2845,7 @@ aside input[type='text'] { height: auto; overflow: auto; border-bottom: 2px solid #cccccc; padding-bottom: 1em; - margin-bottom: 1em; + margin-bottom: 1em; } .oauthapp img { float: left; diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index f1901d1a16..f8b49df7c5 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -44,7 +44,7 @@ input { border: 1px solid #666666; -moz-border-radius: 3px; -webkit-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; padding: 3px; } @@ -74,7 +74,7 @@ img { border :0px; } background: #EEE; color: #444; padding: 10px; - margin-top: 20px; + margin-top: 20px; } blockquote { @@ -96,7 +96,7 @@ code { background: #EEE; color: #444; padding: 10px; - margin-top: 20px; + margin-top: 20px; } blockquote { @@ -205,10 +205,10 @@ nav #banner #logo-text a:hover { text-decoration: none; } border: 1px solid #babdb6; border-bottom: 0px; background-color: #aec0d3; - color: #565854; + color: #565854; -moz-border-radius: 3px 3px 0px 0px; -webkit-border-radius: 3px 3px 0px 0px; - border-radius: 3px 3px 0px 0px; + border-radius: 3px 3px 0px 0px; } .nav-commlink.selected { @@ -377,13 +377,13 @@ section { background-repeat: no-repeat; min-height: 112px; - border-top: 1px solid #babdb6; + border-top: 1px solid #babdb6; overflow-x:hidden; } .tabs { /*background-image: url(head.jpg); - background-repeat: repeat-x; + background-repeat: repeat-x; background-position: 0px -20px;*/ border-bottom: 1px solid #babdb6; padding:0px; @@ -411,7 +411,7 @@ section { } .tab.active { font-weight: bold; - + } #events-tab { display: none; @@ -449,14 +449,14 @@ footer { } /* from default */ -#jot-perms-icon, +#jot-perms-icon, #profile-location, #profile-nolocation, -#profile-youtube, -#profile-video, +#profile-youtube, +#profile-video, #profile-audio, #profile-link, -#profile-title, +#profile-title, #wall-image-upload, #wall-file-upload, #profile-upload-wrapper, @@ -484,13 +484,13 @@ footer { #jot-category::-webkit-input-placeholder{font-weight: normal;} #jot-title:-moz-placeholder{font-weight: normal;} #jot-category:-moz-placeholder{font-weight: normal;}*/ - - + + #jot-title:hover, #jot-title:focus, #jot-category:hover, #jot-category:focus { - border: 1px solid #cccccc; + border: 1px solid #cccccc; } .jothidden { display:none; } @@ -515,7 +515,7 @@ footer { padding: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; border: 1px solid #CCCCCC; background: #F8F8F8; font-weight: bold; @@ -525,7 +525,7 @@ footer { /* padding: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; border: 1px solid #CCCCCC;*/ background: #F8F8F8; font-weight: bold; @@ -613,7 +613,7 @@ footer { } #login-submit-button { - margin-top: 10px; + margin-top: 10px; margin-left: 200px; }*/ @@ -1024,7 +1024,7 @@ input#dfrn-url { clear: left; color: #666666; display: block; - margin-bottom: 20px + margin-bottom: 20px } #profile-edit-profile-name-end, @@ -1109,7 +1109,7 @@ input#dfrn-url { /* width: 120px; height: 120px;*/ padding-left: 15px; - padding-right: 15px; + padding-right: 15px; max-width: 262px; height: 90px; margin: 0 10px 10px 0px; @@ -1250,7 +1250,7 @@ input#dfrn-url { display: block; position: absolute; background-image: url("photo-menu.jpg"); - background-position: top left; + background-position: top left; background-repeat: no-repeat; margin: 0px; padding: 0px; width: 16px; @@ -1259,7 +1259,7 @@ input#dfrn-url { overflow: hidden; text-indent: 40px; display: none; - + } .wall-item-photo-menu { width: auto; @@ -1357,11 +1357,11 @@ input#dfrn-url { } .star-item { margin-left: 10px; - float: left; + float: left; } .tag-item { margin-left: 10px; - float: left; + float: left; } .filer-item { @@ -1399,7 +1399,7 @@ input#dfrn-url { border-radius: 7px; } .comment .wall-item-photo { - width: 50px !important; + width: 50px !important; height: 50px !important; } .wall-item-content { @@ -1420,7 +1420,7 @@ input#dfrn-url { .wall-item-title { /*float: left;*/ font-weight: bold; - font-size: 1.6em; + font-size: 1.6em; /*width: 450px;*/ } @@ -1509,7 +1509,7 @@ input#dfrn-url { background-repeat: repeat-x;*/ border-bottom-left-radius: 10px; border-bottom-right-radius: 10px; -} +} .comment-edit-wrapper { @@ -1553,7 +1553,7 @@ input#dfrn-url { /* float: left;*/ -moz-border-radius: 3px; -webkit-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; border: 1px solid #cccccc; padding: 3px 1px 1px 3px; } @@ -1612,7 +1612,7 @@ input#dfrn-url { padding-top: 0.5em; margin-top: 1em; margin-bottom: 1em; - + } .shared_header img { float: left; @@ -2131,7 +2131,7 @@ input#profile-jot-email { .contact-photo-menu-button { /* position: absolute; background-image: url("photo-menu.jpg"); - background-position: top left; + background-position: top left; background-repeat: no-repeat; margin: 0px; padding: 0px; width: 16px; @@ -2140,7 +2140,7 @@ input#profile-jot-email { overflow: hidden; text-indent: 40px; display: none;*/ - + } .contact-photo-menu { width: 130px; @@ -2199,7 +2199,7 @@ input#profile-jot-email { padding: 3px 0px 0px 5px; -moz-border-radius: 3px; -webkit-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; } @@ -2272,7 +2272,7 @@ input#profile-jot-email { overflow: visible; } #acl-list-content { - + } .acl-list-item { display: inline-block; @@ -2296,7 +2296,7 @@ input#profile-jot-email { margin: 4px; } .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} -.acl-list-item a { +.acl-list-item a { font-size: 10px; display: block; width: 55px; @@ -2634,15 +2634,15 @@ aside input[type='text'] { margin-top: 15px; margin-right: 15px; margin-left: 15px; -/* width: 200px; height: 200px; - overflow: hidden; +/* width: 200px; height: 200px; + overflow: hidden; position: relative; */ } .photo-album-image-wrapper .caption { - display: none; + display: none; width: 100%; /* position: absolute; */ - bottom: 0px; + bottom: 0px; padding: 0.5em 0.5em 0px 0.5em; background-color: rgba(245, 245, 255, 0.8); border-bottom: 2px solid #CCC; @@ -2658,7 +2658,7 @@ aside input[type='text'] { } .photo-top-image-wrapper { -/* position: relative; +/* position: relative; float: left;*/ display: inline-block; vertical-align: top; @@ -2666,7 +2666,7 @@ aside input[type='text'] { margin-right: 15px; margin-left: 15px; margin-bottom: 15px; -/* width: 200px; height: 200px; +/* width: 200px; height: 200px; overflow: hidden; */ } .photo-top-image-wrapper img { @@ -2679,7 +2679,7 @@ aside input[type='text'] { width: 100%; min-height: 2em; /* position: absolute; */ - bottom: 0px; + bottom: 0px; padding: 0px 3px; padding-top: 0.5em; background-color: rgb(255, 255, 255); @@ -2759,7 +2759,7 @@ aside input[type='text'] { } #profile-jot-banner-end { - /* clear: both; */ + /* clear: both; */ } #photos-upload-select-files-text { @@ -3097,7 +3097,7 @@ aside input[type='text'] { } /* end from default */ - + .fn { padding: 1em 0px 5px 12px; @@ -3116,7 +3116,7 @@ aside input[type='text'] { #birthday-title { float: left; - font-weight: bold; + font-weight: bold; } #birthday-adjust { @@ -3243,7 +3243,7 @@ aside input[type='text'] { clear: both; } - + .calendar { font-family: Courier, monospace; } @@ -3389,11 +3389,6 @@ aside input[type='text'] { margin-bottom: 15px; } -#language-selector { - position: absolute; - top: 0px; - left: 16px; -} #group-members { margin-top: 20px; @@ -3491,7 +3486,7 @@ aside input[type='text'] { #netsearch-box { - margin-top: 20px; + margin-top: 20px; } #netsearch-box #search-submit { @@ -3570,20 +3565,6 @@ aside input[type='text'] { text-decoration: underline; } -#lang-select-icon { - cursor: pointer; - position: fixed; - left: 0px; - top: 0px; - opacity: 0.2; - filter:alpha(opacity=20); -} - -#lang-select-icon:hover { - opacity: 1; - filter:alpha(opacity=100); -} - .notif-image { height: 80px; width: 80px; @@ -3604,7 +3585,7 @@ aside input[type='text'] { .settings-heading { border-bottom: 1px solid #babdb6; } - + /** @@ -3685,7 +3666,7 @@ aside input[type='text'] { font-weight: bold; background-color: #FF0000; padding: 0em 0.3em; - + } #adminpage dl { clear: left; @@ -3745,7 +3726,7 @@ aside input[type='text'] { /* * UPDATE */ -.popup { +.popup { width: 100%; height: 100%; top:0px; left:0px; position: absolute; @@ -3766,7 +3747,7 @@ aside input[type='text'] { border: 4px solid #000000; background-color: #FFFFFF; } -.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } +.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } .popup .panel .panel_in { width: 100%; height: 100%; position: relative; } .popup .panel .panel_actions { width: 100%; bottom: 4px; left: 0px; position: absolute; } .panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px} @@ -3779,7 +3760,7 @@ aside input[type='text'] { height: auto; overflow: auto; border-bottom: 2px solid #cccccc; padding-bottom: 1em; - margin-bottom: 1em; + margin-bottom: 1em; } .oauthapp img { float: left; @@ -4275,7 +4256,7 @@ ul.notifications-menu-popup { } #recip { - + } .autocomplete-w1 { background: #ffffff no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; } .autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px; _margin:0; _overflow-x:hidden; } diff --git a/view/theme/frost-mobile/templates/lang_selector.tpl b/view/theme/frost-mobile/templates/lang_selector.tpl deleted file mode 100644 index d9a90e7b83..0000000000 --- a/view/theme/frost-mobile/templates/lang_selector.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
- diff --git a/view/theme/frost-mobile/templates/settings.tpl b/view/theme/frost-mobile/templates/settings.tpl index cd9e1d3161..e3a636a840 100644 --- a/view/theme/frost-mobile/templates/settings.tpl +++ b/view/theme/frost-mobile/templates/settings.tpl @@ -27,6 +27,7 @@ {{include file="field_input.tpl" field=$email}} {{include file="field_password.tpl" field=$password4}} {{include file="field_custom.tpl" field=$timezone}} +{{include file="field_select.tpl" field=$language}} {{include file="field_input.tpl" field=$defloc}} {{include file="field_checkbox.tpl" field=$allowloc}} diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 74b5dde0b6..4774dee3ca 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -35,7 +35,7 @@ input { border: 1px solid #666666; -moz-border-radius: 3px; -webkit-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; padding: 3px; } @@ -63,7 +63,7 @@ code { background: #EEE; color: #444; padding: 10px; - margin-top: 20px; + margin-top: 20px; } blockquote { @@ -176,10 +176,10 @@ nav #banner #logo-text a:hover { text-decoration: none; } border: 1px solid #babdb6; border-bottom: 0px; background-color: #aec0d3; - color: #565854; + color: #565854; -moz-border-radius: 3px 3px 0px 0px; -webkit-border-radius: 3px 3px 0px 0px; - border-radius: 3px 3px 0px 0px; + border-radius: 3px 3px 0px 0px; } .nav-commlink.selected { @@ -337,7 +337,7 @@ section { .tabs { height: 27px; /*background-image: url(head.jpg); - background-repeat: repeat-x; + background-repeat: repeat-x; background-position: 0px -20px; border-bottom: 1px solid #babdb6;*/ padding:0px; @@ -345,7 +345,7 @@ section { .tabs li { margin: 0px; list-style: none; } .tabs a { /* background-image: url(head.jpg); - background-repeat: repeat-x; + background-repeat: repeat-x; background-position: 0px 0px; background-size: auto 45px;*/ @@ -423,14 +423,14 @@ div.wall-item-content-wrapper.shiny { } /* from default */ -#jot-perms-icon, +#jot-perms-icon, #profile-location, #profile-nolocation, -#profile-youtube, -#profile-video, +#profile-youtube, +#profile-video, #profile-audio, #profile-link, -#profile-title, +#profile-title, #wall-image-upload, #wall-file-upload, #profile-upload-wrapper, @@ -462,13 +462,13 @@ div.wall-item-content-wrapper.shiny { #jot-category::-webkit-input-placeholder{font-weight: normal;} #jot-title:-moz-placeholder{font-weight: normal;} #jot-category:-moz-placeholder{font-weight: normal;} - - + + #jot-title:hover, #jot-title:focus, #jot-category:hover, #jot-category:focus { - border: 1px solid #cccccc; + border: 1px solid #cccccc; } .jothidden { display:none; } @@ -493,7 +493,7 @@ div.wall-item-content-wrapper.shiny { padding: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; border: 1px solid #CCCCCC; background: #F8F8F8; font-weight: bold; @@ -503,7 +503,7 @@ div.wall-item-content-wrapper.shiny { padding: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; border: 1px solid #CCCCCC; background: #F8F8F8; font-weight: bold; @@ -593,7 +593,7 @@ div.wall-item-content-wrapper.shiny { } #login-submit-button { - margin-top: 10px; + margin-top: 10px; margin-left: 200px; }*/ @@ -995,7 +995,7 @@ input#dfrn-url { clear: left; color: #666666; display: block; - margin-bottom: 20px + margin-bottom: 20px } #profile-edit-profile-name-end, @@ -1220,7 +1220,7 @@ input#dfrn-url { display: block; position: absolute; background-image: url("photo-menu.jpg"); - background-position: top left; + background-position: top left; background-repeat: no-repeat; margin: 0px; padding: 0px; width: 16px; @@ -1229,7 +1229,7 @@ input#dfrn-url { overflow: hidden; text-indent: 40px; display: none; - + } .wall-item-photo-menu { width: auto; @@ -1275,7 +1275,7 @@ input#dfrn-url { margin-top: 1em; /* needs to match .wall-item-content-wrapper padding-top */ left: 105px; position: absolute; - top: 1px; + top: 1px; } .comment .wall-item-lock { left: 65px; @@ -1329,11 +1329,11 @@ input#dfrn-url { } .star-item { margin-left: 10px; - float: left; + float: left; } .tag-item { margin-left: 10px; - float: left; + float: left; } .filer-item { @@ -1373,7 +1373,7 @@ input#dfrn-url { -webkit-border-radius: 7px; } .comment .wall-item-photo { - width: 50px !important; + width: 50px !important; height: 50px !important; border-radius: 5px; -moz-border-radius: 5px; @@ -1431,7 +1431,7 @@ input#dfrn-url { .wall-item-title { float: left; font-weight: bold; - font-size: 1.6em; + font-size: 1.6em; /*width: 450px;*/ } @@ -1475,7 +1475,7 @@ input#dfrn-url { margin-left: 0px; margin-top: 5px; padding-top: 0px; -} +} .comment-edit-wrapper { margin-top: 15px; @@ -1514,7 +1514,7 @@ input#dfrn-url { margin-top: 10px; -moz-border-radius: 3px; -webkit-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; border: 1px solid #cccccc; padding: 3px 1px 1px 3px; } @@ -1563,7 +1563,7 @@ input#dfrn-url { padding-top: 0.5em; margin-top: 1em; margin-bottom: 1em; - + } .shared_header img { float: left; @@ -2010,7 +2010,7 @@ input#dfrn-url { .contact-photo-menu-button { position: absolute; background-image: url("photo-menu.jpg"); - background-position: top left; + background-position: top left; background-repeat: no-repeat; margin: 0px; padding: 0px; width: 16px; @@ -2019,7 +2019,7 @@ input#dfrn-url { overflow: hidden; text-indent: 40px; display: none; - + } .contact-photo-menu { width: auto; @@ -2056,7 +2056,7 @@ input#dfrn-url { border: 1px solid #cccccc; padding: 3px 0px 0px 5px; -moz-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; } @@ -2110,7 +2110,7 @@ input#dfrn-url { overflow: auto; } #acl-list-content { - + } .acl-list-item { display: block; @@ -2127,7 +2127,7 @@ input#dfrn-url { margin: 4px; } .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} -.acl-list-item a { +.acl-list-item a { font-size: 10px; /* 8px; */ display: block; width: 50px; @@ -2442,15 +2442,15 @@ aside input[type='text'] { margin-top: 15px; margin-right: 15px; margin-left: 15px; -/* width: 200px; height: 200px; - overflow: hidden; +/* width: 200px; height: 200px; + overflow: hidden; position: relative; */ } .photo-album-image-wrapper .caption { - display: none; + display: none; width: 100%; /* position: absolute; */ - bottom: 0px; + bottom: 0px; padding: 0.5em 0.5em 0px 0.5em; background-color: rgba(245, 245, 255, 0.8); border-bottom: 2px solid #CCC; @@ -2466,7 +2466,7 @@ aside input[type='text'] { } .photo-top-image-wrapper { -/* position: relative; +/* position: relative; float: left;*/ display: inline-block; vertical-align: top; @@ -2474,7 +2474,7 @@ aside input[type='text'] { margin-right: 15px; margin-left: 15px; margin-bottom: 15px; -/* width: 200px; height: 200px; +/* width: 200px; height: 200px; overflow: hidden; */ } .photo-album-image-wrapper img, .photo-top-image-wrapper img { @@ -2489,7 +2489,7 @@ aside input[type='text'] { width: 100%; min-height: 2em; /* position: absolute; */ - bottom: 0px; + bottom: 0px; padding: 0px 3px; padding-top: 0.5em; background-color: rgb(255, 255, 255); @@ -2585,7 +2585,7 @@ aside input[type='text'] { } #profile-jot-banner-end { - /* clear: both; */ + /* clear: both; */ } #photos-upload-select-files-text { @@ -2872,7 +2872,7 @@ aside input[type='text'] { } /* end from default */ - + .fn { padding: 0px 0px 5px 12px; @@ -2891,7 +2891,7 @@ aside input[type='text'] { #birthday-title { float: left; - font-weight: bold; + font-weight: bold; } #birthday-adjust { @@ -3015,7 +3015,7 @@ aside input[type='text'] { clear: both; } - + .calendar { font-family: Courier, monospace; } @@ -3159,12 +3159,6 @@ aside input[type='text'] { margin-bottom: 15px; } -#language-selector { - position: absolute; - top: 0px; - left: 16px; -} - #group-members { margin-top: 20px; padding: 10px; @@ -3261,7 +3255,7 @@ aside input[type='text'] { #netsearch-box { - margin-top: 20px; + margin-top: 20px; } #netsearch-box #search-submit { @@ -3351,19 +3345,6 @@ aside input[type='text'] { text-decoration: underline; } -#lang-select-icon { - cursor: pointer; - position: absolute; - left: 0px; - top: 0px; - opacity: 0.2; - filter:alpha(opacity=20); -} - -#lang-select-icon:hover { - opacity: 1; - filter:alpha(opacity=100); -} .notif-image { height: 80px; @@ -3385,7 +3366,7 @@ aside input[type='text'] { .settings-heading { border-bottom: 1px solid #babdb6; } - + /** * Form fields @@ -3468,7 +3449,7 @@ aside input[type='text'] { font-weight: bold; background-color: #FF0000; padding: 0em 0.3em; - + } #adminpage dl { clear: left; @@ -3527,7 +3508,7 @@ aside input[type='text'] { /* * UPDATE */ -.popup { +.popup { width: 100%; height: 100%; top:0px; left:0px; position: absolute; @@ -3548,7 +3529,7 @@ aside input[type='text'] { border: 4px solid #000000; background-color: #FFFFFF; } -.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } +.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } .popup .panel .panel_in { width: 100%; height: 100%; position: relative; } .popup .panel .panel_actions { width: 100%; bottom: 4px; left: 0px; position: absolute; } .panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px} @@ -3561,7 +3542,7 @@ aside input[type='text'] { height: auto; overflow: auto; border-bottom: 2px solid #cccccc; padding-bottom: 1em; - margin-bottom: 1em; + margin-bottom: 1em; } .oauthapp img { float: left; @@ -4154,7 +4135,7 @@ ul.notifications-menu-popup { } #recip { - + } .autocomplete-w1 { background: #ffffff no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; } .autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px; _margin:0; _overflow-x:hidden; } diff --git a/view/theme/frost/templates/lang_selector.tpl b/view/theme/frost/templates/lang_selector.tpl deleted file mode 100644 index d9a90e7b83..0000000000 --- a/view/theme/frost/templates/lang_selector.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
- diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 2553c57a9e..ba0c4bff6e 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -4,7 +4,7 @@ Maintainer: Nomen Nominandum last change: 2013-05-08 -** Colors ** +** Colors ** Blue links - #1873a2 Blue link hover - #6da6c4 Blue Gradients (buttons and other gradients) - #1873a2 and #6da6c4 @@ -19,21 +19,21 @@ Orange - #fec01d @media only screen and (device-width: 768px) { /* For general iPad layouts */ #body { - -moz-background-clip: border; - -moz-background-origin: pdading; - -moz-background-size: auto auto; - background-attachment: scroll; - background-color: transparent; - background-image: url( ); - background-position: center top; + -moz-background-clip: border; + -moz-background-origin: pdading; + -moz-background-size: auto auto; + background-attachment: scroll; + background-color: transparent; + background-image: url( ); + background-position: center top; background-repeat: no-repeat; - } + } } @media only screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:portrait) { /* For portrait layouts only */ } - + @media only screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation:landscape) { /* For landscape layouts only */ } @@ -155,7 +155,7 @@ section { -moz-box-shadow: 3px 3px 6px #959494; -webkit-box-shadow: 3px 3px 6px #959494; background-color: #efefef; - padding: 10px; + padding: 10px; } .mframe { @@ -280,8 +280,8 @@ section { } #login-name-end, -#login-password-end, -#login-extra-end, +#login-password-end, +#login-extra-end, #login-submit-end { height: 50px; } @@ -396,7 +396,7 @@ nav #banner { position: absolute; margin-left: 3px; /*margin-top: 2px;*/ - padding-bottom: 5px; + padding-bottom: 5px; } nav #banner #logo-text a { @@ -430,7 +430,7 @@ nav #user-menu { -webkit-border-radius: 5px; color: #efefef; text-decoration: none; - text-align: center; + text-align: center; } nav #user-menu:hover { @@ -463,7 +463,7 @@ nav #user-menu-label { .nav-ajax-left { font-size: 0.8em; float: left; - margin-top: 62px; + margin-top: 62px; } nav #nav-link-wrapper .nav-link { @@ -504,7 +504,7 @@ ul#user-menu-popup { border-radius: 0px 0px 5px 5px; -webkit-border-radius: 0px 0px 5px 5px; -moz-border-radius: 0px 0px 5px 5px; - box-shadow: 5px 5px 10px #242424; + box-shadow: 5px 5px 10px #242424; -moz-box-shadow: 5px 5px 10px #242424; -webkit-box-shadow: 5px 5px 10px #242424; z-index: 10000; @@ -546,7 +546,7 @@ ul#user-menu-popup li a.nav-sep { .nav-ajax-update { width: 44px; height: 32px; - background: transparent url('images/notifications.png') 0px 0px no-repeat; + background: transparent url('images/notifications.png') 0px 0px no-repeat; color: #333333; font-weight: bold; font-size: 0.8em; @@ -575,32 +575,20 @@ ul#user-menu-popup li a.nav-sep { background-position: 0px 0px; } -#lang-select-icon { - bottom: 5px; - cursor: pointer; - left: 25px; - position: fixed; - z-index: 10; -} -#language-selector { - position: fixed; - bottom: 2px; - left: 55px; - z-index: 10; -} + /* =================== */ /* = System Messages = */ /* =================== */ -#sysmsg_info, +#sysmsg_info, #sysmsg { - position: fixed; - bottom: 0px; right:20%; + position: fixed; + bottom: 0px; right:20%; box-shadow: 7px 7px 10px #434343; -moz-box-shadow: 7px 7px 12px #434343; -webkit-box-shadow: 7px75px 12px #434343; - padding: 10px; + padding: 10px; background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) ); background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); @@ -610,7 +598,7 @@ ul#user-menu-popup li a.nav-sep { -moz-border-radius: 5px 5px 0px 0px; border: 1px solid #da2c2c; border-bottom: 0px; - padding-bottom: 50px; + padding-bottom: 50px; z-index: 1000; color: #efefef; font-style: bold; @@ -774,7 +762,7 @@ h3 #search:before { background-color: #f3f3f3; border: 1px solid #7C7D7B; margin-bottom: 10px; - border-radius: 5px; + border-radius: 5px; -webkit-border-radius: 5px; -moz-border-radius: 5px; } @@ -905,9 +893,9 @@ li.widget-list { top: 1px; } -.group-selected, -.nets-selected, -.fileas-selected, +.group-selected, +.nets-selected, +.fileas-selected, .categories-selected { padding-bottom: 0px; padding-left: 2px; @@ -953,8 +941,8 @@ ul .sidebar-group-li .icon { list-style-type: none; } -.nets-ul li, -.fileas-ul li, +.nets-ul li, +.fileas-ul li, .categories-ul li, .datebrowse-link { } @@ -971,12 +959,12 @@ ul .sidebar-group-li .icon { margin-left: 42px; } -.fileas-link, +.fileas-link, .categories-link { margin-left: 0px; } -.fileas-all, +.fileas-all, .categories-all { margin-left: 0px; } @@ -996,7 +984,7 @@ ul .sidebar-group-li .icon { padding-bottom: 5px; vertical-align: baseline; text-align: center; - text-shadow: -1px 0px 0px #bdbdbd; + text-shadow: -1px 0px 0px #bdbdbd; } #connect-desc { @@ -1022,12 +1010,12 @@ ul .sidebar-group-li .icon { margin-right: 5px; } -.birthday-today, +.birthday-today, .event-today { font-weight: bold; } -#birthday-wrapper, +#birthday-wrapper, #event-wrapper { margin-left: 15px; } @@ -1108,11 +1096,11 @@ ul .sidebar-group-li .icon { width: 99.9% !important; } -#profile-jot-submit-wrapper { +#profile-jot-submit-wrapper { margin-top: 30px; } -#jot-title, +#jot-title, #jot-category { margin: 0px; height: 20px; @@ -1134,7 +1122,7 @@ ul .sidebar-group-li .icon { #jot-category:-moz-placeholder { font-weight: normal; } - + #jot-title:hover, #jot-title:focus, #jot-category:hover, @@ -1150,7 +1138,7 @@ ul .sidebar-group-li .icon { margin: 15px 0 15px 0; } -#profile-jot-perms, +#profile-jot-perms, #profile-jot-submit { width: 60px; font-size: 12px; @@ -1219,8 +1207,8 @@ ul .sidebar-group-li .icon { -webkit-border-radius: 5px; } -#profile-jot-perms:hover, -#profile-jot-submit:hover, +#profile-jot-perms:hover, +#profile-jot-submit:hover, #jot-preview-link:hover { background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) ); background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); @@ -1235,8 +1223,8 @@ ul .sidebar-group-li .icon { -webkit-border-radius: 5px; } -#profile-jot-perms:active, -#profile-jot-submit:active, +#profile-jot-perms:active, +#profile-jot-submit:active, #jot-preview-link:active { position: relative; top: 1px; @@ -1245,11 +1233,11 @@ ul .sidebar-group-li .icon { #character-counter { position: relative; float: left; - right: 0px; + right: 0px; top: 0px; } #profile-rotator-wrapper { - float: right; + float: right; } .jot-tool { @@ -1278,7 +1266,7 @@ ul .sidebar-group-li .icon { margin: 5px; width: 95%; } - + #profile-jot-networks { margin: 0px 10%; border: 1px solid #eeeeee; @@ -1321,16 +1309,16 @@ ul .sidebar-group-li .icon { } #jot-public { - background-color: #555753; - color: #ff0000; - padding: 5px; + background-color: #555753; + color: #ff0000; + padding: 5px; float: left; } #acl-deny-text { - background-color: #555753; - color: #ccccce; - padding: 5px; + background-color: #555753; + color: #ccccce; + padding: 5px; float: left; } @@ -1400,7 +1388,7 @@ ul .sidebar-group-li .icon { .wall-item-outside-wrapper { max-width: 100%; - border-bottom: 1px solid #dedede; + border-bottom: 1px solid #dedede; margin-top: 10px; margin-bottom: 20px; padding-right: 10px; @@ -1445,7 +1433,7 @@ ul .sidebar-group-li .icon { box-shadow: 0 0 8px #BDBDBD; -moz-box-shadow: 0 0 8px #BDBDBD; -webkit-box-shadow: 0 0 8px #BDBDBD; - border-radius: 0px 0px 5px 5px; + border-radius: 0px 0px 5px 5px; -webkit-border-radius: 0px 0px 5px 5px; -moz-border-radius: 0px 0px 5px 5px; } @@ -1455,8 +1443,8 @@ ul .sidebar-group-li .icon { width: 100px; } -.wall-item-photo-wrapper { - width: 80px; +.wall-item-photo-wrapper { + width: 80px; height: 80px; padding: 0; position: relative; @@ -1469,7 +1457,7 @@ ul .sidebar-group-li .icon { -webkit-box-shadow: 0 0 8px #BDBDBD;*/ } -.wall-item-photo { +.wall-item-photo { border: 0px solid #7C7D7B; border-radius: 2px; -webkit-border-radius: 2px; @@ -1479,7 +1467,7 @@ ul .sidebar-group-li .icon { -webkit-box-shadow: 0 0 8px #BDBDBD;*/ } -.wall-item-tools { +.wall-item-tools { filter: alpha(opacity=60); opacity: 0.7; transition: all 0.25s ease-in-out; @@ -1494,12 +1482,12 @@ ul .sidebar-group-li .icon { .wall-item-tools:hover { filter: alpha(opacity=100); opacity: 1; - transition: all 0.25s ease-in-out; + transition: all 0.25s ease-in-out; -webkit-transition: all 0.25s ease-in-out; -moz-transition: all 0.25s ease-in-out; } -.wall-item-social { +.wall-item-social { filter: alpha(opacity=60); opacity: 0.7; transition: all 0.25s ease-in-out; @@ -1515,7 +1503,7 @@ ul .sidebar-group-li .icon { .wall-item-social:hover { filter: alpha(opacity=100); opacity: 1; - transition: all 0.25s ease-in-out; + transition: all 0.25s ease-in-out; -webkit-transition: all 0.25s ease-in-out; -moz-transition: all 0.25s ease-in-out; } @@ -1557,13 +1545,13 @@ ul .sidebar-group-li .icon { .star-item, .tag-item { - float: left; + float: left; } .wall-item-title { font-size: 1.2em; - font-weight: bold; - padding-top: 5px; + font-weight: bold; + padding-top: 5px; margin-left: 100px; } @@ -1574,8 +1562,8 @@ ul .sidebar-group-li .icon { max-width: 100%; } -.wall-item-body img { - max-width: 100%; +.wall-item-body img { + max-width: 100%; height: auto; border-radius: 0; } @@ -1584,8 +1572,8 @@ ul .sidebar-group-li .icon { font-size: 0.8em; } -.wall-item-lock-wrapper { - float: right; +.wall-item-lock-wrapper { + float: right; } .wall-item-dislike, @@ -1606,14 +1594,14 @@ ul .sidebar-group-li .icon { color: #898989; } -.wall-item-ago { - display: inline; - padding-left: 0px; +.wall-item-ago { + display: inline; + padding-left: 0px; color: #898989; } -.wall-item-wrapper-end { - clear:both; +.wall-item-wrapper-end { + clear:both; } .wall-item-location { @@ -1623,8 +1611,8 @@ ul .sidebar-group-li .icon { -o-text-overflow: ellipsis; } -.wall-item-location .icon { - float: left; +.wall-item-location .icon { + float: left; } .wall-item-location > a { @@ -1636,14 +1624,14 @@ ul .sidebar-group-li .icon { color: #898989; } -.wall-item-location .smalltext { - margin-left: 0px; - font-size: 0.9em; +.wall-item-location .smalltext { + margin-left: 0px; + font-size: 0.9em; display: block; } -.wall-item-location > br { - display: none; +.wall-item-location > br { + display: none; } .wall-item-conv a{ @@ -1659,16 +1647,16 @@ ul .sidebar-group-li .icon { width: 30px; z-index: 900; width: 30px; - height: 30px; + height: 30px; } -.wallwall .wwto img { - width: 30px!important; +.wallwall .wwto img { + width: 30px!important; height: 30px!important; } -.wallwall .wall-item-photo-end { - clear: both; +.wallwall .wall-item-photo-end { + clear: both; } .wall-item-arrowphoto-wrapper { @@ -1688,7 +1676,7 @@ ul .sidebar-group-li .icon { border-left: 1px solid #7C7D7B; border-bottom: 1px solid #7C7D7B; position: absolute; - left: 0px; + left: 0px; top: 101px; display: none; z-index: 10000; @@ -1710,17 +1698,17 @@ ul .sidebar-group-li .icon { -webkit-box-shadow: 0 0 8px #BDBDBD; } -.wall-item-photo-menu ul { - margin: 0px; - padding: 0px; +.wall-item-photo-menu ul { + margin: 0px; + padding: 0px; list-style: none; } -.wall-item-photo-menu li a { - white-space: nowrap; - display: block; - padding: 5px 2px; - color: #2e3436; +.wall-item-photo-menu li a { + white-space: nowrap; + display: block; + padding: 5px 2px; + color: #2e3436; } .wall-item-photo-menu li a:hover { @@ -1728,7 +1716,7 @@ ul .sidebar-group-li .icon { background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) ); background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color: #1873a2; + background-color: #1873a2; } .wall-item-container .wall-item-content .type-link img, @@ -1785,12 +1773,12 @@ blockquote.shared_content { } .icon.drop, -.icon.drophide { +.icon.drophide { float: left; } #item-delete-selected-end, -#item-delete-selected { +#item-delete-selected { overflow: auto; margin-top: 0px; float: right; @@ -1807,14 +1795,14 @@ code { background: #EEE; color: #444; padding: 10px; - margin-top: 10px; + margin-top: 10px; } /* ============ */ /* = Comments = */ /* ============ */ - + .ccollapse-wrapper { font-size: 0.9em; color: #898989; @@ -1835,7 +1823,7 @@ code { .collapsed-comments, .hide-comments, .hide-comments-outer, -.wall-item-outside-wrapper.comment { +.wall-item-outside-wrapper.comment { margin-left: 30px; margin-bottom: 20px; } @@ -1849,7 +1837,7 @@ code { } .wall-item-outside-wrapper.comment .wall-item-photo-wrapper { - width: 40px; + width: 40px; height: 40px; border-radius: 3px; -webkit-border-radius: 3px; @@ -1860,9 +1848,9 @@ code { top: 42px; background-position: 15px center; } - -.wall-item-outside-wrapper.comment .wall-item-info { - width: 60px; + +.wall-item-outside-wrapper.comment .wall-item-info { + width: 60px; } .wall-item-outside-wrapper.comment .wall-item-body { @@ -1872,8 +1860,8 @@ code { padding-left: 0px; } -.wall-item-outside-wrapper.comment .wall-item-author { - margin-left: 60px; +.wall-item-outside-wrapper.comment .wall-item-author { + margin-left: 60px; } .wall-item-outside-wrapper.comment .wall-item-photo-menu { @@ -1886,28 +1874,28 @@ code { } .comment-wwedit-wrapper, -.comment-edit-wrapper { +.comment-edit-wrapper { margin: 0px 0px 5px 0px; } .comment-wwedit-wrapper img, -.comment-edit-wrapper img { - width: 20px; +.comment-edit-wrapper img { + width: 20px; height: 20px; margin-top: 5px; } -.comment-edit-photo-link { - float: left; +.comment-edit-photo-link { + float: left; width: 30px; } -.comment-edit-text-empty { +.comment-edit-text-empty { width: 98%; max-width: 672px; height: 20px; color: #babdb6; - transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; -webkit-transition: all 0.5s ease-in-out; -moz-transition: all 0.5s ease-in-out; } @@ -1916,20 +1904,20 @@ code { color: #999999; } -.comment-edit-text-full { +.comment-edit-text-full { width: 98%; max-width: 672px; height: 6em; - transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; -webkit-transition: all 0.5s ease-in-out; -moz-transition: all 0.5s ease-in-out; } -.comment-edit-submit-wrapper { +.comment-edit-submit-wrapper { width: 98%; max-width: 672px; - margin-left: 20px; - text-align: left; + margin-left: 20px; + text-align: left; } .comment-edit-submit { @@ -1970,7 +1958,7 @@ code { border: 1px solid #cccccc; border-width: 1px 1px 1px 3px; padding-left: 5px; - margin-top: 10px; + margin-top: 10px; } /* =========== */ @@ -1990,16 +1978,16 @@ code { padding-bottom: 5px; font-size: 18px; } - -div[id$="wrapper"] { + +div[id$="wrapper"] { height: 100%; } - -div[id$="wrapper"] br { - clear: left; + +div[id$="wrapper"] br { + clear: left; } -#advanced-profile-with { +#advanced-profile-with { margin-left: 20px; } @@ -2042,15 +2030,15 @@ div[id$="wrapper"] br { } #profile-edit-links li a { - color: #efefef; + color: #efefef; } #profile-edit-links li:hover { - background-color: #1873a2; + background-color: #1873a2; } #profile-edit-links li:active { - background-color: #1873a2; + background-color: #1873a2; } #profile-edit-links-end { @@ -2066,12 +2054,12 @@ div[id$="wrapper"] br { position: absolute; } -#cropimage-wrapper { - float:left; +#cropimage-wrapper { + float:left; } -#crop-image-form { - clear:both; +#crop-image-form { + clear:both; } .profile-match-name { @@ -2188,18 +2176,18 @@ div[id$="wrapper"] br { } #photo-top-links:hover { - background-color: #1873a2; + background-color: #1873a2; } #photo-top-links:active { - background-color: #1873a2; + background-color: #1873a2; } -.photo-album-image-wrapper { +.photo-album-image-wrapper { float: left; margin: 0px 10px 10px 0px; padding-bottom: 30px; - position: relative; + position: relative; } .photo-top-image-wrapper { @@ -2219,25 +2207,25 @@ div[id$="wrapper"] br { overflow: hidden; } -#photo-photo { - max-width: 85%; - height: auto; +#photo-photo { + max-width: 85%; + height: auto; } -#photo-photo img { - max-width: 100% +#photo-photo img { + max-width: 100% } .photo-top-image-wrapper a:hover, #photo-photo a:hover, -.photo-album-image-wrapper a:hover { - border-bottom: 0px; +.photo-album-image-wrapper a:hover { + border-bottom: 0px; } .photo-top-photo { width: 180px; } -.photo-album-photo {} +.photo-album-photo {} .photo-top-album-name { position: absolute; @@ -2245,7 +2233,7 @@ div[id$="wrapper"] br { padding: 0px 5px; font-weight: bold; font-stretch: semi-expanded; -} +} .photo-top-album-name a { text-align: center; @@ -2262,7 +2250,7 @@ div[id$="wrapper"] br { #photo-photo { position: relative; - float: left; + float: left; } #photo-caption { @@ -2271,8 +2259,8 @@ div[id$="wrapper"] br { font-size: 1.1em; } -#photo-photo-end { - clear: both; +#photo-photo-end { + clear: both; } #photo-prev-link, @@ -2286,58 +2274,58 @@ div[id$="wrapper"] br { -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; background-position: center center; - background-repeat: no-repeat; + background-repeat: no-repeat; } -#photo-prev-link { - left: 0px; - top: 0px; - background-image: url('images/prev.png'); +#photo-prev-link { + left: 0px; + top: 0px; + background-image: url('images/prev.png'); } -#photo-next-link { - right: 0px; - top: 0px; +#photo-next-link { + right: 0px; + top: 0px; background-image: url('images/next.png'); } #photo-prev-link a, #photo-next-link a { - display: block; - width: 100%; + display: block; + width: 100%; height: 100%; overflow: hidden; - text-indent: -900000px; + text-indent: -900000px; } #photo-prev-link:hover, #photo-next-link:hover { opacity: 1; - transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; } #photo-next-link .icon, -#photo-prev-link .icon { +#photo-prev-link .icon { display: none; } #photos-upload-spacer, #photos-upload-new-wrapper, -#photos-upload-exist-wrapper { +#photos-upload-exist-wrapper { margin-bottom: 1em; } #photos-upload-existing-album-text, -#photos-upload-newalbum-div { +#photos-upload-newalbum-div { color: #909090; padding: 3px 0px; width: 300px; } #photos-upload-album-select, -#photos-upload-newalbum { +#photos-upload-newalbum { width: 400px; margin-bottom: 10px; } @@ -2365,8 +2353,8 @@ select, input { -webkit-border-radius: 3px; } -select[size], -select[multiple], +select[size], +select[multiple], select[size][multiple] { margin: 5px 0px 10px 0px; } @@ -2375,7 +2363,7 @@ select { -webkit-appearance: menulist; box-sizing: border-box; -webkit-box-align: center; - cursor: default; + cursor: default; } textarea, keygen { @@ -2388,7 +2376,7 @@ textarea, keygen { text-indent: 0px; text-shadow: none; display: inline-block; - text-align: -webkit-auto; + text-align: -webkit-auto; } input { @@ -2467,8 +2455,8 @@ input #photo_edit_form { /* = Messages = */ /* ============ */ -#prvmail-wrapper, -.mail-conv-detail, +#prvmail-wrapper, +.mail-conv-detail, .mail-list-detail { position: relative; width: 550px; @@ -2484,11 +2472,11 @@ input #photo_edit_form { -webkit-border-radius: 5px; } -#prvmail-wrapper:before, -#prvmail-wrapper:after, -.mail-conv-detail:before, -.mail-conv-detail:after, -.mail-list-detail:before, +#prvmail-wrapper:before, +#prvmail-wrapper:after, +.mail-conv-detail:before, +.mail-conv-detail:after, +.mail-list-detail:before, .mail-list-detail:after { position: absolute; width: 40%; @@ -2512,8 +2500,8 @@ input #photo_edit_form { -webkit-border-radius: 5px; } -#prvmail-wrapper:after, -.mail-conv-detail:after, +#prvmail-wrapper:after, +.mail-conv-detail:after, .mail-list-detail:after { left: auto; right: 12px; @@ -2534,10 +2522,10 @@ input #photo_edit_form { #prvmail-form input -#prvmail-subject { - width: 490px; - padding-left: 10px; - font-size: 1.1em; +#prvmail-subject { + width: 490px; + padding-left: 10px; + font-size: 1.1em; font-style: bold; } @@ -2554,11 +2542,11 @@ input #photo_edit_form { #prvmail-to-label {} #prvmail-message-label { - font-size: 1em; + font-size: 1em; } -#prvmail-submit-wrapper { - margin-top: 10px; +#prvmail-submit-wrapper { + margin-top: 10px; } #prvmail-submit { @@ -2568,7 +2556,7 @@ input #photo_edit_form { } #prvmail-upload { -margin-left: 0px; +margin-left: 0px; } #prvmail-submit-wrapper > div { @@ -2601,7 +2589,7 @@ margin-left: 0px; padding-top: 10px; border: 1px solid #7C7D7B; } - + .mail-list-sender-name { font-size: 1.1em; display: inline; @@ -2627,7 +2615,7 @@ margin-left: 0px; color: #626262; } -.mail-list-delete-wrapper { +.mail-list-delete-wrapper { float: right; } @@ -2642,7 +2630,7 @@ margin-left: 0px; .mail-conv-sender { float: left; - margin: 0px 5px 5px 0px; + margin: 0px 5px 5px 0px; } .mail-conv-sender-photo { @@ -2651,18 +2639,18 @@ margin-left: 0px; border-radius: 3px 3px 3px 3px; } -.mail-conv-sender-name { - float: left; - font-style: bold; +.mail-conv-sender-name { + float: left; + font-style: bold; } -.mail-conv-date { - float: right; +.mail-conv-date { + float: right; } -.mail-conv-subject { - clear: right; - font-weight: bold; +.mail-conv-subject { + clear: right; + font-weight: bold; font-size: 1.2em; } @@ -2681,15 +2669,15 @@ margin-left: 0px; border: 1px solid #7C7D7B; } -.mail-conv-break { - display: none; +.mail-conv-break { + display: none; border: none; } -.mail-conv-delete-wrapper { - padding-top: 10px; - width: 510px; - text-align: right; +.mail-conv-delete-wrapper { + padding-top: 10px; + width: 510px; + text-align: right; } #prvmail-subject { @@ -2787,14 +2775,14 @@ margin-left: 0px; top: 20px; } -.contact-entry-edit-links { - position: absolute; - top: 60px; +.contact-entry-edit-links { + position: absolute; + top: 60px; } -#contacts-show-hide-link { - margin-bottom: 20px; - margin-top: 10px; +#contacts-show-hide-link { + margin-bottom: 20px; + margin-top: 10px; font-weight: bold; } @@ -2838,7 +2826,7 @@ margin-left: 0px; height: 80px; } -.contact-entry-edit-links .icon { +.contact-entry-edit-links .icon { border: 1px solid #babdb6; border-radius: 3px; -webkit-border-radius: 3px; @@ -2846,9 +2834,9 @@ margin-left: 0px; background-color: #ffffff; } -#contact-edit-banner-name { - font-size: 1.5em; - margin-left: 30px; +#contact-edit-banner-name { + font-size: 1.5em; + margin-left: 30px; } #contact-edit-update-now { @@ -2916,16 +2904,16 @@ margin-left: 0px; .contact-photo-menu-button { position: absolute; background-image: url("images/photo-menu.jpg"); - background-position: top left; + background-position: top left; background-repeat: no-repeat; - margin: 10px 0 0 0; + margin: 10px 0 0 0; padding: 0px; width: 16px; height: 16px; top: 64px; left:0px; overflow: hidden; text-indent: 40px; - display: none; + display: none; } .contact-photo-menu { @@ -2933,7 +2921,7 @@ margin-left: 0px; border: 1px solid #ddd; background: #f1f1f1; position: absolute; - left: 0px; + left: 0px; top: 90px; display: none; z-index: 10000; @@ -2942,17 +2930,17 @@ margin-left: 0px; -webkit-box-shadow: 3px 3px 5px #888; } -.contact-photo-menu ul { - margin: 0px; - padding: 0px; - list-style: none; +.contact-photo-menu ul { + margin: 0px; + padding: 0px; + list-style: none; } -.contact-photo-menu li a { - display: block; - padding: 3px; - color: #626262; - font-size: 1em; +.contact-photo-menu li a { + display: block; + padding: 3px; + color: #626262; + font-size: 1em; } .contact-photo-menu li a:hover { @@ -3023,7 +3011,7 @@ margin-left: 0px; background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) ); background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color: #1873a2; + background-color: #1873a2; border: 1px solid #7C7D7B; box-shadow: 0 0 8px #BDBDBD; -moz-box-shadow: 0 0 8px #BDBDBD; @@ -3040,19 +3028,19 @@ margin-left: 0px; #side-match-link:active { background-color: #1873a2; position: relative; - top: 1px; + top: 1px; } #side-invite-link a, #side-random-profile-link a, #side-suggest-link a, #side-match-link a { - color: #efefef; + color: #efefef; } #invite-message, -#invite-recipients, +#invite-recipients, #invite-recipient-text { padding: 10px; } @@ -3072,7 +3060,7 @@ margin-left: 0px; #side-follow-wrapper label{ font-size: 1.1em; - font-variant: normal; + font-variant: normal; } #contact-suggest { @@ -3094,7 +3082,7 @@ margin-left: 0px; padding: 5px 10px 5px 10px; color: #efefef; font-size: 1.2em; - text-align: center; + text-align: center; } #contact-suggest:hover { @@ -3102,13 +3090,13 @@ margin-left: 0px; background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) ); background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color: #1873a2; + background-color: #1873a2; } #contact-suggest:active { background-color: #1873a2; position: relative; - top: 1px; + top: 1px; } #contact-suggest a { @@ -3131,7 +3119,7 @@ margin-left: 0px; /* = Register, Settings, Profile Forms = */ /* ===================================== */ -#id_openid_url, +#id_openid_url, .openid input { background: url(images/login-bg.gif) no-repeat; background-position: 0 50%; @@ -3235,7 +3223,7 @@ margin-left: 0px; position: relative; top: 1px; } - + #settings-nickname-desc { width: 80%; background-color: #efefef; @@ -3251,7 +3239,7 @@ margin-left: 0px; clear: both; } -#profile-edit-form div { +#profile-edit-form div { margin-bottom: 5px; } @@ -3262,7 +3250,7 @@ margin-left: 0px; #register-form label, #profile-edit-form label { - width: 575px; + width: 575px; float: right; margin-right: 155px; } @@ -3275,20 +3263,20 @@ margin-left: 0px; .settings-submit, .settings-submit-wrapper, -.profile-edit-submit-wrapper { +.profile-edit-submit-wrapper { margin: 30px 0px; } .profile-listing, -.profile-listing-end { - float: left; - clear: both; +.profile-listing-end { + float: left; + clear: both; margin: 20px 20px 0px 0px; } -#register-sitename { - display: inline; +#register-sitename { + display: inline; font-weight: bold; } @@ -3296,17 +3284,17 @@ margin-left: 0px; margin-top: 10px; } -#label-register-name, -#label-register-email, -#label-register-nickname, +#label-register-name, +#label-register-email, +#label-register-nickname, #label-register-openid { float: left; width: 350px; margin-top: 10px; } -#register-name, -#register-email, +#register-name, +#register-email, #register-nickname { float: left; margin-top: 10px; @@ -3323,10 +3311,10 @@ margin-left: 0px; margin-bottom: 25px; } -#register-name-end, -#register-email-end, -#register-nickname-end, -#register-submit-end, +#register-name-end, +#register-email-end, +#register-nickname-end, +#register-submit-end, #register-openid-end { clear: both; } @@ -3376,14 +3364,14 @@ margin-left: 0px; background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) ); background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color: #1873a2; + background-color: #1873a2; } .group-delete-wrapper:active { background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) ); background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color: #1873a2; + background-color: #1873a2; } .group-delete-wrapper a { @@ -3391,8 +3379,8 @@ margin-left: 0px; font-size: 0.9em; } -#group-edit-desc { - margin: 10px 0xp; +#group-edit-desc { + margin: 10px 0xp; } #group-new-text { @@ -3402,7 +3390,7 @@ margin-left: 0px; #group-members, #prof-members { width: 83%; - height: 200px; + height: 200px; overflow: auto; border: none; background-color: #f0edf0; @@ -3413,10 +3401,10 @@ margin-left: 0px; } #group-all-contacts, -#prof-all-contacts { +#prof-all-contacts { width: 83%; height: 200px; - overflow: auto; + overflow: auto; border: 1px solid #ccc; background-color: #f0edf0; padding: 10px; @@ -3432,7 +3420,7 @@ margin-left: 0px; } #group-separator, -#prof-separator { +#prof-separator { display: none; } @@ -3442,7 +3430,7 @@ margin-left: 0px; #events-reminder {} -.clear { +.clear { clear: both; margin-top: 10px; } @@ -3466,7 +3454,7 @@ margin-left: 0px; -moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); } -.vevent:before, +.vevent:before, .vevent:after { position: absolute; width: 40%; @@ -3512,7 +3500,7 @@ margin-left: 0px; text-align: center; } -.vevent .event-start, +.vevent .event-start, .vevent .event-end { margin-left: 20px; margin-right: 20px; @@ -3572,13 +3560,13 @@ margin-left: 0px; vertical-align: middle; } -.event-start, +.event-start, .event-end { margin-left: 10px; width: 330px; } -.event-start .dtstart, +.event-start .dtstart, .event-end .dtend { float: right; } @@ -3589,7 +3577,7 @@ margin-left: 0px; font-stretch: condensed; } -.prevcal, +.prevcal, .nextcal { float: left; margin-left: 32px; @@ -3640,7 +3628,7 @@ margin-left: 0px; } .calendar th { - font-size: 16px; + font-size: 16px; } .today { @@ -3649,16 +3637,16 @@ margin-left: 0px; background-color: #1873a2; color: #ffffff; } - -#event-start-text, + +#event-start-text, #event-finish-text { margin-top: 10px; margin-bottom: 5px; } -#event-nofinish-checkbox, -#event-nofinish-text, -#event-adjust-checkbox, +#event-nofinish-checkbox, +#event-nofinish-text, +#event-adjust-checkbox, #event-adjust-text, #event-share-checkbox { float: left; @@ -3668,13 +3656,13 @@ margin-left: 0px; margin-bottom: 10px; } -#event-nofinish-break, +#event-nofinish-break, #event-adjust-break, #event-share-break { clear: both; } -#event-desc-text, +#event-desc-text, #event-location-text { margin-top: 10px; margin-bottom: 5px; @@ -3700,7 +3688,7 @@ margin-left: 0px; .directory-name { font-size: 1em; - width: 150px; + width: 150px; } /* ========= */ @@ -3758,9 +3746,9 @@ margin-left: 0px; clear:left; } -#adminpage +#adminpage #pluginslist { - margin: 0px; + margin: 0px; padding: 0px; } @@ -3785,30 +3773,30 @@ margin-left: 0px; } #adminpage table { - width: 100%; - border-bottom: 1p solid #000000; + width: 100%; + border-bottom: 1p solid #000000; margin: 5px 0px; } -#adminpage table th { +#adminpage table th { text-align: left; } -#adminpage td .icon { +#adminpage td .icon { float: left; } -#adminpage table#users img { - width: 16px; - height: 16px; +#adminpage table#users img { + width: 16px; + height: 16px; } -#adminpage table tr:hover { - background-color: #eeeeee; +#adminpage table tr:hover { + background-color: #eeeeee; } -#adminpage .selectall { - text-align: right; +#adminpage .selectall { + text-align: right; } /* =============== */ @@ -3852,16 +3840,16 @@ margin-left: 0px; -webkit-border-radius: 5px; } -.field password { +.field password { height: 100px; - margin-left: 150px; + margin-left: 150px; } .field_help { display: block; margin-left: 0px; margin-bottom: 10px; - color: #666666; + color: #666666; } .field .onoff { @@ -3895,8 +3883,8 @@ margin-left: 0px; text-align: left; } -.field .radio .field_help { - margin-left: 0px; +.field .radio .field_help { + margin-left: 0px; } /* ========= */ @@ -3925,16 +3913,16 @@ margin-left: 0px; .icon { margin-left: 5px; margin-right: 5px; - display: block; - width: 20px; + display: block; + width: 20px; height: 20px; background-image: url("images/icons.png"); } -.starred { +.starred { background-image: url("images/star.png"); repeat: no-repeat; } -.unstarred { +.unstarred { background-image: url("images/premium.png"); repeat: no-repeat; } @@ -3946,7 +3934,7 @@ margin-left: 0px; .border { border: 1px solid #c1c1c1; - border-radius: 3px; + border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; } @@ -4015,9 +4003,9 @@ margin-left: 0px; /* = Footer = */ /* ========== */ -.cc-license { - margin-top: 100px; - font-size: 0.7em; +.cc-license { + margin-top: 100px; + font-size: 0.7em; } footer { display: block; margin: 50px 20%; clear: both; } @@ -4137,7 +4125,7 @@ tools { overflow: hidden; } -.acl-list-item a { +.acl-list-item a { font-size: 10px; display: block; float: left; @@ -4269,21 +4257,21 @@ ul.menu-popup { -webkit-box-shadow: 5px 5px 10px #242424; } -#nav-notifications-menu .contactname { - font-weight: bold; - font-size: 0.9em; +#nav-notifications-menu .contactname { + font-weight: bold; + font-size: 0.9em; } -#nav-notifications-menu img { - float: left; - margin-right: 5px; +#nav-notifications-menu img { + float: left; + margin-right: 5px; } -#nav-notifications-menu .notif-when { - font-size: 0.8em; - display: block; +#nav-notifications-menu .notif-when { + font-size: 0.8em; + display: block; } - + #nav-notifications-menu li { padding: 7px 0px 7px 10px; word-wrap: normal; @@ -4341,7 +4329,7 @@ ul.menu-popup { } .acpopupitem { - color: #2e3436; + color: #2e3436; padding: 4px; clear:left; } @@ -4355,7 +4343,7 @@ ul.menu-popup { background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) ); background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color: #1873a2; + background-color: #1873a2; order-bottom: none; } @@ -4449,20 +4437,20 @@ div.wall-item-content-wrapper.shiny { } /* from default */ -#jot-perms-icon, +#jot-perms-icon, #profile-location, #profile-nolocation, -#profile-youtube, -#profile-video, +#profile-youtube, +#profile-video, #profile-audio, #profile-link, -#profile-title, +#profile-title, #wall-image-upload, #wall-file-upload, #profile-upload-wrapper, #wall-image-upload-div, #wall-file-upload-div, -.hover, +.hover, .focus { cursor: pointer; } @@ -4472,15 +4460,15 @@ hr.line-dots { border: medium none; } -.body-tag, -.filesavetags, +.body-tag, +.filesavetags, .categorytags { opacity: 0.5; filter:alpha(opacity=50); } -.body-tag:hover, -.filesavetags:hover, +.body-tag:hover, +.filesavetags:hover, .categorytags:hover { opacity: 1.0 !important; filter:alpha(opacity=100) !important; @@ -4493,7 +4481,7 @@ hr.line-dots { margin-right: 10px; } -.item-select:hover, +.item-select:hover, .checkeditem { opacity: 1; filter:alpha(opacity=100); @@ -4523,10 +4511,10 @@ hr.line-dots { color: #888888; } -.location, -.location-label, -.gender-label, -.marital-label, +.location, +.location-label, +.gender-label, +.marital-label, .homepage-label { float: left; text-align: left; @@ -4534,9 +4522,9 @@ hr.line-dots { line-height: 0.6em; } -.adr, -.x-gender, -.marital-text, +.adr, +.x-gender, +.marital-text, .homepage-url { float: left; display: block; @@ -4574,8 +4562,8 @@ div #datebrowse-sidebar.widget { /* Fakelink */ -.fakelink, -.fakelink:visited, +.fakelink, +.fakelink:visited, .fakelink:link { color: #1873a2; cursor: pointer; diff --git a/view/theme/smoothly/templates/lang_selector.tpl b/view/theme/smoothly/templates/lang_selector.tpl deleted file mode 100644 index d9a90e7b83..0000000000 --- a/view/theme/smoothly/templates/lang_selector.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
- diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 5468061acd..fc81d3e1e5 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -1,7 +1,7 @@ /* style.css TestBubble - + Created by Anne Walk and Devlon Duthie on 2011-09-24. Based loosely on the Dipsy theme. */ @@ -25,7 +25,7 @@ body { font-family: freesans,helvetica,arial,clean,sans-serif; font-size: 15px; color: #626262; - width: 100%; + width: 100%; } img { border: 0 none; max-width: 550px; } @@ -74,7 +74,7 @@ input[type=text] { margin: 0px; -webkit-border-radius: 3px 3px 3px 3px; -moz-border-radius: 3px 3px 3px 3px; - border-radius: 3px 3px 3px 3px; + border-radius: 3px 3px 3px 3px; } input[type=submit] { @@ -118,7 +118,7 @@ section { float: left; margin-left: 8%; padding-top: 50px; - width: 50%; + width: 50%; margin: 20px 0px 30px 10%; font-size: 0.9em; line-height: 1.2em; @@ -130,7 +130,7 @@ section { -webkit-box-shadow: 3px 3px 6px #959494; box-shadow: 3px 3px 6px #959494; background-color: #efefef; - padding: 10px; + padding: 10px; } .mframe { @@ -160,7 +160,7 @@ section { -webkit-border-radius:5px; border-radius:5px; color:#efefef; - text-align: center; + text-align: center; } .button:hover { @@ -169,7 +169,7 @@ section { background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); background-color:#b20202; - color: #efefef; + color: #efefef; } .button:active { @@ -197,7 +197,7 @@ section { #login-password-wrapper { vertical-align: middle; - margin: auto; + margin: auto; } #login-extra-links { @@ -210,7 +210,7 @@ section { margin: 10px; padding: 5px 0px 5px 0px; text-align: center; - margin-right: 20px; + margin-right: 20px; } #login-extra-filler { @@ -282,7 +282,7 @@ nav #banner { position: absolute; margin-left: 10px; margin-top: 5px; - padding-bottom:5px; + padding-bottom:5px; } nav #banner #logo-text a { display: hidden; @@ -292,7 +292,7 @@ nav #banner #logo-text a { } nav #user-menu { - display: block; + display: block; width: 250px; float: right; margin-right:20%; @@ -310,7 +310,7 @@ nav #user-menu { border: 1px solid #9A9A9A; color:#efefef; text-decoration:none; - text-align: center; + text-align: center; } nav #user-menu-label::after { @@ -341,11 +341,11 @@ ul#user-menu-popup { border: 1px solid #9a9a9a; border-top: none; -webkit-border-radius: 0px 0px 5px 5px; - -moz-border-radius: 0px 0px 5px 5px; + -moz-border-radius: 0px 0px 5px 5px; border-radius: 0px 0px 5px 5px; -moz-box-shadow: 5px 5px 10px #242424; -webkit-box-shadow: 5px 5px 10px #242424; - box-shadow: 5px 5px 10px #242424; + box-shadow: 5px 5px 10px #242424; z-index: 10000; } @@ -373,7 +373,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in .nav-ajax-update { width: 44px; height: 32px; - background: transparent url('notifications.png') 0px 0px no-repeat; + background: transparent url('notifications.png') 0px 0px no-repeat; color: #efefef; font-weight: bold; font-size: 0.8em; @@ -388,30 +388,19 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in #intro-update { background-position: 0px -84px; } #home-update { background-position: 0px 0px; } -#lang-select-icon { - cursor: pointer; - position: absolute; - left: 5px; - top: 5px; -} -#language-selector { - position: absolute; - top: 0; - left: 16px; -} /* =================== */ /* = System Messages = */ /* =================== */ #sysmsg_info, #sysmsg { - position:fixed; - bottom: 0px; right:20%; + position:fixed; + bottom: 0px; right:20%; -moz-box-shadow: 7px 7px 12px #434343; -webkit-box-shadow: 7px75px 12px #434343; box-shadow: 7px 7px 10px #434343; - padding: 10px; + padding: 10px; background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); @@ -421,7 +410,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in border-radius: 5px 5px 0px 0px; border: 1px solid #da2c2c; border-bottom:0px; - padding-bottom: 50px; + padding-bottom: 50px; z-index: 1000; color: #efefef; font-style: bold; @@ -479,7 +468,7 @@ aside a{ border: 1px solid #dddddd; -moz-box-shadow: 3px 3px 4px #959494; -webkit-box-shadow: 3px 3px 4px #959494; - box-shadow: 3px 3px 4px #959494; + box-shadow: 3px 3px 4px #959494; } aside h4 { font-size: 1.3em; } @@ -560,7 +549,7 @@ h3#search:before { margin-bottom: 10px; -webkit-border-radius: 5px 5px 5px 5px; -moz-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; } #group-sidebar { @@ -700,7 +689,7 @@ ul .sidebar-group-li .icon{ padding-bottom: 5px; vertical-align: baseline; text-align: center; - text-shadow:-1px 0px 0px #bdbdbd; + text-shadow:-1px 0px 0px #bdbdbd; } #group-sidebar h3:before{ @@ -751,7 +740,7 @@ ul .sidebar-group-li .icon{ } .contact-block-textdiv { width: 150px; height: 34px; float: left; } -#contact-block-end { clear: both; } +#contact-block-end { clear: both; } /* ======= */ /* = Jot = */ @@ -759,7 +748,7 @@ ul .sidebar-group-li .icon{ #profile-jot-text_tbl { margin-bottom: 10px; } #profile-jot-text_ifr { width: 99.9%!important } -#profile-jot-submit-wrapper { +#profile-jot-submit-wrapper { } @@ -774,11 +763,11 @@ ul .sidebar-group-li .icon{ #jot-title::-webkit-input-placeholder{font-weight: normal;} #jot-title:-moz-placeholder{font-weight: normal;} - - + + #jot-title:hover, #jot-title:focus { - border: 1px solid #cccccc; + border: 1px solid #cccccc; } .preview { @@ -838,7 +827,7 @@ ul .sidebar-group-li .icon{ position: absolute: right: 100px; top:100px; } #profile-rotator-wrapper { - float: right; + float: right; } .jot-tool { @@ -855,7 +844,7 @@ ul .sidebar-group-li .icon{ } #profile-jot-email-label { background-color: #555753; color: #ccccce; padding: 5px;} #profile-jot-email { margin: 5px; width: 98%; } - + #profile-jot-networks { margin: 0px 10%; border: 1px solid #eeeeee; @@ -928,7 +917,7 @@ profile-jot-banner-wrapper { .wall-item-outside-wrapper { max-width: 93%; - border-bottom: 1px solid #dedede; + border-bottom: 1px solid #dedede; margin-top: 20px; padding-right: 10px; padding-left: 12px; @@ -944,27 +933,27 @@ profile-jot-banner-wrapper { background: #eeeeee url("menu-user-pin.png") no-repeat 75px center; position: absolute; overflow: hidden; - height: 20px; width: 90px; + height: 20px; width: 90px; top: 85px; left: -1px; -webkit-border-radius: 0px 0px 5px 5px; -moz-border-radius: 0px 0px 5px 5px; - border-radius: 0px 0px 5px 5px; + border-radius: 0px 0px 5px 5px; } .wall-item-info { float: left; width: 140px; } -.wall-item-photo-wrapper { - width: 80px; height: 80px; +.wall-item-photo-wrapper { + width: 80px; height: 80px; position: relative; } -.wall-item-tools { +.wall-item-tools { filter: alpha(opacity=60); opacity: 0.7; -webkit-transition: all 0.25s ease-in-out; -moz-transition: all 0.25s ease-in-out; -o-transition: all 0.25s ease-in-out; -ms-transition: all 0.25s ease-in-out; - transition: all 0.25s ease-in-out; + transition: all 0.25s ease-in-out; margin-left: 140px; margin-top: 10px; padding-bottom: 6px; @@ -977,7 +966,7 @@ profile-jot-banner-wrapper { -moz-transition: all 0.25s ease-in-out; -o-transition: all 0.25s ease-in-out; -ms-transition: all 0.25s ease-in-out; - transition: all 0.25s ease-in-out; + transition: all 0.25s ease-in-out; margin-left: 140px; } @@ -1014,12 +1003,12 @@ profile-jot-banner-wrapper { .star-item { margin-left: 5px; margin-right: 2px; - float: left; + float: left; } .tag-item { margin-left: 5px; margin-right: 2px; - float: left; + float: left; } .wall-item-title { font-size: 1.2em; font-weight: bold;} .wall-item-body { @@ -1048,7 +1037,7 @@ profile-jot-banner-wrapper { color: #898989; } -.wall-item-ago { display: inline; padding-left: 10px; color: #898989;} +.wall-item-ago { display: inline; padding-left: 10px; color: #898989;} .wall-item-wrapper-end { clear:both; } .wall-item-location { margin-top:5px; @@ -1083,7 +1072,7 @@ profile-jot-banner-wrapper { width: 30px; z-index: 900; width: 30px; - height: 30px; + height: 30px; } .wallwall .wwto img { width: 30px!important; height: 30px!important;} @@ -1140,7 +1129,7 @@ profile-jot-banner-wrapper { background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); - background-color:#b20202; + background-color:#b20202; order-bottom: none; } @@ -1152,14 +1141,14 @@ profile-jot-banner-wrapper { /* ============ */ /* = Comments = */ /* ============ */ - + .ccollapse-wrapper { font-size: 0.9em; color: #898989; margin-left: 60px; /* font-variant:small-caps; */ } - + .wall-item-outside-wrapper.comment { margin-left: 70px; } .wall-item-outside-wrapper.comment .wall-item-photo { width: 40px!important; @@ -1197,7 +1186,7 @@ profile-jot-banner-wrapper { .comment-wwedit-wrapper img, .comment-edit-wrapper img { width: 20px; height: 20px; } .comment-edit-photo-link { float: left; width: 40px;} -.comment-edit-text-empty { +.comment-edit-text-empty { width: 80%; height: 20px; border: 0px; @@ -1206,7 +1195,7 @@ profile-jot-banner-wrapper { -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; + transition: all 0.5s ease-in-out; } .comment-edit-text-empty:hover { color: #999999;} .comment-edit-text-full { width: 80%; height: 6em; @@ -1214,7 +1203,7 @@ profile-jot-banner-wrapper { -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; + transition: all 0.5s ease-in-out; } .comment-edit-submit-wrapper { width: 80%; margin-left: 40px; text-align: right; } .comment-edit-submit { @@ -1247,7 +1236,7 @@ profile-jot-banner-wrapper { border: 1px solid #cccccc; border-width: 1px 1px 1px 10px; padding-left: 10px; - margin-top: 20px; + margin-top: 20px; } /* =========== */ @@ -1268,8 +1257,8 @@ profile-jot-banner-wrapper { font-size: 18px; /* font-variant:small-caps; */ } - -div[id$="wrapper"] { height: 100%;} + +div[id$="wrapper"] { height: 100%;} div[id$="wrapper"] br { clear: left; } #advanced-profile-with { margin-left: 20px;} @@ -1316,19 +1305,19 @@ div[id$="wrapper"] br { clear: left; } font-style: bold; -webkit-border-radius: 5px 5px 5px 5px; -moz-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; } #profile-edit-links li a { - color: #efefef; + color: #efefef; } #profile-edit-links li:hover { - background-color: #b20202; + background-color: #b20202; } #profile-edit-links li:active { - background-color: #b20202; + background-color: #b20202; } .profile-edit-side-div { @@ -1360,7 +1349,7 @@ div[id$="wrapper"] br { clear: left; } -moz-box-shadow: 3px 3px 4px #959494; -webkit-box-shadow: 3px 3px 4px #959494; box-shadow: 3px 3px 4px #959494; - clear: both; + clear: both; } .profile-match-end { @@ -1406,25 +1395,25 @@ div[id$="wrapper"] br { clear: left; } font-style: bold; -webkit-border-radius: 5px 5px 5px 5px; -moz-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; } #photo-top-links a { color: #efefef; } #photo-top-links:hover { - background-color: #b20202; + background-color: #b20202; } #photo-top-links:active { - background-color: #b20202; + background-color: #b20202; } -.photo-album-image-wrapper { +.photo-album-image-wrapper { float: left; margin: 0px 10px 10px 0px; padding-bottom: 30px; - position:relative; + position:relative; } .photo-top-image-wrapper { @@ -1449,12 +1438,12 @@ div[id$="wrapper"] br { clear: left; } .photo-top-image-wrapper a:hover, #photo-photo a:hover, -.photo-album-image-wrapper a:hover { - border-bottom: 0px; +.photo-album-image-wrapper a:hover { + border-bottom: 0px; } .photo-top-photo {} -.photo-album-photo {} +.photo-album-photo {} .photo-top-album-name { position: absolute; @@ -1463,7 +1452,7 @@ div[id$="wrapper"] br { clear: left; } font-weight: bold; font-stretch:semi-expanded; /* font-variant:small-caps; */ -} +} .photo-top-album-name a{ text-align: center; @@ -1481,7 +1470,7 @@ div[id$="wrapper"] br { clear: left; } #photo-photo{ position: relative; - float:left; + float:left; } #photo-caption { @@ -1505,7 +1494,7 @@ div[id$="wrapper"] br { clear: left; } -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; background-position: center center; - background-repeat: no-repeat; + background-repeat: no-repeat; } #photo-prev-link { left:0px; top:0px; background-image: url('prev.png'); } @@ -1514,7 +1503,7 @@ div[id$="wrapper"] br { clear: left; } #photo-next-link a{ display: block; width: 100%; height: 100%; overflow: hidden; - text-indent: -900000px; + text-indent: -900000px; } #photo-prev-link:hover, @@ -1524,7 +1513,7 @@ div[id$="wrapper"] br { clear: left; } -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: all 0.2s ease-in-out; } #photo-next-link .icon, @@ -1534,7 +1523,7 @@ div[id$="wrapper"] br { clear: left; } #photos-upload-new-wrapper, #photos-upload-exist-wrapper { margin-bottom: 1em; } #photos-upload-existing-album-text, -#photos-upload-newalbum-div { +#photos-upload-newalbum-div { background-color: #fff; color: #909090; font-size: 1.2em; @@ -1560,7 +1549,7 @@ select, input { padding: 2px; -webkit-border-radius: 3px 3px 3px 3px; -moz-border-radius: 3px 3px 3px 3px; - border-radius: 3px 3px 3px 3px; + border-radius: 3px 3px 3px 3px; } select[size], select[multiple], select[size][multiple] { @@ -1571,7 +1560,7 @@ select { -webkit-appearance: menulist; box-sizing: border-box; -webkit-box-align: center; - cursor: default; + cursor: default; } keygen, select { @@ -1587,7 +1576,7 @@ input, textarea, keygen { text-indent: 0px; text-shadow: none; display: inline-block; - text-align: -webkit-auto; + text-align: -webkit-auto; } .qq-upload-button { @@ -1607,7 +1596,7 @@ input, textarea, keygen { font-style: bold; -webkit-border-radius: 5px 5px 5px 5px; -moz-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; } #album-edit-link a { @@ -1724,7 +1713,7 @@ input#photo_edit_form { #prvmail-message-label { /* font-variant:small-caps; */ - font-size: 1em; + font-size: 1em; } #prvmail-submit-wrapper { margin-top: 10px; } @@ -1735,7 +1724,7 @@ input#photo_edit_form { } #prvmail-upload { -margin-left: 0px; +margin-left: 0px; } #prvmail-submit-wrapper > div { @@ -1765,7 +1754,7 @@ margin-left: 0px; padding-top:10px; border: 1px solid #dddddd; } - + .mail-list-sender-name { font-size: 1.1em; display: inline; @@ -1912,11 +1901,11 @@ margin-left: 0px; position: relative; } -.contact-entry-edit-links .icon { +.contact-entry-edit-links .icon { border: 1px solid #babdb6; -webkit-border-radius: 3px; -moz-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; background-color: #ffffff; } @@ -1967,7 +1956,7 @@ margin-left: 0px; .contact-photo-menu-button { position: absolute; background-image: url("photo-menu.jpg"); - background-position: top left; + background-position: top left; background-repeat: no-repeat; margin: 0px; padding: 0px; width: 16px; @@ -1975,7 +1964,7 @@ margin-left: 0px; top: 64px; left:0px; overflow: hidden; text-indent: 40px; - display: none; + display: none; } .contact-photo-menu { @@ -2088,7 +2077,7 @@ margin-left: 0px; padding: 5px 10px 5px 10px; color: #efefef; font-size: 1.2em; - text-align: center; + text-align: center; } #side-invite-link:hover { @@ -2096,18 +2085,18 @@ margin-left: 0px; background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); - background-color:#b20202; + background-color:#b20202; } #side-invite-link:active { background-color: #b20202; position:relative; - top:1px; + top:1px; } #side-invite-link a { - color: #efefef; + color: #efefef; } #side-suggest-link { @@ -2128,7 +2117,7 @@ margin-left: 0px; padding: 5px 10px 5px 10px; color: #efefef; font-size: 1.2em; - text-align: center; + text-align: center; } #side-suggest-link:hover { @@ -2136,18 +2125,18 @@ margin-left: 0px; background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); - background-color:#b20202; + background-color:#b20202; } #side-suggest-link:active { background-color: #b20202; position:relative; - top:1px; + top:1px; } #side-suggest-link a { - color: #efefef; + color: #efefef; } #invite-message, #invite-recipients, #invite-recipient-text { @@ -2169,7 +2158,7 @@ margin-left: 0px; #side-follow-wrapper label{ font-size: 1.1em; - font-variant: normal; + font-variant: normal; } #contact-suggest { @@ -2191,7 +2180,7 @@ margin-left: 0px; padding: 5px 10px 5px 10px; color: #efefef; font-size: 1.2em; - text-align: center; + text-align: center; } #contact-suggest:hover { @@ -2199,13 +2188,13 @@ margin-left: 0px; background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); - background-color:#b20202; + background-color:#b20202; } #contact-suggest:active { background-color: #b20202; position:relative; - top:1px; + top:1px; } #contact-suggest a { @@ -2306,7 +2295,7 @@ margin-left: 0px; } #settings-default-perms .fakelink { - color: #efefef; + color: #efefef; } #settings-default-perms:hover { @@ -2326,7 +2315,7 @@ margin-left: 0px; position:relative; top:1px; } - + #settings-nickname-desc { width: 80%; background-color: #efefef; @@ -2341,7 +2330,7 @@ margin-left: 0px; clear: both; } -#profile-edit-form div { +#profile-edit-form div { margin-bottom: 5px; } @@ -2371,7 +2360,7 @@ margin-left: 0px; #register-sitename { display: inline; font-weight: bold;} - + /* ===================== */ /* = Contacts Selector = */ /* ===================== */ @@ -2412,14 +2401,14 @@ margin-left: 0px; background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); - background-color:#b20202; + background-color:#b20202; } .group-delete-wrapper:active { background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); - background-color:#b20202; + background-color:#b20202; } .group-delete-wrapper a { @@ -2432,7 +2421,7 @@ margin-left: 0px; #group-members, #prof-members { width: 83%; - height: 200px; + height: 200px; overflow: auto; border: none; background-color: #f0edf0; @@ -2443,10 +2432,10 @@ margin-left: 0px; } #group-all-contacts, -#prof-all-contacts { +#prof-all-contacts { width: 83%; height: 200px; - overflow: auto; + overflow: auto; border: 1px solid #ccc; background-color: #f0edf0; padding: 10px; @@ -2467,7 +2456,7 @@ margin-left: 0px; /* ========== */ /* = Events = */ /* ========== */ - + .clear { clear: both; } .eventcal { float: left; @@ -2531,7 +2520,7 @@ margin-left: 0px; font-size: 1em; font-style: oblique; text-align: center; - + } .vevent .event-start, .vevent .event-end { @@ -2629,7 +2618,7 @@ margin-left: 0px; margin-bottom: 10px; -moz-box-shadow: 5px 5px 8px #959494; -webkit-box-shadow: 5px 5px 8px #959494; - box-shadow: 5px 5px 8px #959494; + box-shadow: 5px 5px 8px #959494; } .calendar caption{ @@ -2665,7 +2654,7 @@ tr { } .calendar th { - font-size: 16px; + font-size: 16px; } .today { @@ -2674,16 +2663,16 @@ tr { background-color: #b20202; color: #fff; } - -#event-start-text, + +#event-start-text, #event-finish-text { margin-top: 10px; margin-bottom: 5px; } -#event-nofinish-checkbox, -#event-nofinish-text, -#event-adjust-checkbox, +#event-nofinish-checkbox, +#event-nofinish-text, +#event-adjust-checkbox, #event-adjust-text, #event-share-checkbox { float: left; @@ -2693,13 +2682,13 @@ tr { margin-bottom: 10px; } -#event-nofinish-break, +#event-nofinish-break, #event-adjust-break, #event-share-break { clear: both; } -#event-desc-text, +#event-desc-text, #event-location-text { margin-top: 10px; margin-bottom: 5px; @@ -2727,7 +2716,7 @@ tr { .directory-name { font-size: 1em; /* font-variant: small-caps; */ - width: 150px; + width: 150px; } /* ========= */ @@ -2833,7 +2822,7 @@ tr { .field_help { display: block; margin-left: 100px; - color: #666666; + color: #666666; } .field .onoff { @@ -2883,11 +2872,11 @@ tr { display: block; width: 20px; height: 20px; background-image: url('icons.png'); } -.starred { - background-image: url("star.png"); +.starred { + background-image: url("star.png"); repeat: no-repeat; } -.unstarred { +.unstarred { background-image: url("premium.png"); repeat: no-repeat; } @@ -2901,7 +2890,7 @@ tr { border: 1px solid #c1c1c1; -webkit-border-radius: 3px; -moz-border-radius: 3px; - border-radius: 3px; + border-radius: 3px; } .article { background-position: -50px 0px;} @@ -2974,10 +2963,10 @@ tr { /* ========== */ /* = Footer = */ /* ========== */ - -.cc-license { margin-top: 100px; font-size: 0.7em; } + +.cc-license { margin-top: 100px; font-size: 0.7em; } footer { display: block; margin: 50px 20%; clear: both; } - + #profile-jot-text { height: 20px; color:#cccccc; @@ -3066,7 +3055,7 @@ footer { display: block; margin: 50px 20%; clear: both; } overflow: hidden; } -.acl-list-item a { +.acl-list-item a { font-size: 10px; display: block; float: left; @@ -3241,7 +3230,7 @@ ul.menu-popup { max-height:150px; overflow:auto; z-index:100000; - + color: #2e3436; border-top: 0px; background: #eeeeee; @@ -3254,7 +3243,7 @@ ul.menu-popup { -moz-box-shadow: 3px 3px 4px #959494; -webkit-box-shadow: 3px 3px 4px #959494; box-shadow: 3px 3px 4px #959494; - + } .acpopupitem { color: #2e3436; padding: 4px; @@ -3270,7 +3259,7 @@ ul.menu-popup { background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); - background-color:#b20202; + background-color:#b20202; order-bottom: none; }