diff options
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/redbasic/css/narrow_navbar.css | 85 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 308 | ||||
| -rw-r--r-- | view/theme/redbasic/img/screenshot.jpg | bin | 135205 -> 199131 bytes | |||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 71 | ||||
| -rw-r--r-- | view/theme/redbasic/php/config.php | 11 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 47 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/boxy.css | 11 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/boxy.php | 15 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/dark.css | 13 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/dark.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/notred.php | 5 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_black_on_white.css | 13 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_black_on_white.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_green_on_black.css | 13 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_green_on_black.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_white_on_black.css | 13 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_white_on_black.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 75 |
18 files changed, 327 insertions, 361 deletions
diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css index cfda9760e..f403fabbf 100644 --- a/view/theme/redbasic/css/narrow_navbar.css +++ b/view/theme/redbasic/css/narrow_navbar.css @@ -1,29 +1,60 @@ @media screen and (min-width: 760px) { -.navbar-nav > li > a {padding-top:5px !important; padding-bottom:5px !important;} -.navbar {min-height:25px !important;} -nav img { -height: 30px; -width: 30px; -margin: 2px 0px 1px 10px; -border-radius: 0px; + .navbar-nav > li > a { + padding-top:7px !important; + padding-bottom:3px !important; + } + + .navbar { + min-height:25px !important; + } + + nav img { + height: 30px; + width: 30px; + margin-top: 1px; + border-radius: 4px; + } + + .navbar-left { + height: 30px; + } + + .container-fluid { + min-height:30px; + } + + .collapse .navbar-collapse { + min-height:30px; + } + + #nav-search-text { + margin:6px 15px 4px 15px; + } + + #nav-search-spinner { + margin: 16px 0px 0px 25px; + } + + header #banner { + margin-top:5px; + } + + nav .dropdown-menu, + nav .acpopup { + top: 31px !important; + } + + nav .badge { + position: relative; + top: -31px; + float: right; + font-size: 10px; + padding: 2px 6px; + cursor: pointer; + } + + #jGrowl.top-right { + top: 30px; + right: 15px; + } } -.navbar-left{height: 30px;} -.container-fluid {min-height:30px;} -.collapse .navbar-collapse {min-height:30px;} -#nav-search-text {margin:5px;} -header #banner {margin-top:5px;} -nav .dropdown-menu { -top: 33px;} -nav .badge { - position: relative; - top: -30px; - float: right; - font-size: 10px; - padding: 2px 6px; - cursor: pointer; -} -#jGrowl.top-right { - top: 30px; - right: 15px; -} -}
\ No newline at end of file diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1ad0d5d71..7cdde49ab 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -81,7 +81,11 @@ a.btn-default { color: #333; } -a.btn-success { +a.btn-success, +a.btn-danger, +a.btn-info, +a.btn-warning, +a.btn-primary { color: #fff; } @@ -111,8 +115,8 @@ input[type="submit"] { padding: 6px 12px; } -button, input, optgroup, select, textarea { - color: #000; +input, optgroup, select, textarea { + color: #333; } pre code { @@ -183,17 +187,6 @@ header { padding: 10px; } -.info-message { - font-size: 1.1em; - border: 1px solid #444; - background-color: $infomess_bgcolour; - padding: 10px; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; - -} - - nav #banner #logo-text a { font-size: 40px; font-weight: bold; @@ -262,7 +255,7 @@ footer { } #theme-preview { - margin: 15px 0 15px 150px; + margin: 15px 0px; } .fakebutton { @@ -288,75 +281,11 @@ footer { margin-bottom: 10px; } -#main-login { +#login-main { + max-width: 300px; margin-top: 50px; } -#main-login #id_username, #main-login #id_password { - width: 200px; - padding: 10px; - float: left; -} - -#main-login #id_remember { - float: left; - padding: 0; - margin-bottom: 0; - margin-left: 0; - width: 20px; -} - -#main-login .field.checkbox > label { - margin-bottom: 0; - float: left; - width: 100px; - padding-left: 0; -} - -#main-login .field_end { - clear: both; -} - -#main-login .field.input label, #main-login .field.password label { - float: left; - width: 100px; -} - -#login_standard { - width: 350px; - float: left; -} - - -#login_standard input, -#login_openid input { - width: 180px; -} - -#login-extra-links { - clear: both; - width: 300px; -} - -#register-link { - float: left; - margin-left: 100px; -} -#lost-password-link { - float: right; -} - -#login-standard-end { - clear: both; -} - -#login-submit-button { - - margin-left: 100px; - margin-top: 10px; -} - - #cropimage-wrapper, #cropimage-preview-wrapper { float: left; padding: 30px; @@ -371,18 +300,6 @@ footer { font-weight: bold; } -#profile-edit-wrapper .field { - margin-top: 20px; -} -#profile-edit-wrapper .field > label { - width: 175px; -} - -#profile-edit-wrapper .field input[type="text"] { - width: 220px; -} - - #profile-edit-links { max-width: $converse_width; padding-top: 15px; @@ -422,7 +339,7 @@ footer { margin-bottom: 10px; padding: 10px; background-color: $comment_item_colour; - border-bottom: 1px solid $widget_brdrcolour; + border-bottom: 1px solid rgba(238,238,238,0.8); -moz-border-radius: $radiuspx; -webkit-border-radius: $radiuspx; border-radius: $radiuspx; @@ -749,7 +666,6 @@ footer { .group-delete-wrapper { float: right; - margin-right: 50px; } .rconnect { @@ -793,7 +709,7 @@ a.rateme, div.rateme { width: 100%; float: left; background-color: $comment_item_colour; - border-bottom: 1px solid $widget_brdrcolour; + border-bottom: 1px solid rgba(238,238,238,0.8); -moz-border-radius: $radiuspx; -webkit-border-radius: $radiuspx; border-radius: $radiuspx; @@ -1258,71 +1174,6 @@ nav .acpopup { } -/** - * Form fields - */ -.field { - margin-bottom: 10px; -/* padding-bottom: 10px; */ - overflow: auto; - width: 100% -} - -.field > label { - float: left; - width: 350px; -} - -.field input, -.field textarea { - width: 400px; -} -.field textarea { height: 100px; } -.field_help { - display: block; - margin-left: 350px; - color: #666666; - -} - -.field input[type="checkbox"] { - width: 16px; -} - -.field .onoff { - float: left; - width: 80px; - margin-right: 15px; -} -.field .onoff a { - display: block; - border:1px solid #666666; - background-image:url("../../../../images/onoff.jpg"); - background-repeat: no-repeat; - padding: 4px 2px 2px 2px; - height: 24px; - text-decoration: none; -} -.field .onoff .off { - border-color:#666666; - padding-left: 40px; - background-position: left center; - background-color: #cccccc; - color: #666666; - text-align: right; -} -.field .onoff .on { - border-color:#204A87; - padding-right: 40px; - background-position: right center; - background-color: #D7E3F1; - color: #204A87; - text-align: left; -} -.hidden { display: none!important; } - -.field.radio .field_help { margin-left: 0px; } -.field.checkbox .field_help { display: inline; margin-left: 10px; } /** @@ -1611,50 +1462,50 @@ header { .shared_header img { margin-right: 10px; } .tag1 { - font-size : 1.0em !important; + font-size : 0.9em !important; } .tag2 { - font-size : 1.2em !important; + font-size : 1.0em !important; } .tag3 { - font-size : 1.4em !important; + font-size : 1.1em !important; } .tag4 { - font-size : 1.6em !important; + font-size : 1.2em !important; } .tag5 { - font-size : 1.8em !important; + font-size : 1.3em !important; } .tag6 { - font-size : 2.0em !important; + font-size : 1.4em !important; } .tag7 { - font-size : 2.2em !important; + font-size : 1.5em !important; } .tag8 { - font-size : 2.4em !important; + font-size : 1.6em !important; } .tag9 { - font-size : 2.6em !important; + font-size : 1.7em !important; } .tag10 { - font-size : 2.8em !important; + font-size : 1.8em !important; } @@ -1739,6 +1590,15 @@ text-decoration: none; background-color: $admintable_hoverbgcol; } +table { + border-spacing: 2px; + max-width: 100%; +} + +th,td { + padding: 3px; +} + /* message */ img.mail-list-sender-photo { @@ -1837,25 +1697,22 @@ img.mail-list-sender-photo { border-radius: $radiuspx; } -.comment .wall-item-body { - padding-left: $comment_padding; -} - .wall-item-content-wrapper.comment { background-color: $comment_item_colour; - border-left: $comment_border_left $comment_border_colour; - border-right: $comment_border_right $comment_border_colour; - border-bottom: $comment_border_bottom $comment_border_colour; + border-color: $comment_border_colour; + border-style: solid; + border-width: 0px 0px 0px 3px; border-radius: 0px; padding: 7px 10px 7px 7px; } .hide-comments-outer { background-color: $comment_item_colour; - border-left: $comment_border_left $comment_border_colour; - border-right: $comment_border_right $comment_border_colour; - border-bottom: $comment_border_bottom $comment_border_colour; - border-top: 1px dashed #ccc; + border-color: $comment_border_colour; + border-top-color: #ccc; + border-style: solid; + border-top-style: dashed; + border-width: 1px 0px 0px 3px; text-align: center; border-radius: 0px; } @@ -1965,7 +1822,7 @@ img.mail-list-sender-photo { .widget { background-color: $comment_item_colour; - border-bottom: 1px solid $widget_brdrcolour; + border-bottom: 1px solid rgba(238,238,238,0.8); -moz-border-radius: $radiuspx; -webkit-border-radius: $radiuspx; border-radius: $radiuspx; @@ -2064,15 +1921,40 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ margin-bottom: 3px; } -.section-title-wrapper h2 { +.section-title-wrapper h2, +.section-subtitle-wrapper h3 { margin-top: 0px; margin-bottom: 0px; } +.section-subtitle-wrapper { + padding: 7px 10px; + background-color: $item_colour; + margin-bottom: 3px; +} + .section-content-tools-wrapper { padding: 7px 10px; background-color: $comment_item_colour; + margin-bottom: 3px +} + +.section-content-info-wrapper { + padding: 21px 10px; + color: #31708f; + background-color: #d9edf7; + margin-bottom: 3px; + border-radius: $radiuspx; + text-align: center; +} + +.section-content-danger-wrapper { + padding: 21px 10px; + color: #a94442; + background-color: #f2dede; margin-bottom: 3px; + border-radius: $radiuspx; + text-align: center; } .section-content-wrapper { @@ -2102,6 +1984,18 @@ nav ul li .notify-unseen /* bootstrap overrides */ +.panel { + background-color: transparent; + border: 0px solid transparent; + border-radius: 0px; + -webkit-box-shadow: 0 0px 0px rgba(0, 0, 0, .0); + box-shadow: 0 0px 0px rgba(0, 0, 0, .0); +} + +.panel-group .panel + .panel { + margin-top: 0px; +} + blockquote { font-size: $font_size; font-style: italic; @@ -2402,9 +2296,8 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { /* Turn checkboxes into switches */ -.field.checkbox .fieldhelp { vertical-align:top; } .field.checkbox > div { - position: relative; width: 70px; + position: relative; width: 60px; -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none; display:inline-block; } @@ -2415,9 +2308,20 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { .field.checkbox > div label { display: block; overflow: hidden; cursor: pointer; - border: 2px solid #999999; - border-radius: 20px; + border: 1px solid #ccc; + border-radius: 4px; margin:0px; + -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s; + -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; +} + +.field.checkbox:hover label { + color: $link_colour; +} + +.field.checkbox:hover > div label { + border-color: $link_colour; } .onoffswitch-inner { @@ -2433,31 +2337,37 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { .onoffswitch-inner:before { content: attr(data-on); - padding-left: 10px; - background-color: #EEEEEE; + padding-right: 21px; + background-color: $item_colour; + color: $font_colour; + text-align: right; } .onoffswitch-inner:after { content: attr(data-off); - padding-right: 10px; - background-color: #EEEEEE; color: #999999; - text-align: right; + padding-left: 21px; + background-color: $item_colour; color: #ccc; + text-align: left; } .onoffswitch-switch { - display: block; width: 25px; margin-left: 6px; margin-right: 6px; margin-top:5%; margin-bottom:5%; - background: #A1A1A1; - border: 2px solid #999999; border-radius: 20px; + display: block; width: 15px; margin:4px; + background: #ccc; + border-radius: 10px; position: absolute; top: 0; bottom: 0; right: 36px; -moz-transition: all 0.3s ease-in 0s; -webkit-transition: all 0.3s ease-in 0s; -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s; } .field.checkbox > div > input:checked + label .onoffswitch-inner { - margin-left: 0; + margin-left: 0px; } .field.checkbox > div > input:checked + label .onoffswitch-switch { - right: -2px; - background-color: #27A1CA; + right: 0px; + background-color: #337AB7; +} + +.channels_ckbx, .pending_ckbx, .users_ckbx { + margin-top: -5px !important; } diff --git a/view/theme/redbasic/img/screenshot.jpg b/view/theme/redbasic/img/screenshot.jpg Binary files differindex 51d4cbb0d..ac9258bd6 100644 --- a/view/theme/redbasic/img/screenshot.jpg +++ b/view/theme/redbasic/img/screenshot.jpg diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 3db67dc87..c825b0485 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -1,52 +1,51 @@ - +/** + * redbasic theme specific JavaScript + */ $(document).ready(function() { + // CSS3 calc() fallback (for unsupported browsers) + $('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>'); + if( $('#css3-calc').width() == 10) { + $(window).resize(function() { + if($(window).width() < 767) { + $('main').css('width', $(window).width() + 231 ); + } else { + $('main').css('width', '100%' ); + } + }); + } + $('#css3-calc').remove(); // Remove the test element -// CSS3 calc() fallback (for unsupported browsers) -$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>'); -if( $('#css3-calc').width() == 10) { - $(window).resize(function() { - if($(window).width() < 767) { - $('main').css('width', $(window).width() + 231 ); - } else { - $('main').css('width', '100%' ); - } + $('#expand-aside').click(function() { + $('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left'); + $('main').toggleClass('region_1-on'); }); -} -$('#css3-calc').remove(); // Remove the test element -$('#expand-aside').click(function() { - $('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left'); - $('main').toggleClass('region_1-on'); -}); - -if($('aside').length && $('aside').html().length == 0) { - $('#expand-aside').hide(); -} - -$('#expand-tabs').click(function() { - if(!$('#tabs-collapse-1').hasClass('in')){ - $('html, body').animate({ scrollTop: 0 }, 'slow'); + if($('aside').length && $('aside').html().length === 0) { + $('#expand-aside').hide(); } - $('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up'); -}); -if($('#tabs-collapse-1').length == 0) { - $('#expand-tabs').hide(); -} + $('#expand-tabs').click(function() { + if(!$('#tabs-collapse-1').hasClass('in')){ + $('html, body').animate({ scrollTop: 0 }, 'slow'); + } + $('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up'); + }); + if($('#tabs-collapse-1').length === 0) { + $('#expand-tabs').hide(); + } }); - $(document).ready(function(){ var doctitle = document.title; function checkNotify() { var notifyUpdateElem = document.getElementById('notify-update'); if(notifyUpdateElem !== null) { - if(notifyUpdateElem.innerHTML != "") - document.title = "("+notifyUpdateElem.innerHTML+") " + doctitle; - else - document.title = doctitle; + if(notifyUpdateElem.innerHTML !== "") + document.title = "(" + notifyUpdateElem.innerHTML + ") " + doctitle; + else + document.title = doctitle; } - }; + } setInterval(function () {checkNotify();}, 10 * 1000); -}); +});
\ No newline at end of file diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index b072f5782..ba49859c5 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -100,8 +100,8 @@ if(feature_enabled(local_channel(),'expert')) '$baseurl' => $a->get_baseurl(), '$expert' => $expert, '$title' => t("Theme settings"), - '$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices), - '$narrow_navbar' => array('redbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar']), + '$schema' => array('redbasic_schema', t('Select scheme'), $arr['schema'], '', $scheme_choices), + '$narrow_navbar' => array('redbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))), '$nav_bg' => array('redbasic_nav_bg', t('Navigation bar background color'), $arr['nav_bg']), '$nav_gradient_top' => array('redbasic_nav_gradient_top', t('Navigation bar gradient top color'), $arr['nav_gradient_top']), '$nav_gradient_bottom' => array('redbasic_nav_gradient_bottom', t('Navigation bar gradient bottom color'), $arr['nav_gradient_bottom']), @@ -120,17 +120,16 @@ if(feature_enabled(local_channel(),'expert')) '$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']), '$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic color for item icons'),$arr['toolicon_colour']), '$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover color 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']), + '$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size'], 'Example: 14px '), '$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-color 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']), - '$converse_width' => array('redbasic_converse_width',t('Set maximum width of conversation regions'),$arr['converse_width']), - '$converse_center' => array('redbasic_converse_center',t('Center conversation regions'),$arr['converse_center']), + '$converse_width' => array('redbasic_converse_width',t('Set maximum width of conversation regions'),$arr['converse_width'], 'Example: 700px ("center conversation regions" must be set to Yes for this to have an effect)'), + '$converse_center' => array('redbasic_converse_center',t('Center conversation regions'),$arr['converse_center'], '', array(t('No'),t('Yes'))), '$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?')), )); return $o; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 5bc702d8c..a3234862a 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -59,15 +59,23 @@ if(! $a->install) { $schemefile = 'view/theme/redbasic/schema/' . $schema . '.php'; require_once ($schemefile); } + if(file_exists('view/theme/redbasic/schema/' . $schema . '.css')) { + $schemecss = file_get_contents('view/theme/redbasic/schema/' . $schema . '.css'); + } + + } + + // If we haven't got a schema, load the default. We shouldn't touch this - we + // should leave it for admins to define for themselves. + if (! $schema) { + if(file_exists('view/theme/redbasic/schema/default.php')) { + $schemefile = 'view/theme/redbasic/schema/default.php'; + require_once ($schemefile); + } + if(file_exists('view/theme/redbasic/schema/default.css')) { + $schemecss = file_get_contents('view/theme/redbasic/schema/default.css'); + } } - // If we haven't got a schema, load the default. We shouldn't touch this - we - // should leave it for admins to define for themselves. - if (! $schema) { - if(file_exists('view/theme/redbasic/schema/default.php')) { - $schemefile = 'view/theme/redbasic/schema/default.php'; - require_once ($schemefile); - } - } //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting @@ -145,8 +153,6 @@ if(! $a->install) { $selected_active_colour = "#444"; if (! $selected_active_deco) $selected_active_deco = "none"; - if (! $widget_brdrcolour) - $widget_brdrcolour = "rgba(238,238,238,0.8)"; if (! $blockquote_colour) $blockquote_colour = "#4d4d4d"; if (! $blockquote_bgcolour) @@ -276,16 +282,6 @@ if(! $a->install) { $chat_txtbgcol = "#EEE"; if(! $fancybox_bgcolour) $fancybox_bgcolour = "#FFFFFF"; - if (!$comment_padding) - $comment_padding="0px"; - if (!$comment_border_left) - $comment_border_left="3px solid"; - if (!$comment_border_right) - $comment_border_right="0px solid"; - if (!$comment_border_top) - $comment_border_top="0px solid"; - if (!$comment_border_bottom) - $comment_border_bottom="0px solid"; if (!$admintable_hoverbgcol) $admintable_hoverbgcol="#BBC7D7"; if (!$dirpopup_txtcol) @@ -346,7 +342,6 @@ $options = array ( '$selected_active_colour' => $selected_active_colour, '$selected_active_deco' => $selected_active_deco, '$body_font_size' => $body_font_size, -'$widget_brdrcolour' => $widget_brdrcolour, '$blockquote_colour' => $blockquote_colour, '$blockquote_bgcolour' => $blockquote_bgcolour, '$blockquote_bordercolour' => $blockquote_bordercolour, @@ -419,10 +414,6 @@ $options = array ( '$comment_indent' => $comment_indent, '$body_width' => $body_width, '$comment_padding' => $comment_padding, -'$comment_border_left' => $comment_border_left, -'$comment_border_right' => $comment_border_right, -'$comment_border_top' => $comment_border_top, -'$comment_border_bottom' => $comment_border_bottom, '$admintable_hoverbgcol' => $admintable_hoverbgcol, '$dirpopup_txtcol' => $dirpopup_txtcol, '$dirpopup_linkcol' => $dirpopup_linkcol, @@ -441,4 +432,8 @@ if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { if($converse_center && file_exists('view/theme/redbasic/css/converse_center.css')) { $x = file_get_contents('view/theme/redbasic/css/converse_center.css'); echo str_replace(array_keys($options), array_values($options), $x); -} +} + +if($schemecss) { + echo $schemecss; +} diff --git a/view/theme/redbasic/schema/boxy.css b/view/theme/redbasic/schema/boxy.css new file mode 100644 index 000000000..f3da9b262 --- /dev/null +++ b/view/theme/redbasic/schema/boxy.css @@ -0,0 +1,11 @@ +.comment .wall-item-body { + padding-left: 42px; +} + +.wall-item-content-wrapper.comment { + border-width: 0px 1px 1px 1px; +} + +.hide-comments-outer { + border-width: 1px 1px 1px 1px; +} diff --git a/view/theme/redbasic/schema/boxy.php b/view/theme/redbasic/schema/boxy.php index 1de2f98cd..d609ccd25 100644 --- a/view/theme/redbasic/schema/boxy.php +++ b/view/theme/redbasic/schema/boxy.php @@ -1,19 +1,4 @@ <?php -if (!$comment_padding) - $comment_padding="42px"; - -if (!$comment_border_left) - $comment_border_left="1px solid"; - -if (!$comment_border_right) - $comment_border_right="1px solid"; - -if (!$comment_border_top) - $comment_border_top="1px solid"; - -if (!$comment_border_bottom) - $comment_border_bottom="1px solid"; if (! $radiuspx) $radiuspx = "4"; -
\ No newline at end of file diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css new file mode 100644 index 000000000..853cd35a3 --- /dev/null +++ b/view/theme/redbasic/schema/dark.css @@ -0,0 +1,13 @@ +.vcard { + border-bottom: 1px solid #333; +} + +#contact-block { + border-bottom: 1px solid #333; +} + +.widget { + border-bottom: 1px solid #333; +} + + diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 0203d30cd..3f462a311 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -64,8 +64,6 @@ $toolicon_activecolour = '#fff'; if (! $font_colour) $font_colour = "#ccc"; - if (! $widget_brdrcolour) - $widget_brdrcolour = "#333"; if (! $blockquote_colour) $blockquote_colour = "#ccc"; if (! $blockquote_bgcolour) diff --git a/view/theme/redbasic/schema/notred.php b/view/theme/redbasic/schema/notred.php deleted file mode 100644 index 5a6dda336..000000000 --- a/view/theme/redbasic/schema/notred.php +++ /dev/null @@ -1,5 +0,0 @@ -<?php - - if (! $nav_colour) - $nav_colour = "black"; - diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css new file mode 100644 index 000000000..6db85e19d --- /dev/null +++ b/view/theme/redbasic/schema/simple_black_on_white.css @@ -0,0 +1,13 @@ +.vcard { + border-bottom: 1px solid #fff; +} + +#contact-block { + border-bottom: 1px solid #fff; +} + +.widget { + border-bottom: 1px solid #fff; +} + + diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php index ddbcae495..7c8a18217 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -64,8 +64,6 @@ $toolicon_activecolour = '#000'; if (! $font_colour) $font_colour = "#000"; - if (! $widget_brdrcolour) - $widget_brdrcolour = "#fff"; if (! $blockquote_colour) $blockquote_colour = "#111"; if (! $blockquote_bgcolour) diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css new file mode 100644 index 000000000..5360fceb4 --- /dev/null +++ b/view/theme/redbasic/schema/simple_green_on_black.css @@ -0,0 +1,13 @@ +.vcard { + border-bottom: 1px solid #000; +} + +#contact-block { + border-bottom: 1px solid #000; +} + +.widget { + border-bottom: 1px solid #000; +} + + diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php index f034185f7..eedd6b2b7 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -64,8 +64,6 @@ if (! $navaside_bghover) $toolicon_activecolour = '#50f148'; if (! $font_colour) $font_colour = "#46D43F"; - if (! $widget_brdrcolour) - $widget_brdrcolour = "#000"; if (! $blockquote_colour) $blockquote_colour = "#32962D"; if (! $blockquote_bgcolour) diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css new file mode 100644 index 000000000..5360fceb4 --- /dev/null +++ b/view/theme/redbasic/schema/simple_white_on_black.css @@ -0,0 +1,13 @@ +.vcard { + border-bottom: 1px solid #000; +} + +#contact-block { + border-bottom: 1px solid #000; +} + +.widget { + border-bottom: 1px solid #000; +} + + diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php index 95ede29ed..beef5e49e 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.php +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -64,8 +64,6 @@ $toolicon_activecolour = '#fff'; if (! $font_colour) $font_colour = "#fff"; - if (! $widget_brdrcolour) - $widget_brdrcolour = "#000"; if (! $blockquote_colour) $blockquote_colour = "#eee"; if (! $blockquote_bgcolour) diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index adf2e632d..dc33e232a 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,50 +1,47 @@ {{include file="field_select.tpl" field=$schema}} -<div class="settings-submit-wrapper"> - <input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" /> -</div> - {{if $expert}} - -{{include file="field_checkbox.tpl" field=$narrow_navbar}} -{{include file="field_colorinput.tpl" field=$nav_bg}} -{{include file="field_colorinput.tpl" field=$nav_gradient_top}} -{{include file="field_colorinput.tpl" field=$nav_gradient_bottom}} -{{include file="field_colorinput.tpl" field=$nav_active_gradient_top}} -{{include file="field_colorinput.tpl" field=$nav_active_gradient_bottom}} -{{include file="field_colorinput.tpl" field=$nav_bd}} -{{include file="field_colorinput.tpl" field=$nav_icon_colour}} -{{include file="field_colorinput.tpl" field=$nav_active_icon_colour}} -{{include file="field_colorinput.tpl" field=$banner_colour}} -{{include file="field_colorinput.tpl" field=$link_colour}} -{{include file="field_colorinput.tpl" field=$bgcolour}} -{{include file="field_colorinput.tpl" field=$background_image}} -{{include file="field_colorinput.tpl" field=$item_colour}} -{{include file="field_colorinput.tpl" field=$comment_item_colour}} -{{include file="field_colorinput.tpl" field=$comment_border_colour}} -{{include file="field_input.tpl" field=$comment_indent}} -{{include file="field_colorinput.tpl" field=$toolicon_colour}} -{{include file="field_colorinput.tpl" field=$toolicon_activecolour}} + {{include file="field_colorinput.tpl" field=$nav_bg}} + {{include file="field_colorinput.tpl" field=$nav_gradient_top}} + {{include file="field_colorinput.tpl" field=$nav_gradient_bottom}} + {{include file="field_colorinput.tpl" field=$nav_active_gradient_top}} + {{include file="field_colorinput.tpl" field=$nav_active_gradient_bottom}} + {{include file="field_colorinput.tpl" field=$nav_bd}} + {{include file="field_colorinput.tpl" field=$nav_icon_colour}} + {{include file="field_colorinput.tpl" field=$nav_active_icon_colour}} + {{include file="field_input.tpl" field=$nav_min_opacity}} + {{include file="field_colorinput.tpl" field=$bgcolour}} + {{include file="field_colorinput.tpl" field=$background_image}} + {{include file="field_colorinput.tpl" field=$item_colour}} + {{include file="field_colorinput.tpl" field=$comment_item_colour}} + {{include file="field_colorinput.tpl" field=$comment_border_colour}} + {{include file="field_input.tpl" field=$comment_indent}} +{{/if}} {{include file="field_input.tpl" field=$body_font_size}} -{{include file="field_input.tpl" field=$font_size}} -{{include file="field_colorinput.tpl" field=$font_colour}} -{{include file="field_input.tpl" field=$radius}} -{{include file="field_input.tpl" field=$shadow}} -{{include file="field_input.tpl" field=$converse_width}} -{{include file="field_checkbox.tpl" field=$converse_center}} -{{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*}} +{{if $expert}} + {{include file="field_input.tpl" field=$font_size}} + {{include file="field_colorinput.tpl" field=$font_colour}} + {{include file="field_colorinput.tpl" field=$link_colour}} + {{include file="field_colorinput.tpl" field=$banner_colour}} + {{include file="field_colorinput.tpl" field=$toolicon_colour}} + {{include file="field_colorinput.tpl" field=$toolicon_activecolour}} + {{include file="field_input.tpl" field=$radius}} + {{include file="field_input.tpl" field=$shadow}} + {{include file="field_input.tpl" field=$top_photo}} + {{include file="field_input.tpl" field=$reply_photo}} + {{include file="field_input.tpl" field=$converse_width}} + {{include file="field_checkbox.tpl" field=$converse_center}} +{{/if}} +{{include file="field_checkbox.tpl" field=$narrow_navbar}} +{{if $expert}} <script> $(function(){ - $('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker(); + $('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker({format: 'rgba'}); $('#id_redbasic_nav_bd,#id_redbasic_nav_icon_colour ,#id_redbasic_nav_active_icon_colour,#id_redbasic_banner_colour,#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker(); $('#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker(); $('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour').colorpicker({format: 'rgba'}); }); </script> - -<div class="settings-submit-wrapper"> - <input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" /> -</div> {{/if}} +<div class="settings-submit-wrapper" > + <button type="submit" name="redbasic-settings-submit" class="btn btn-primary">{{$submit}}</button> +</div> |
