diff options
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 318 | ||||
| -rw-r--r-- | view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif | bin | 0 -> 4970 bytes | |||
| -rw-r--r-- | view/theme/redbasic/php/config.php | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 114 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/dark.php | 56 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 4 |
6 files changed, 326 insertions, 172 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8d91e0169..ba26f8910 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -92,14 +92,20 @@ code { font-family: Courier, monospace; display: block; overflow: auto; - border: 1px solid #444; - background: #EEE; - color: #444; + border: 1px solid $code_borderc; + background: $code_bgcolour; + color: $code_txtcolour; padding: 10px; margin-top: 20px; max-width: 80%; } +pre { + background: $pre_bgcolour; + color: $pre_txtcolour; + border:1px solid $pre_borderc; +} + blockquote { background-color: $blockquote_bgcolour; border-left: 4px solid $blockquote_bordercolour; @@ -146,7 +152,7 @@ header { .info-message { font-size: 1.1em; border: 1px solid #444; - background-color: #F0F0F0; + background-color: $infomess_bgcolour; padding: 10px; -moz-border-radius: $radiuspx; border-radius: $radiuspx; @@ -216,7 +222,7 @@ footer { } .preview { - background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif'); + background: url('../img/$preview_backgroundimg'); } #theme-preview { @@ -228,6 +234,21 @@ footer { margin-bottom: 15px; } +aside ul { + list-style-type: none; + margin: 0; + padding: 0; + /* border-left: 1px solid #eee; This and a 5px left border on the li is "interesting" + to delineate the list from the surrounding bits + */ +} + +aside li { + margin-top: 5px; + /* in order to achieve consistent indentation cross-browser, set margin-left on the li element e.g. */ + /* margin-left: 10px; */ +} + /*TODO: we should use one class for all this. */ .group-selected, .fileas-selected, .categories-selected, .search-selected, .active { color: $selected_active_colour !important; @@ -247,7 +268,6 @@ footer { } #main-login { - margin-left: 100px; margin-top: 50px; } @@ -366,6 +386,7 @@ footer { .vcard dl { clear: both; + word-wrap:break-word; } .vcard-profile-edit-icon { @@ -470,18 +491,6 @@ footer { } -.settings-widget ul { - list-style-type: none; - padding: 0px; -} - -.settings-widget li { - margin-left: 24px; - margin-bottom: 8px; -} - - - #fsuggest-desc, #fsuggest-submit-wrapper { margin-top: 15px; margin-bottom: 15px; @@ -631,35 +640,19 @@ footer { color: #0080FF; } -#netsearch-box { margin-bottom: 5px; } - -#search-save { - margin: 5px 0 0 5px; -} #side-follow-wrapper { margin-top: 20px; } -#side-peoplefind-url { - margin-top: 5px; -} - -#side-peoplefind-url { - font-size: 1em; -} - -#side-peoplefind-url::-webkit-input-placeholder { +#side-peoplefind-url::-webkit-input-placeholder, #side-advanced-peoplefind-url::-webkit-input-placeholder { font-family: FontAwesome; } -#side-peoplefind-url::-moz-placeholder { +#side-peoplefind-url::-moz-placeholder, #side-advanced-peoplefind-url::-moz-placeholder { font-family: FontAwesome; } -#side-peoplefind-submit { - margin-top: 15px; -} #side-match-link { margin-top: 10px; @@ -849,8 +842,6 @@ footer { float: left; display: block; width: 130px; - height: 18px; - overflow: hidden; } .profile-clear { @@ -1021,7 +1012,7 @@ footer { .profile-match-name { text-align: center; width: 120px; - height: 18px; + height: 1.5em; overflow: hidden !important; } @@ -1043,7 +1034,7 @@ footer { float: left; padding: 10px; width: 120px; - height: 120px; + min-height: 120px; scroll: auto; } #profile-match-wrapper-end { @@ -1121,14 +1112,6 @@ footer { } -#netsearch-box { - margin-top: 20px; -} - -#netsearch-box #search-submit { - margin: 5px 0px 0px 0px; -} - .required { color: #FF0000; } @@ -1236,6 +1219,10 @@ brain is weird like that */ } +.field input[type="checkbox"] { + width: 16px; +} + .field .onoff { float: left; width: 80px; @@ -1383,10 +1370,6 @@ brain is weird like that */ .tagged { background-position: -48px -48px; } .yellow { background-position: -64px -48px; } -.starred { - color: gold; -} - .icon.dim { opacity: 0.3;filter:alpha(opacity=30); } @@ -1402,11 +1385,10 @@ brain is weird like that */ max-height:150px; background-color:$acpopup_bgcolour; overflow:auto; - z-index:100000; border:1px solid $acpopup_bordercolour; } .acpopupitem { - background-color:$acpopup_bgcolour; padding: 4px; + background-color:$acpopup_bgcolour; clear:left; } .acpopupitem.taggable { @@ -1482,7 +1464,7 @@ div.jGrowl div.jGrowl-notification { .autocomplete { color: $font_colour; - background: #FFF; + background: $dropdown_bgcolour; cursor: pointer; text-align: left; max-height: 350px; @@ -1561,15 +1543,17 @@ header { } -#nav-notify-menu { - background: $notify_bgcolour; +#nav-notify-menu, #nav-network-menu, #nav-home-menu { + background-color: $notify_bgcolour; + border-top: none; + margin-top: $notify_topmargin; } -#nav-notify-menu a { +#nav-notify-menu a, #nav-network-menu a, #nav-home-menu a { color: $notify_linkcolour; } -#nav-notify-menu a:hover { +#nav-notify-menu a:hover, #nav-network-menu a:hover, #nav-home-menu a:hover { background: $notify_bghover; } @@ -1592,6 +1576,10 @@ header { clear: both; } +.modal-content { + background-color: $acl_bgcolour; +} + #acl-search { margin-top: 20px; padding: 8px; @@ -1609,7 +1597,7 @@ header { #acl-list { display: block; - border: 1px solid #cccccc; + border: 1px solid $acl_bordercolour; overflow: auto; clear: both; min-height: 62px; @@ -1622,7 +1610,7 @@ header { .acl-list-item { width: calc(50% - 10px); - border: 1px solid #cccccc; + border: 1px solid $acl_bordercolour; margin: 0px 0px 10px 10px; padding: 5px; float: left; @@ -1658,6 +1646,11 @@ header { .acl-button-hide { float: right; margin-left: 5px; + $aclbutton_linkcolour +} + +#acl-showall { + $aclbutton_linkcolour } .contact-block-content { @@ -1670,7 +1663,7 @@ header { .profile-match-connect { margin-top: 5px; } -.reshared-content { margin-left: 30px; } +.reshared-content { margin-left: 20px; } .shared_header img { margin-right: 10px; } .tag1 { @@ -1723,19 +1716,6 @@ header { .profile-thing-list { list-style-type: none; } -/* -.profile-thing-list li { - float: left; - margin-right: 25px; -} -*/ - - -div#pagelist-content-wrapper { -width: 80%; -margin-left: auto; -margin-right: auto; -} div.page-list-item { margin: 20px; @@ -1743,9 +1723,6 @@ margin: 20px; div#write-pages { display: block; -position: fixed; -top: 24px; -z-index: 99; background: silver; width: 100%; } @@ -1759,10 +1736,6 @@ margin-right: 50px; list-style-type: none; } -.pmenu li { - margin-left: -20px; -} - .admin-icons { font-size: 1.2em; color: $toolicon_colour; @@ -1800,10 +1773,6 @@ a .drop-icons:hover { font-size: 1.8em; } -.item-category { - margin-right: 10px; -} - .design-tools ul { list-style-type: none; } @@ -1834,6 +1803,10 @@ img.mail-list-sender-photo { /* jot */ +#profile-jot-wrapper { + max-width: $converse_width; +} + #jot-title, #jot-category, #jot-pagetitle { @@ -1914,6 +1887,7 @@ img.mail-list-sender-photo { /* conversation */ +.hide-comments-outer, .thread-wrapper .wall-item-comment-wrapper, .wall-item-content-wrapper.comment { margin-left: $comment_indent; @@ -1924,52 +1898,45 @@ img.mail-list-sender-photo { } .wall-item-content-wrapper { - border-radius: $radiuspx; background-color: $item_colour; opacity: $item_opacity; - border-left: 2px solid $item_bordercolour; - border-bottom: 1px solid $item_bordercolour; -} - -.wall-item-comment-wrapper { - margin-top: 10px; - border-left: 2px solid $item_bordercolour; - border-bottom: 1px solid $item_bordercolour; -} - -.wallwall .wwto { - top: $wwtop; + padding: 10px; } -.wall-item-photo-menu-button { - background-image: url("../img/photo-menu.jpg"); - background-position: top left; - background-repeat: no-repeat; - top: $pmenu_top; +.wall-item-content-wrapper { + border-top-right-radius: $radiuspx; + border-top-left-radius: $radiuspx; } -.wall-item-photo-menu { - border: 2px solid #444444; - background: #FFFFFF; - top: $top_photo; +.wall-item-content-wrapper:hover { + z-index:99; } - -.wall-item-photo-menu ul { - list-style: none +/* +.comment .wall-item-body { +padding-left: 42px; } - -.wall-item-photo-menu li a:hover { - color: #FFFFFF; - background: #3465A4; - text-decoration: none; + */ +.hide-comments-outer, +.wall-item-content-wrapper.comment { + background-color: $comment_item_colour; + border-left: 1px solid $comment_border_colour; + border-right: 1px solid $comment_border_colour; + border-bottom: 1px solid $comment_border_colour; + border-radius: 0px; + padding: 7px 10px 7px 7px; } -.comment .wall-item-photo-menu-button { - top: $pmenu_reply; +.wall-item-comment-wrapper { + background-color: $comment_item_colour; + border: 1px solid $item_colour; + border-radius: 0px; + border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radiuspx; } -.comment .wall-item-photo-menu { - top: $reply_photo; +.wall-item-like, +.wall-item-dislike { + font-size: 11px; } .wall-item-photo { @@ -1990,15 +1957,6 @@ img.mail-list-sender-photo { box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } -.wall-item-arrowphoto-wrapper { - top: $wwtop; -} - -.wall-item-lock { - font-size: 1.2em; - color: $toolicon_colour; -} - .wall-item-ago .icon-ok { color: darkgreen; } @@ -2009,11 +1967,12 @@ img.mail-list-sender-photo { } .wall-item-ago i { - font-size: 0.6em; + font-size: 0.8em; } .wall-item-content { font-size: $font_size; + clear: both; } .item-tool { @@ -2022,7 +1981,7 @@ img.mail-list-sender-photo { } .item-tool:hover { - color: $toolicon_activecolour; + /*color: $toolicon_activecolour;*/ } .like-rotator { @@ -2069,12 +2028,16 @@ img.mail-list-sender-photo { /* widgets */ .widget { - border-bottom: 1px solid #eec; + border-bottom: 1px solid $widget_brdrcolour; -moz-border-radius: $radiuspx; -webkit-border-radius: $radiuspx; border-radius: $radiuspx; } +.widget h3 { + color: $toolicon_colour; +} + #note-text { border: 1px solid #ccc; border-radius: $radiuspx; @@ -2094,7 +2057,7 @@ img.mail-list-sender-photo { border-radius: $radiuspx; -moz-border-radius: $radiuspx; } - +/* .categories-ul { list-style-type: none; } @@ -2102,6 +2065,7 @@ img.mail-list-sender-photo { #sidebar-group-list ul, #posted-date-selector { list-style-type: none; } +*/ .profile-thing-list img, .thing-show img, .thing-edit-links a { margin-top: 8px; @@ -2109,7 +2073,7 @@ img.mail-list-sender-photo { } .abook-self { - background-color: #ffdddd; + background-color: $abookself_bgcolour; } .online-now { @@ -2153,6 +2117,23 @@ nav .dropdown-menu { border-top-left-radius: 0px; border-bottom-right-radius: $radiuspx; border-bottom-left-radius: $radiuspx; + background-color: $notify_bgcolour; + border-top: none; + margin-top: $notify_topmargin; +} + +nav .dropdown-menu .divider{ + background-color: $navmenu_bgchover; +} + +nav .dropdown-menu>li>a{ + color: $notify_linkcolour; +} + +nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ + color: $notify_linkcolour; + background-color: $navmenu_bgchover; + $navmenu_bgimage } #usermenu-caret { @@ -2163,6 +2144,15 @@ nav .dropdown-menu { color: $nav_active_icon_colour; } +/* Files */ + +#attach-edit-perms { + margin-top: 25px; + margin-bottom: 20px; + font-weight: bold; + font-size: 17px; +} + /* bootstrap overrides */ blockquote { font-size: $body_font_size; @@ -2171,14 +2161,30 @@ blockquote { .dropdown-menu { font-size: $body_font_size; border-radius: $radiuspx; + background-color: $dropdown_bgcolour; +} + +.dropdown-menu >li > a { + color: $dropdown_textcolour; } +.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { + color: $dropdown_txtcolhover; + background-color: $dropdown_bgcolhover; + $dropdown_bgimghover +} .dropdown-menu img { border-radius: $radiuspx; } +.open .dropdown-toggle.btn-default { + color: $dropdown_togglecol; + background-color: $dropdown_togglebgcol; + border-color: $dropdown_bordercol; +} + .navbar-inverse { background-image: -webkit-linear-gradient(top, $nav_gradient_top 0%, $nav_gradient_bottom 100%); background-image: linear-gradient(to bottom, $nav_gradient_top 0%, $nav_gradient_bottom 100%); @@ -2247,36 +2253,46 @@ blockquote { } .nav-tabs{ - border-bottom:1px solid $navtabs_borderc !important; + border-bottom:1px solid $navtabs_borderc; } .nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{ - color: $navtabs_fontcolour !important; + color: $navtabs_fontcolour; background-color: $navtabs_bgcolour; } .nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ - border:1px solid $navtabs_borderc !important; - border-bottom:1px solid transparent !important; - bottom: -1px !important; + border:1px solid $navtabs_borderc; + border-bottom:1px solid transparent; } .nav-tabs.nav-justified > li > a { - border-bottom: none; $navtabs_linkcolour } .nav-tabs > li > a:hover, .nav-tabs > li > a:focus { text-decoration: $navtabs_decohover; background-color: $navtabs_bgchover; - border-bottom: 1px solid $navtabs_bgchover; - border-color: $navtabs_bgchover; + border-color: transparent; + border-bottom-color: $navtabs_borderc; $navtabs_linkchover } +@media (min-width: 768px) { + .nav-tabs.nav-justified > li > a { + border-bottom: 1px solid $navtabs_borderc; + } + .nav-tabs.nav-justified > .active > a, + .nav-tabs.nav-justified > .active > a:hover, + .nav-tabs.nav-justified > .active > a:focus { + border-bottom-color: transparent; + } +} + .btn-default { background-color: $editbuttons_bgcolour; border-color: $editbuttons_bordercolour; + color: $editbuttons_colour; text-shadow: none; box-shadow: none; } @@ -2288,6 +2304,14 @@ blockquote { text-decoration: $input_decohover; } +.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active { + text-decoration: none; +} + +.btn-preview, .btn-preview:hover, .btn-preview:focus, .btn-preview:active { + margin-right: 1px; +} + @media screen and (max-width: 767px) { aside#region_1 { background: rgba(0, 0, 0, .1); @@ -2311,15 +2335,7 @@ blockquote { .thread-wrapper.toplevel_item { width: 100%; - } - - .thread-wrapper .wall-item-comment-wrapper, - .wall-item-content-wrapper.comment { - margin-left: 24px; - } - - .hide-comments-outer { - margin-left: 24px; + border:1px; } .wall-item-photo { diff --git a/view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif b/view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif Binary files differnew file mode 100644 index 000000000..615c986bd --- /dev/null +++ b/view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index ab819f05b..a40fe67f2 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -20,6 +20,8 @@ function theme_content(&$a) { $arr['bgcolour'] = get_pconfig(local_user(),'redbasic', 'background_colour' ); $arr['background_image'] = get_pconfig(local_user(),'redbasic', 'background_image' ); $arr['item_colour'] = get_pconfig(local_user(),'redbasic', 'item_colour' ); + $arr['comment_item_colour'] = get_pconfig(local_user(),'redbasic', 'comment_item_colour' ); + $arr['comment_border_colour'] = get_pconfig(local_user(),'redbasic', 'comment_border_colour' ); $arr['item_opacity'] = get_pconfig(local_user(),'redbasic', 'item_opacity' ); $arr['toolicon_colour'] = get_pconfig(local_user(),'redbasic','toolicon_colour'); $arr['toolicon_activecolour'] = get_pconfig(local_user(),'redbasic','toolicon_activecolour'); @@ -56,6 +58,8 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'banner_colour', $_POST['redbasic_banner_colour']); set_pconfig(local_user(), 'redbasic', 'background_image', $_POST['redbasic_background_image']); set_pconfig(local_user(), 'redbasic', 'item_colour', $_POST['redbasic_item_colour']); + set_pconfig(local_user(), 'redbasic', 'comment_item_colour', $_POST['redbasic_comment_item_colour']); + set_pconfig(local_user(), 'redbasic', 'comment_border_colour', $_POST['redbasic_comment_border_colour']); set_pconfig(local_user(), 'redbasic', 'item_opacity', $_POST['redbasic_item_opacity']); set_pconfig(local_user(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']); set_pconfig(local_user(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']); @@ -111,6 +115,8 @@ if(feature_enabled(local_user(),'expert')) '$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $arr['bgcolour']), '$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']), '$item_colour' => array('redbasic_item_colour', t('Set the background colour of items'), $arr['item_colour']), + '$comment_item_colour' => array('redbasic_comment_item_colour', t('Set the background colour of comments'), $arr['comment_item_colour']), + '$comment_border_colour' => array('redbasic_comment_border_colour', t('Set the border colour of comments'), $arr['comment_border_colour']), '$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']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 8984df788..698adaf4d 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -24,7 +24,9 @@ if(! $a->install) { $background_image = get_pconfig($uid, "redbasic", "background_image"); $toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour'); $toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour'); - $item_colour = get_pconfig($uid, "redbasic", "item_colour"); + $item_colour = get_pconfig($uid, "redbasic", "item_colour"); + $comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour"); + $comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_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"); @@ -87,12 +89,16 @@ if(! $a->install) { $nav_icon_colour = "#999"; if (! $nav_active_icon_colour) $nav_active_icon_colour = "#fff"; + if (! $navmenu_bgchover) + $navmenu_bgchover = "#f5f5f5"; + if (! $navmenu_bgimage) + $navmenu_bgimage = ""; if (! $navtabs_borderc) - $navtabs_borderc = "#ddd"; + $navtabs_borderc = "rgba(204,204,204,0.8)"; if (! $navtabs_fontcolour) $navtabs_fontcolour = "#555"; if (! $navtabs_bgcolour) - $navtabs_bgcolour = "#fff"; + $navtabs_bgcolour = "rgba(254,254,254,0.4)"; if (! $navtabs_linkcolour) $navtabs_linkcolour = ""; if (! $navtabs_linkchover) @@ -100,9 +106,9 @@ if(! $a->install) { if (! $navtabs_decohover) $navtabs_decohover = "none"; if (! $navtabs_bgchover) - $navtabs_bgchover = "#eee"; + $navtabs_bgchover = "rgba(238,238,238,0.8)"; if (! $link_colour) - $link_colour = "#0080ff"; + $link_colour = "#428BCA"; if (! $banner_colour) $banner_colour = "#fff"; if (! $search_background) @@ -112,15 +118,17 @@ if(! $a->install) { if (! $background_image) $background_image =''; if (! $item_colour) - $item_colour = "#fdfdfd"; + $item_colour = "rgba(238,238,238,0.8)"; + if (! $comment_item_colour) + $comment_item_colour = "rgba(254,254,254,0.4)"; + if (! $comment_border_colour) + $comment_border_colour = "rgba(238,238,238,0.8)"; if (! $toolicon_colour) $toolicon_colour = '#777'; if (! $toolicon_activecolour) $toolicon_activecolour = '#000'; if (! $item_opacity) $item_opacity = "1"; - if (! $item_bordercolour) - $item_bordercolour = "#f4f4f4"; if (! $font_size) $font_size = "1.0em"; if (! $body_font_size) @@ -131,22 +139,56 @@ if(! $a->install) { $selected_active_colour = "#444"; if (! $selected_active_deco) $selected_active_deco = "none"; + if (! $widget_brdrcolour) + $widget_brdrcolour = "#eec"; if (! $blockquote_colour) $blockquote_colour = "#000"; if (! $blockquote_bgcolour) $blockquote_bgcolour = "#f4f8f9"; if (! $blockquote_bordercolour) $blockquote_bordercolour = "#dae4ee"; + if (! $code_borderc) + $code_borderc = "#444"; + if (! $code_bgcolour) + $code_bgcolour = "#EEE"; + if (! $code_txtcolour) + $code_txtcolour = "#444"; + if (! $pre_borderc) + $pre_borderc = "#ccc"; + if (! $pre_bgcolour) + $pre_bgcolour = "#F5F5F5"; + if (! $pre_txtcolour) + $pre_txtcolour = "#333"; if (! $notif_itemcolour) $notif_itemcolour = "#000"; if (! $notif_itemhovercolour) $notif_itemhovercolour = "#000"; if (! $editbuttons_bgcolour) - $editbuttons_bgcolour = "#fff"; + $editbuttons_bgcolour = "transparent"; if (! $editbuttons_bordercolour) $editbuttons_bordercolour = "#ccc"; + if (! $editbuttons_colour) + $editbuttons_colour = "#333"; if (! $editbuttons_bghover) $editbuttons_bghover = "#ebebeb"; + if (! $dropdown_bgcolour) + $dropdown_bgcolour = "#FFF"; + if (! $dropdown_textcolour) + $dropdown_textcolour = "#333"; + if (! $dropdown_txtcolhover) + $dropdown_txtcolhover = "#262626"; + if (! $dropdown_bgcolhover) + $dropdown_bgcolhover = "#F5F5F5"; + if (! $dropdown_bgimghover) + $dropdown_bgimghover = ""; + if (! $dropdown_togglecol) + $dropdown_togglecol = "#333"; + if (! $dropdown_togglebgcol) + $dropdown_togglebgcol = "#EBEBEB"; + if (! $dropdown_bordercol) + $dropdown_bordercol = "#ADADAD"; + if (! $preview_backgroundimg) + $preview_backgroundimg = "gray_and_white_diagonal_stripes_background_seamless.gif"; if (! $acpopup_bgcolour) $acpopup_bgcolour = "#fff"; if (! $acpopup_bordercolour) @@ -169,6 +211,8 @@ if(! $a->install) { $notifyseen_bghover = "#e7e7e7"; if (! $notifyseen_linkhover) $notifyseen_linkhover = "#333"; + if (! $notify_topmargin) + $notify_topmargin = "1px"; if (! $input_bgsubmit) $input_bgsubmit = "#F0F0F0"; if (! $input_linksubmit) @@ -180,24 +224,30 @@ if(! $a->install) { if (! $input_decohover) $input_decohover = "none"; if (! $radius) - $radius = "0"; + $radius = "4"; if (! $shadow) $shadow = "0"; if(! $active_colour) - $active_colour = '#fff'; + $active_colour = "#fff"; if (! $converse_width) { - $converse_width="1024px"; + $converse_width = "1024px"; } + if (! $acl_bgcolour) + $acl_bgcolour = "#fff"; + if (! $acl_bordercolour) + $acl_bordercolour = "#ccc"; + if (! $aclbutton_linkcolour) + $aclbutton_linkcolour = ""; + if (! $abookself_bgcolour) + $abookself_bgcolour = "#ffdddd"; if(! $top_photo) $top_photo = '48px'; - $pmenu_top = intval($top_photo) - 16 . 'px'; - $wwtop = intval($top_photo) - 15 . 'px'; - $comment_indent = intval($top_photo) + 10 . 'px'; - + if(! $comment_indent) + $comment_indent = '0px'; if(! $reply_photo) $reply_photo = '32px'; - $pmenu_reply = intval($reply_photo) - 16 . 'px'; - + if(! $infomess_bgcolour) + $infomess_bgcolour = "#F0F0F0"; if($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; $nav_percent_min_opacity = 100; @@ -222,6 +272,8 @@ $options = array ( '$nav_bd' => $nav_bd, '$nav_icon_colour' => $nav_icon_colour, '$nav_active_icon_colour' => $nav_active_icon_colour, +'$navmenu_bgchover' => $navmenu_bgchover, +'$navmenu_bgimage' => $navmenu_bgimage, '$navtabs_borderc' => $navtabs_borderc, '$navtabs_fontcolour' => $navtabs_fontcolour, '$navtabs_bgcolour' => $navtabs_bgcolour, @@ -235,8 +287,9 @@ $options = array ( '$bgcolour' => $bgcolour, '$background_image' => $background_image, '$item_colour' => $item_colour, +'$comment_item_colour' => $comment_item_colour, +'$comment_border_colour' => $comment_border_colour, '$item_opacity' => $item_opacity, -'$item_bordercolour' => $item_bordercolour, '$toolicon_colour' => $toolicon_colour, '$toolicon_activecolour' => $toolicon_activecolour, '$font_size' => $font_size, @@ -244,15 +297,32 @@ $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, '$blockquote_bgcolourhover' => $blockquote_bgcolourhover, +'$code_borderc' => $code_borderc, +'$code_bgcolour' => $code_bgcolour, +'$code_txtcolour' => $code_txtcolour, +'$pre_borderc' => $pre_borderc, +'$pre_bgcolour' => $pre_bgcolour, +'$pre_txtcolour' => $pre_txtcolour, '$notif_itemcolour' => $notif_itemcolour, '$notif_itemhovercolour' => $notif_itemhovercolour, '$editbuttons_bgcolour' => $editbuttons_bgcolour, '$editbuttons_bordercolour' => $editbuttons_bordercolour, +'$editbuttons_colour' => $editbuttons_colour, '$editbuttons_bghover' => $editbuttons_bghover, +'$dropdown_bgcolour' => $dropdown_bgcolour, +'$dropdown_textcolour' => $dropdown_textcolour, +'$dropdown_txtcolhover' => $dropdown_txtcolhover, +'$dropdown_bgcolhover' => $dropdown_bgcolhover, +'$dropdown_bgimghover' => $dropdown_bgimghover, +'$dropdown_togglecol' => $dropdown_togglecol, +'$dropdown_togglebgcol' => $dropdown_togglebgcol, +'$dropdown_bordercol' => $dropdown_bordercol, +'$preview_backgroundimg' => $preview_backgroundimg, '$acpopup_bgcolour' => $acpopup_bgcolour, '$acpopup_bordercolour' => $acpopup_bordercolour, '$acpopup_tgbl_bgcolour' => $acpopup_tgbl_bgcolour, @@ -264,6 +334,7 @@ $options = array ( '$notifyseen_linkcolour' => $notifyseen_linkcolour, '$notifyseen_bghover' => $notifyseen_bghover, '$notifyseen_linkhover' => $notifyseen_linkhover, +'$notify_topmargin' => $notify_topmargin, '$input_bgsubmit' => $input_bgsubmit, '$input_linksubmit' => $input_linksubmit, '$input_border' => $input_border, @@ -273,10 +344,15 @@ $options = array ( '$shadow' => $shadow, '$active_colour' => $active_colour, '$converse_width' => $converse_width, +'$acl_bgcolour' => $acl_bgcolour, +'$acl_bordercolour' => $acl_bordercolour, +'$aclbutton_linkcolour' => $aclbutton_linkcolour, +'$abookself_bgcolour' => $abookself_bgcolour, '$nav_float_min_opacity' => $nav_float_min_opacity, '$nav_percent_min_opacity' => $nav_percent_min_opacity, '$top_photo' => $top_photo, '$reply_photo' => $reply_photo, +'$infomess_bgcolour' => $infomess_bgcolour, '$pmenu_top' => $pmenu_top, '$pmenu_reply' => $pmenu_reply, '$wwtop' => $wwtop, diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 27fbd26fc..4da020116 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -16,6 +16,10 @@ $nav_icon_colour = "#999"; if (! $nav_active_icon_colour) $nav_active_icon_colour = "#fff"; + if (! $navmenu_bgchover) + $navmenu_bgchover = "#222"; + if (! $navmenu_bgimage) + $navmenu_bgimage = "background-image: none;"; if (! $navtabs_borderc) $navtabs_borderc = "#333"; if (! $navtabs_fontcolour) @@ -43,19 +47,37 @@ if (! $bgcolour) $bgcolour = "#111"; if (! $item_colour) - $item_colour = "#111"; + $item_colour = "rgba(28,28,28,0.8)"; + if (! $comment_item_colour) + $comment_item_colour = "rgba(18,18,18,0.4)"; + if (! $comment_border_colour) + $comment_border_colour = "rgba(28,28,28,0.8)"; if (! $toolicon_colour) $toolicon_colour = '#999'; if (! $toolicon_activecolour) $toolicon_activecolour = '#fff'; if (! $font_colour) $font_colour = "#ccc"; + if (! $widget_brdrcolour) + $widget_brdrcolour = "#333"; if (! $blockquote_colour) $blockquote_colour = "#ccc"; if (! $blockquote_bgcolour) $blockquote_bgcolour = "#1e1e1e"; if (! $blockquote_bordercolour) $blockquote_bordercolour = "#666"; + if (! $code_borderc) + $code_borderc = "#090909"; + if (! $code_bgcolour) + $code_bgcolour = "#000"; + if (! $code_txtcolour) + $code_txtcolour = "#bbb"; + if (! $pre_borderc) + $pre_borderc = "#090909"; + if (! $pre_bgcolour) + $pre_bgcolour = "#000"; + if (! $pre_txtcolour) + $pre_txtcolour = "#bbb"; if (! $item_bordercolour) $item_bordercolour = "#333"; if (! $notif_itemcolour) @@ -74,14 +96,36 @@ $editbuttons_bgcolour = "#1e1e1e"; if (! $editbuttons_bordercolour) $editbuttons_bordercolour = "#222"; + if (! $editbuttons_colour) + $editbuttons_colour = "#ccc"; if (! $editbuttons_bghover) $editbuttons_bghover = "#222"; + if (! $dropdown_bgcolour) + $dropdown_bgcolour = "#222"; + if (! $dropdown_textcolour) + $dropdown_textcolour = "#ccc"; + if (! $dropdown_txtcolhover) + $dropdown_txtcolhover = "#ddd"; + if (! $dropdown_bgcolhover) + $dropdown_bgcolhover = "#333"; + if (! $dropdown_bgimghover) + $dropdown_bgimghover = "background-image: none;"; + if (! $dropdown_togglecol) + $dropdown_togglecol = "#ccc"; + if (! $dropdown_togglebgcol) + $dropdown_togglebgcol = "#222"; + if (! $dropdown_bordercol) + $dropdown_bordercol = "#222"; + if (! $preview_backgroundimg) + $preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif"; if (! $notify_bgcolour) $notify_bgcolour = "#000"; if (! $notify_linkcolour) $notify_linkcolour = "#FFF"; if (! $notify_bghover) $notify_bghover = "#222"; + if (! $notify_topmargin) + $notify_topmargin = "-1px"; if (! $notifyseen_bgcolour) $notifyseen_bgcolour = "#111"; if (! $notifyseen_linkcolour) @@ -100,3 +144,13 @@ $input_colourhover = "#fff"; if (! $input_decohover) $input_decohover = "underline"; + if (! $acl_bgcolour) + $acl_bgcolour = "#111"; + if (! $acl_bordercolour) + $acl_bordercolour = "#333"; + if (! $aclbutton_linkcolour) + $aclbutton_linkcolour = "color: #fff;"; + if (! $abookself_bgcolour) + $abookself_bgcolour = "#251111"; + if(! $infomess_bgcolour) + $infomess_bgcolour = "#333"; diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index b20d17804..effdc6705 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -19,6 +19,8 @@ {{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=$item_opacity}} {{include file="field_colorinput.tpl" field=$toolicon_colour}} {{include file="field_colorinput.tpl" field=$toolicon_activecolour}} @@ -37,7 +39,7 @@ $(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_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_item_colour,#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,#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker(); }); </script> |
