diff options
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 112 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 30 | ||||
| -rw-r--r-- | view/theme/redbasic/php/config.php | 15 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 32 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 5 |
5 files changed, 124 insertions, 70 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ee3534a11..c280e555a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -9,7 +9,7 @@ /* generals */ body { font-family: arial,freesans,sans-serif; - font-size: 12px; + font-size: $body_font_size; background-color: $bgcolour; background-image: url('$background_image'); background-attachment: fixed; @@ -50,14 +50,19 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } cursor: pointer; } + +input[type=text] { + font-family: arial,freesans,sans-serif; +} + input { border: 1px solid #666666; -moz-border-radius: $radiuspx; border-radius: $radiuspx; padding: 3px; + font-size: $body_font_size; } - code { font-family: Courier, monospace; display: block; @@ -129,10 +134,7 @@ nav { } -/* -section {width: $section_width; -} -*/ + nav:hover { background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); @@ -780,6 +782,12 @@ footer { height: 120px; padding: 10px; } + +#contacts-search { + font-size: 1em; + width: 300px; +} + #contacts-search-end { margin-bottom: 10px; } @@ -876,7 +884,7 @@ footer { margin: 0px; padding: 0px; width: 16px; height: 16px; - top: 74px; left:10px; + top: $pmenu_top; left:10px; overflow: hidden; text-indent: 40px; display: none; @@ -896,7 +904,7 @@ footer { .wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; } -.comment .wall-item-photo-menu-button { top: 44px;} +.comment .wall-item-photo-menu-button { top: $pmenu_reply;} .comment .wall-item-photo-menu { top: 60px; } .wallwall .wwto { @@ -931,7 +939,7 @@ footer { } .wall-item-lock { - font-size: 1.4em; + font-size: 1.2em; left: 105px; position: absolute; top: 1px; @@ -998,15 +1006,18 @@ footer { .wall-item-photo { border: none; + width: $top_photo !important; + height: $top_photo !important; + } .comment .wall-item-photo { - width: 50px !important; - height: 50px !important; + width: $reply_photo !important; + height: $reply_photo !important; } .wall-item-content { margin-left: 10px; overflow: auto; - font-size: $font_sizepx; + font-size: $font_size; } .wall-item-content img { @@ -1023,8 +1034,8 @@ footer { } .thread-wrapper.toplevel_item { - width: 92%; - max-width: 1024px; + width: 92%; + max-width: $converse_width; } .wall-item-body { @@ -1720,6 +1731,7 @@ tr.mceLast { #prvmail-attach-wrapper, #prvmail-link-wrapper, #prvmail-expire-wrapper, +#prvmail-encrypt-wrapper, #prvmail-rotator-wrapper { float: left; margin-top: 10px; @@ -1890,6 +1902,19 @@ a.mail-list-link { #side-follow-url, #side-peoplefind-url { margin-top: 5px; } + +#side-peoplefind-url { + font-size: 1em; +} + +#side-peoplefind-url::-webkit-input-placeholder { + font-family: FontAwesome; +} + +#side-peoplefind-url::-moz-placeholder { + font-family: FontAwesome; +} + #side-follow-submit, #side-peoplefind-submit { margin-top: 15px; } @@ -2036,6 +2061,26 @@ a.mail-list-link { transition: background-color 300ms ease 0s; } +#nav-search-text::-webkit-input-placeholder { + font-family: FontAwesome; +} + +#nav-search-text::-moz-placeholder { + font-family: FontAwesome; +} + +#search-text { + font-size: 1em; +} + +#search-text::-webkit-input-placeholder { + font-family: FontAwesome; +} + +#search-text::-moz-placeholder { + font-family: FontAwesome; +} + #nav-user-linkmenu img { border-radius: $radiuspx; margin-top: -4px; @@ -2859,36 +2904,45 @@ div.jGrowl div.info { width:100px; } -#recip { - +#nav-search-text-ac .autocomplete { + position: fixed; + top: 24px; + border: 1px solid $nav_bg_1; + border-top: none; } -.autocomplete-w1 { - position:fixed; - top:24px; +#search-text-ac .autocomplete, +#recip-ac .autocomplete, +#poke-recip-ac .autocomplete, +#id-name-ac .autocomplete, +#contact-search-ac .autocomplete { + margin-top: 2px; + margin-left: $radiuspx; + border: 1px solid #666; + border-top: none; + } -.autocomplete { +.autocomplete { color: $font_colour; - border: 1px solid $nav_bg_1; - border-top: none; background: #FFF; cursor: pointer; text-align: left; max-height: 350px; overflow: auto; - border-bottom-left-radius:$radiuspx; - border-bottom-right-radius:$radiuspx; + border-bottom-left-radius: $radiuspx; + border-bottom-right-radius: $radiuspx; } .autocomplete .selected { - background:$bgcolour; + background: $search_background; } .autocomplete div { - padding:2px 5px; - white-space:nowrap; - overflow:hidden; + padding: 2px 5px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } #datebrowse-sidebar select { @@ -2899,7 +2953,7 @@ div.jGrowl div.info { .jslider .jslider-scale ins { color: #333; - font-size: 12px; + font-size: $body_font_size; width: 100px; text-align: center; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index a97e906bf..e40a94fcc 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -1,35 +1,5 @@ -function insertFormatting(comment,BBcode,id) { - - var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == comment) { - tmpStr = ""; - $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); - openMenu("comment-edit-submit-wrapper-" + id); - $("#comment-edit-text-" + id).val(tmpStr); - } - - textarea = document.getElementById("comment-edit-text-" +id); - if (document.selection) { - textarea.focus(); - selected = document.selection.createRange(); - if (BBcode == "url"){ - selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]"; - } else - selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; - } else if (textarea.selectionStart || textarea.selectionStart == "0") { - var start = textarea.selectionStart; - var end = textarea.selectionEnd; - if (BBcode == "url"){ - textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); - } else - textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); - } - return true; -} - function cmtBbOpen(comment, id) { if($(comment).hasClass('comment-edit-text-full')) { $(".comment-edit-bb-" + id).show(); diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index eb583d9bf..20355197f 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -15,11 +15,14 @@ function theme_content(&$a) { $arr['toolicon_colour'] = get_pconfig(local_user(),'redbasic','toolicon_colour'); $arr['toolicon_activecolour'] = get_pconfig(local_user(),'redbasic','toolicon_activecolour'); $arr['font_size'] = get_pconfig(local_user(),'redbasic', 'font_size' ); + $arr['body_font_size'] = get_pconfig(local_user(),'redbasic', 'body_font_size' ); $arr['font_colour'] = get_pconfig(local_user(),'redbasic', 'font_colour' ); $arr['radius'] = get_pconfig(local_user(),'redbasic', 'radius' ); $arr['shadow'] = get_pconfig(local_user(),'redbasic', 'photo_shadow' ); - $arr['section_width']=get_pconfig(local_user(),"redbasic","section_width"); + $arr['converse_width']=get_pconfig(local_user(),"redbasic","converse_width"); $arr['nav_min_opacity']=get_pconfig(local_user(),"redbasic","nav_min_opacity"); + $arr['top_photo']=get_pconfig(local_user(),"redbasic","top_photo"); + $arr['reply_photo']=get_pconfig(local_user(),"redbasic","reply_photo"); $arr['sloppy_photos']=get_pconfig(local_user(),"redbasic","sloppy_photos"); return redbasic_form($a, $arr); } @@ -38,11 +41,14 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']); set_pconfig(local_user(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']); set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']); + set_pconfig(local_user(), 'redbasic', 'body_font_size', $_POST['redbasic_body_font_size']); set_pconfig(local_user(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']); set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']); set_pconfig(local_user(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']); - set_pconfig(local_user(), 'redbasic', 'section_width', $_POST['redbasic_section_width']); + set_pconfig(local_user(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']); set_pconfig(local_user(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']); + set_pconfig(local_user(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']); + set_pconfig(local_user(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']); set_pconfig(local_user(), 'redbasic', 'sloppy_photos', $_POST['redbasic_sloppy_photos']); } } @@ -89,12 +95,15 @@ if(feature_enabled(local_user(),'expert')) '$item_opacity' => array('redbasic_item_opacity', t('Set the opacity of items'), $arr['item_opacity']), '$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic colour for item icons'),$arr['toolicon_colour']), '$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover colour for item icons'),$arr['toolicon_activecolour']), + '$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size']), '$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']), '$font_colour' => array('redbasic_font_colour', t('Set font-colour for posts and comments'), $arr['font_colour']), '$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']), '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']), - '$section_width' => array('redbasic_section_width',t('Set width of main section'),$arr['section_width']), + '$converse_width' => array('redbasic_converse_width',t('Set maximum width of conversation regions'),$arr['converse_width']), '$nav_min_opacity' => array('redbasic_nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$arr['nav_min_opacity']), + '$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']), + '$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']), '$sloppy_photos' => array('redbasic_sloppy_photos',t('Sloppy photo albums'),$arr['sloppy_photos'],t('Are you a clean desk or a messy desk person?')), )); diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 716a2dd9e..2fcda2cc8 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -20,13 +20,16 @@ $toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour'); $item_colour = get_pconfig($uid, "redbasic", "item_colour"); $item_opacity = get_pconfig($uid, "redbasic", "item_opacity"); + $body_font_size = get_pconfig($uid, "redbasic", "body_font_size"); $font_size = get_pconfig($uid, "redbasic", "font_size"); $font_colour = get_pconfig($uid, "redbasic", "font_colour"); $radius = get_pconfig($uid, "redbasic", "radius"); $shadow = get_pconfig($uid,"redbasic","photo_shadow"); - $section_width=get_pconfig($uid,"redbasic","section_width"); + $converse_width=get_pconfig($uid,"redbasic","converse_width"); $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); $sloppy_photos=get_pconfig($uid,'redbasic','sloppy_photos'); + $top_photo=get_pconfig($uid,'redbasic','top_photo'); + $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); // Now load the scheme. If a value is changed above, we'll keep the settings // If not, we'll keep those defined by the schema @@ -75,17 +78,27 @@ if (! $item_opacity) $item_opacity = "1"; if (! $font_size) - $font_size = "12"; + $font_size = "1.0em"; + if (! $body_font_size) + $body_font_size = "11px"; if (! $font_colour) $font_colour = "#4D4D4D"; if (! $radius) - $radius = "5"; + $radius = "0"; if (! $shadow) $shadow = "0"; if(! $active_colour) $active_colour = '#FFFFFF'; - if (! $section_width) - $section_width="72%"; + if (! $converse_width) + $converse_width="1024px"; + if(! $top_photo) + $top_photo = '64px'; + $pmenu_top = intval($top_photo) - 6 . 'px'; + + if(! $reply_photo) + $reply_photo = '32px'; + $pmenu_reply = intval($reply_photo) - 6 . 'px'; + if($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; $nav_percent_min_opacity = 100; @@ -138,12 +151,17 @@ $options = array ( '$toolicon_activecolour' => $toolicon_activecolour, '$font_size' => $font_size, '$font_colour' => $font_colour, +'$body_font_size' => $body_font_size, '$radius' => $radius, '$shadow' => $shadow, '$active_colour' => $active_colour, -'$section_width' => $section_width, +'$converse_width' => $converse_width, '$nav_float_min_opacity' => $nav_float_min_opacity, -'$nav_percent_min_opacity' => $nav_percent_min_opacity +'$nav_percent_min_opacity' => $nav_percent_min_opacity, +'$top_photo' => $top_photo, +'$reply_photo' => $reply_photo, +'$pmenu_top' => $pmenu_top, +'$pmenu_reply' => $pmenu_reply ); echo str_replace(array_keys($options), array_values($options), $x); diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 237637770..e0f546896 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -12,12 +12,15 @@ {{include file="field_input.tpl" field=$item_opacity}} {{include file="field_input.tpl" field=$toolicon_colour}} {{include file="field_input.tpl" field=$toolicon_activecolour}} +{{include file="field_input.tpl" field=$body_font_size}} {{include file="field_input.tpl" field=$font_size}} {{include file="field_input.tpl" field=$font_colour}} {{include file="field_input.tpl" field=$radius}} {{include file="field_input.tpl" field=$shadow}} -{{include file="field_input.tpl" field=$section_width}} +{{include file="field_input.tpl" field=$converse_width}} {{include file="field_input.tpl" field=$nav_min_opacity}} +{{include file="field_input.tpl" field=$top_photo}} +{{include file="field_input.tpl" field=$reply_photo}} {{include file="field_checkbox.tpl" field=$sloppy_photos}} <div class="settings-submit-wrapper"> <input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" /> |