diff options
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/redbasic/css/converse_center.css | 5 | ||||
| -rw-r--r-- | view/theme/redbasic/css/narrow_navbar.css | 8 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 690 | ||||
| -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/js/redbasic.js | 38 | ||||
| -rw-r--r-- | view/theme/redbasic/php/config.php | 11 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 240 | ||||
| -rw-r--r-- | view/theme/redbasic/php/theme_init.php | 7 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/BS-Default.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/dark.php | 156 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 46 |
11 files changed, 789 insertions, 414 deletions
diff --git a/view/theme/redbasic/css/converse_center.css b/view/theme/redbasic/css/converse_center.css new file mode 100644 index 000000000..3b3ecddc9 --- /dev/null +++ b/view/theme/redbasic/css/converse_center.css @@ -0,0 +1,5 @@ +body { + margin-left: auto; + margin-right: auto; + max-width: $body_width; +} diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css index b05f46797..cfda9760e 100644 --- a/view/theme/redbasic/css/narrow_navbar.css +++ b/view/theme/redbasic/css/narrow_navbar.css @@ -1,8 +1,9 @@ +@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: 25px; -width: 25px; +height: 30px; +width: 30px; margin: 2px 0px 1px 10px; border-radius: 0px; } @@ -12,7 +13,7 @@ border-radius: 0px; #nav-search-text {margin:5px;} header #banner {margin-top:5px;} nav .dropdown-menu { -top: 30px;} +top: 33px;} nav .badge { position: relative; top: -30px; @@ -24,4 +25,5 @@ nav .badge { #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 3b61ceab1..a8baa4877 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -66,16 +66,16 @@ textarea { } input { - border: 1px solid #666666; + border: 1px solid $input_border; -moz-border-radius: $radiuspx; border-radius: $radiuspx; padding: 3px; } input[type="submit"] { - background-color: #F0F0F0; + background-color: $input_bgsubmit; font-weight: bold; - color: #0080FF; + color: $input_linksubmit; text-decoration: none; } @@ -92,19 +92,25 @@ 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: #f4f8f9; - border-left: 4px solid #dae4ee; + background-color: $blockquote_bgcolour; + border-left: 4px solid $blockquote_bordercolour; padding: 0.4em; - color: #000; + color: $blockquote_colour; margin-left: 20px; } @@ -113,15 +119,6 @@ blockquote { padding: 5px; } -#panel { - background-color: ivory; - position: absolute; - z-index: 2; - width: 30%; - padding: 25px; - border: 1px solid #444; -} - .heart { color: #FF0000; font-size: 100%; @@ -138,51 +135,10 @@ blockquote { filter:alpha(opacity=100); } - -#langselector { - position: fixed; - top: 3px; - left: 5px; - z-index:9999; - opacity: 0.3; - filter:alpha(opacity=30); - - -} -#langselector:hover { - opacity: 1.0; - filter:alpha(opacity=100); -} - -/* this is not yet supported - -nav { - background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); - background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); - background-image: -moz-linear-gradient(bottom,$nav_bg_1 26%, $nav_bg_2 82%); - background-image: -webkit-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); - background-image: -ms-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); +nav, +header { opacity: $nav_float_min_opacity; filter:alpha(opacity=$nav_percent_min_opacity); - -} - -nav:hover { - background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - background-image: -moz-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - background-image: -webkit-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - background-image: -ms-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); - opacity: 1.0; - filter:alpha(opacity=100); - -} -*/ - -nav #site-location { - color: #888a85; - font-size: 0.8em; - position: absolute; } .error-message { @@ -196,7 +152,7 @@ nav #site-location { .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; @@ -213,10 +169,6 @@ nav #banner #logo-text a { } nav #banner #logo-text a:hover { text-decoration: none; } -header #site-location { - display: none; -} - header #banner { overflow: hidden; text-align: center; @@ -245,31 +197,6 @@ header #banner #logo-text { font-size: 22px; } -.tabs { - height: 28px; - border-bottom: 1px solid #aaaaaa; - padding:0px; - width: 100%; -} - -.tabs li { margin: 0px; list-style: none; } -.tab { - display:block; - float:left; - margin-right: 15px ; -} - -.tab.active { - color: #444444; -} - -ul.tabs { - margin-top: 0px; - margin-bottom: 0px; - list-style-type: none; - -} - /* footer */ footer { @@ -295,7 +222,7 @@ footer { } .preview { - background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif'); + background: url('../img/$preview_backgroundimg'); } #theme-preview { @@ -307,13 +234,33 @@ 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: #444444 !important; + color: $selected_active_colour !important; + text-decoration: $selected_active_deco !important; } -.smalltext { - font-size: 0.7em; +.fileas-all { + text-decoration: none !important; +} + +.fileas-all:hover { + text-decoration: underline !important; } #sysmsg { @@ -321,7 +268,6 @@ footer { } #main-login { - margin-left: 100px; margin-top: 50px; } @@ -368,13 +314,16 @@ footer { #login-extra-links { clear: both; + width: 300px; } -#register-link, -#lost-password-link { +#register-link { float: left; margin-left: 100px; } +#lost-password-link { + float: right; +} #login-standard-end { clear: both; @@ -427,12 +376,17 @@ footer { color: #444444; } +.vcard { + padding: 8px; +} + .vcard .title { margin-bottom: 5px; } .vcard dl { clear: both; + word-wrap:break-word; } .vcard-profile-edit-icon { @@ -499,9 +453,9 @@ footer { #profile-photo-wrapper img { - width:175px; - height:175px; padding: 12px; + width: 201px; + height: 201px; } #profile-in-dir-yes-label, @@ -537,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; @@ -698,35 +640,19 @@ footer { color: #0080FF; } -#netsearch-box { margin-bottom: 5px; } - -#search-save { - margin-left: 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; @@ -773,18 +699,18 @@ footer { .rconnect { display: block; - color: #FFFFFF; + color: $nav_active_icon_colour; margin-top: 15px; background-color: $nav_bg; -webkit-border-radius: $radiuspx ; -moz-border-radius: $radiuspx; border-radius: $radiuspx; + border: 1px solid $nav_bd; padding: 5px; font-weight: bold; clear: both; } - #pause { position: fixed; bottom: 5px; @@ -797,6 +723,7 @@ footer { #contact-block { margin-top: 25px; + padding: 8px; } #contact-block-numcontacts { @@ -806,8 +733,8 @@ footer { .contact-block-div { float: left; - width: 52px; - height: 52px; + width: 50px; + height: 50px; } .contact-block-textdiv { float: left; @@ -892,6 +819,7 @@ footer { } #search-text { + border: 1px solid #ccc; font-size: 1em; } @@ -905,15 +833,15 @@ footer { .location-label, .gender-label, .marital-label, .homepage-label { float: left; - text-align: right; display: block; - width: 65px; + width: 70px; + } .adr, .x-gender, .marital-text, .homepage-url { float: left; display: block; - margin-left: 8px; + width: 130px; } .profile-clear { @@ -1084,7 +1012,7 @@ footer { .profile-match-name { text-align: center; width: 120px; - height: 18px; + height: 1.5em; overflow: hidden !important; } @@ -1106,7 +1034,7 @@ footer { float: left; padding: 10px; width: 120px; - height: 120px; + min-height: 120px; scroll: auto; } #profile-match-wrapper-end { @@ -1184,14 +1112,6 @@ footer { } -#netsearch-box { - margin-top: 20px; -} - -#netsearch-box #search-submit { - margin: 5px 0px 0px 0px; -} - .required { color: #FF0000; } @@ -1299,6 +1219,10 @@ brain is weird like that */ } +.field input[type="checkbox"] { + width: 16px; +} + .field .onoff { float: left; width: 80px; @@ -1310,7 +1234,7 @@ brain is weird like that */ background-image:url("../../../../images/onoff.jpg"); background-repeat: no-repeat; padding: 4px 2px 2px 2px; - height: 16px; + height: 24px; text-decoration: none; } .field .onoff .off { @@ -1463,23 +1387,28 @@ brain is weird like that */ /* autocomplete popup */ .acpopup { max-height:150px; - background-color:#ffffff; + background-color:$acpopup_bgcolour; overflow:auto; - z-index:100000; - border:1px solid #cccccc; + border:1px solid $acpopup_bordercolour; } .acpopupitem { - background-color:#ffffff; padding: 4px; + background-color:$acpopup_bgcolour; clear:left; } .acpopupitem.taggable { - background-color: #ddddff; + background-color: $acpopup_tgbl_bgcolour; } .acpopupitem img { float: left; margin-right: 4px; } +.acpopupitem:hover { + text-decoration: underline; + color: $acpopup_hovercolour; + cursor:pointer; +} + .acpopupitem.selected { color: #FFFFFF; background: #3465A4; } @@ -1500,6 +1429,9 @@ div.jGrowl div.info { right: 15px; } +div.jGrowl div.jGrowl-notification { + min-height: 60px; +} #id_term_label { width:75px; @@ -1515,13 +1447,20 @@ div.jGrowl div.info { border-top: none; } -#search-text-ac .autocomplete, +#search-text-ac .autocomplete { + margin-top: 2px; + margin-left: $radiuspx; + border: 1px solid #ccc; + border-top: none; +} + #recip-ac .autocomplete, #poke-recip-ac .autocomplete, #id-name-ac .autocomplete, #contact-search-ac .autocomplete { margin-top: 2px; margin-left: $radiuspx; + margin-right: $radiuspx; border: 1px solid #666; border-top: none; @@ -1529,7 +1468,7 @@ div.jGrowl div.info { .autocomplete { color: $font_colour; - background: #FFF; + background: $dropdown_bgcolour; cursor: pointer; text-align: left; max-height: 350px; @@ -1563,7 +1502,7 @@ div.jGrowl div.info { } a.rconnect { - color: #ffffff; + color: $nav_active_icon_colour; text-decoration: none; outline: none; } @@ -1588,16 +1527,17 @@ header { right: 43%; margin: 0px; padding: 0px; - z-index: 1400; + z-index: 1040; color: #fff; } .notif-item a { - color: #000000; + color: $notif_itemcolour; } .notif-item a:hover { text-decoration: underline; + color: $notif_itemhovercolour; } .notif-image { @@ -1606,8 +1546,29 @@ header { padding: 7px 7px 0px 0px; } -.notify-seen { - background: #DDDDDD; + +#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-network-menu a, #nav-home-menu a { + color: $notify_linkcolour; +} + +#nav-notify-menu a:hover, #nav-network-menu a:hover, #nav-home-menu a:hover { + background: $notify_bghover; +} + +.notify-seen a { + background: $notifyseen_bgcolour; + color: $notifyseen_linkcolour !important; +} + +.notify-seen a:hover { + background: $notifyseen_bghover; + color: $notifyseen_linkhover !important; } #page-spinner { @@ -1619,109 +1580,94 @@ header { clear: both; } -#acl-wrapper { - width: 690px; - float:left; +.modal-content { + background-color: $acl_bgcolour; } #acl-search { - float:right; - background: #ffffff url("../../../../images/search_18.png") no-repeat right center; - padding-right:20px; + margin-top: 20px; + padding: 8px; + border: 1px solid #ccc; + width: 100%; } -#acl-showall { - float: left; - display: block; - width: auto; - height: 18px; - background-color: #cccccc; - background-image: url("../../../../images/show_all_off.png"); - background-position: 7px 7px; - background-repeat: no-repeat; - padding: 7px 5px 0px 30px; - -webkit-border-radius: $radiuspx; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; - color: #999999; + +#acl-search::-webkit-input-placeholder { + font-family: FontAwesome; } -#acl-showall.selected { - color: #000000; - background-color: #ff9900; - background-image: url("../../../../images/show_all_on.png"); + +#acl-search::-moz-placeholder { + font-family: FontAwesome; } #acl-list { - height: 210px; - border: 1px solid #cccccc; - clear: both; - margin-top: 30px; + display: block; + border: 1px solid $acl_bordercolour; overflow: auto; + clear: both; + min-height: 62px; + margin-top: 20px; + padding: 10px 10px 0px 0px; + -webkit-border-radius: $radiuspx ; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; } -#acl-list-content { - -} + .acl-list-item { - display: block; - width: 150px; - height: 30px; - border: 1px solid #cccccc; - margin: 5px; + width: calc(50% - 10px); + border: 1px solid $acl_bordercolour; + margin: 0px 0px 10px 10px; + padding: 5px; float: left; + -webkit-border-radius: $radiuspx ; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; } + .acl-list-item img{ - width:22px; - height: 22px; + width: 40px; + height: 40px; float: left; - margin: 4px; + margin-right: 5px; + -webkit-border-radius: $radiuspx ; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; } + .acl-list-item.taggable { background-color: #ddddff; } -.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} -.acl-list-item a { - font-size: 8px; - display: block; - width: 40px; - height: 10px; - float: left; - color: #999999; - background-color: #cccccc; - background-position: 3px 3px; - background-repeat: no-repeat; - margin-right: 5px; - -webkit-border-radius: 2px ; - -moz-border-radius: 2px; - border-radius: 2px; - padding-left: 15px; -} -#acl-wrapper a:hover { - text-decoration: none; - color:#000000; +.acl-list-item p { + font-size: $font_size; + margin: 0px; + overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } -.acl-button-show { background-image: url("../../../../images/show_off.png"); } -.acl-button-hide { background-image: url("../../../../images/hide_off.png"); } -.acl-button-show.selected { - color: #000000; - background-color: #9ade00; - background-image: url("../../../../images/show_on.png"); +.acl-button-show, +.acl-button-hide { + float: right; + margin-left: 5px; + $aclbutton_linkcolour } -.acl-button-hide.selected { - color: #000000; - background-color: #ff4141; - background-image: url("../../../../images/hide_on.png"); + +#acl-showall { + $aclbutton_linkcolour } -.acl-list-item.groupshow { border-color: #9ade00; } -.acl-list-item.grouphide { border-color: #ff4141; } .contact-block-content { margin-top: 8px; } +.contact-block-img.archived { + opacity: 0.3; + filter:alpha(opacity=30); +} .profile-match-connect { margin-top: 5px; } -.reshared-content { margin-left: 30px; } +.reshared-content { margin-left: 20px; } .shared_header img { margin-right: 10px; } .tag1 { @@ -1774,20 +1720,6 @@ header { .profile-thing-list { list-style-type: none; } -/* -.profile-thing-list li { - float: left; - margin-right: 25px; -} -*/ - - -div#pagelist-content-wrapper { -width: 80%; -background: #fff; -margin-left: auto; -margin-right: auto; -} div.page-list-item { margin: 20px; @@ -1795,9 +1727,6 @@ margin: 20px; div#write-pages { display: block; -position: fixed; -top: 24px; -z-index: 99; background: silver; width: 100%; } @@ -1811,10 +1740,6 @@ margin-right: 50px; list-style-type: none; } -.pmenu li { - margin-left: -20px; -} - .admin-icons { font-size: 1.2em; color: $toolicon_colour; @@ -1852,10 +1777,6 @@ a .drop-icons:hover { font-size: 1.8em; } -.item-category { - margin-right: 10px; -} - .design-tools ul { list-style-type: none; } @@ -1886,6 +1807,10 @@ img.mail-list-sender-photo { /* jot */ +#profile-jot-wrapper { + max-width: $converse_width; +} + #jot-title, #jot-category, #jot-pagetitle { @@ -1952,55 +1877,24 @@ img.mail-list-sender-photo { #profile-jot-text-loading { color: #777; -} - -#profile-jot-submit { - background: linear-gradient(top, #0080ff 0%, #0080aa); - background: -webkit-linear-gradient(top, #0080ff 0%, #0080aa); - background: -moz-linear-gradient(top, #0080ff 0%, #0080aa); - background: -o-linear-gradient(top, #0080ff 0%, #0080aa); - background: -ms-linear-gradient(top, #0080ff 0%, #0080aa); - color: #fff; - font-weight: bold; - border-radius: 0px $radiuspx $radiuspx 0px; - text-shadow: 1px 1px #111; - cursor: pointer; -} - -#profile-jot-submit:hover { - background: linear-gradient(top, #0080aa 0%, #0080ff); - background: -webkit-linear-gradient(top, #0080aa 0%, #0080ff); - background: -moz-linear-gradient(top, #0080aa 0%, #0080ff); - background: -o-linear-gradient(top, #0080aa 0%, #0080ff); - background: -ms-linear-gradient(top, #0080aa 0%, #0080ff); -} - -#profile-jot-perms { - background-color: $toolicon_colour; - border: 1px solid #666; - border-right: none; - border-radius: $radiuspx 0px 0px $radiuspx; + display: none; } #profile-rotator { color: #777; } +#jot-perms-icon, .jot-icons { - font-size: 1.2em; color: $toolicon_colour; } -.jot-icons:hover { - color: $toolicon_activecolour; -} - /* conversation */ +.hide-comments-outer, .thread-wrapper .wall-item-comment-wrapper, .wall-item-content-wrapper.comment { margin-left: $comment_indent; - border-left: 2px solid #eee; } .thread-wrapper.toplevel_item { @@ -2008,44 +1902,41 @@ img.mail-list-sender-photo { } .wall-item-content-wrapper { - border-radius: $radiuspx; background-color: $item_colour; opacity: $item_opacity; + padding: 10px; } -.wallwall .wwto { - top: $wwtop; -} - -.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-photo-menu { - border: 2px solid #444444; - background: #FFFFFF; - top: $top_photo; +.wall-item-content-wrapper { + border-top-right-radius: $radiuspx; + border-top-left-radius: $radiuspx; } -.wall-item-photo-menu ul { - list-style: none +.wall-item-content-wrapper:hover { + z-index:99; } -.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: 3px 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-left: 3px 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: $body_font_size; + text-align: left; + white-space: normal; } .wall-item-photo { @@ -2066,31 +1957,22 @@ 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; } - .wall-item-ago { color: #777; font-size: 0.8em; } .wall-item-ago i { - font-size: 0.6em; + font-size: 0.8em; } .wall-item-content { font-size: $font_size; + clear: both; } .item-tool { @@ -2099,7 +1981,7 @@ img.mail-list-sender-photo { } .item-tool:hover { - color: $toolicon_activecolour; + /*color: $toolicon_activecolour;*/ } .like-rotator { @@ -2146,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; @@ -2171,14 +2057,15 @@ img.mail-list-sender-photo { border-radius: $radiuspx; -moz-border-radius: $radiuspx; } - +/* .categories-ul { list-style-type: none; } -#sidebar-group-list ul { +#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; @@ -2186,7 +2073,7 @@ img.mail-list-sender-photo { } .abook-self { - background-color: #ffdddd; + background-color: $abookself_bgcolour; } .online-now { @@ -2230,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 { @@ -2240,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; @@ -2248,12 +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%); @@ -2308,11 +2239,79 @@ blockquote { background-color: $nav_active_icon_colour; } -#expand-aside { +#expand-aside, +#expand-tabs { color: $nav_active_icon_colour; padding: 7px 10px; } +#tabs-collapse-1 { + padding: 0px; + margin-bottom: 25px; + border-top: none; + box-shadow: none; +} + +.nav-tabs{ + 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; + 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; + border-bottom:1px solid transparent; +} + +.nav-tabs.nav-justified > li > a { + $navtabs_linkcolour +} + +.nav-tabs > li > a:hover, .nav-tabs > li > a:focus { + text-decoration: $navtabs_decohover; + background-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; +} + +.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active { + background-color: $editbuttons_bghover; + border-color: $editbuttons_bordercolour; + color: $input_colourhover; + 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); @@ -2326,11 +2325,30 @@ blockquote { } main { - left: -227px; - width: calc( 100% + 227px ); + left: -231px; + width: calc( 100% + 231px ); } main.region_1-on { left: 0px; } + + .thread-wrapper.toplevel_item { + width: 100%; + } + + .wall-item-photo { + width: 48px !important; + height: 48px !important; + } + + .comment .wall-item-photo { + width: 32px !important; + height: 32px !important; + } + + .acl-list-item { + width: calc(100% - 10px); + } + } 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/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index bec7c55c8..20902fe1a 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -1,5 +1,3 @@ - - function cmtBbOpen(comment, id) { if($(comment).hasClass('comment-edit-text-full')) { $(".comment-edit-bb-" + id).show(); @@ -22,35 +20,25 @@ function cmtBbClose(comment, id) { $(document).ready(function() { -$('[data-toggle=offcanvas]').click(function() { +$('#expand-aside').click(function() { $('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left'); $('main').toggleClass('region_1-on'); }); -$('.group-edit-icon').hover( - function() { - $(this).css('opacity','1.0');}, - function() { - $(this).css('opacity','0');} -); - -$('.sidebar-group-element').hover( - function() { - id = $(this).attr('id'); - $('#edit-' + id).css('opacity','1.0');}, - - function() { - id = $(this).attr('id'); - $('#edit-' + id).css('opacity','0');} - ); +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'); + } + $('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up'); +}); -$('.savedsearchdrop').hover( - function() { - $(this).css('opacity','1.0');}, - function() { - $(this).css('opacity','0');} - ); +if($('#tabs-collapse-1').length == 0) { + $('#expand-tabs').hide(); +} }); diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 608a9bda7..a40fe67f2 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -6,7 +6,7 @@ function theme_content(&$a) { $arr = array(); $arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' ); - $arr['narrow_navbar'] = get_pconfig(local_user(),'redbasic', 'narrow_navbar' ); + $arr['narrow_navbar'] = get_pconfig(local_user(),'redbasic', 'narrow_navbar' ); $arr['nav_bg'] = get_pconfig(local_user(),'redbasic', 'nav_bg' ); $arr['nav_gradient_top'] = get_pconfig(local_user(),'redbasic', 'nav_gradient_top' ); $arr['nav_gradient_bottom'] = get_pconfig(local_user(),'redbasic', 'nav_gradient_bottom' ); @@ -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'); @@ -29,6 +31,7 @@ function theme_content(&$a) { $arr['radius'] = get_pconfig(local_user(),'redbasic', 'radius' ); $arr['shadow'] = get_pconfig(local_user(),'redbasic', 'photo_shadow' ); $arr['converse_width']=get_pconfig(local_user(),"redbasic","converse_width"); + $arr['converse_center']=get_pconfig(local_user(),"redbasic","converse_center"); $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"); @@ -55,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']); @@ -64,6 +69,7 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']); set_pconfig(local_user(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']); set_pconfig(local_user(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']); + set_pconfig(local_user(), 'redbasic', 'converse_center', $_POST['redbasic_converse_center']); 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']); @@ -109,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']), @@ -118,6 +126,7 @@ if(feature_enabled(local_user(),'expert')) '$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']), '$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']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index c3153a025..698adaf4d 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -18,20 +18,23 @@ if(! $a->install) { $nav_active_icon_colour = get_pconfig($uid, "redbasic", "nav_active_icon_colour"); $narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar'); $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); - $link_colour = get_pconfig($uid, "redbasic", "link_colour"); + $link_colour = get_pconfig($uid, "redbasic", "link_colour"); $schema = get_pconfig($uid,'redbasic','schema'); - $bgcolour = get_pconfig($uid, "redbasic", "background_colour"); - $background_image = get_pconfig($uid, "redbasic", "background_image"); + $bgcolour = get_pconfig($uid, "redbasic", "background_colour"); + $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_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"); - $converse_width=get_pconfig($uid,"redbasic","converse_width"); + $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"); + $font_colour = get_pconfig($uid, "redbasic", "font_colour"); + $radius = get_pconfig($uid, "redbasic", "radius"); + $shadow = get_pconfig($uid,"redbasic","photo_shadow"); + $converse_width=get_pconfig($uid,"redbasic","converse_width"); + $converse_center=get_pconfig($uid,"redbasic","converse_center"); $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'); @@ -86,8 +89,26 @@ 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 = "rgba(204,204,204,0.8)"; + if (! $navtabs_fontcolour) + $navtabs_fontcolour = "#555"; + if (! $navtabs_bgcolour) + $navtabs_bgcolour = "rgba(254,254,254,0.4)"; + if (! $navtabs_linkcolour) + $navtabs_linkcolour = ""; + if (! $navtabs_linkchover) + $navtabs_linkchover = ""; + if (! $navtabs_decohover) + $navtabs_decohover = "none"; + if (! $navtabs_bgchover) + $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) @@ -97,9 +118,13 @@ 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 = '#777777'; + $toolicon_colour = '#777'; if (! $toolicon_activecolour) $toolicon_activecolour = '#000'; if (! $item_opacity) @@ -109,25 +134,120 @@ if(! $a->install) { if (! $body_font_size) $body_font_size = "11px"; if (! $font_colour) - $font_colour = "#4D4D4D"; + $font_colour = "#4d4d4d"; + if (! $selected_active_colour) + $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 = "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) + $acpopup_bordercolour = "#ccc"; + if (! $acpopup_tgbl_bgcolour) + $acpopup_tgbl_bgcolour = "#ddddff"; + if (! $acpopup_hovercolour) + $acpopup_hovercolour = "#000"; + if (! $notify_bgcolour) + $notify_bgcolour = "#fff"; + if (! $notify_linkcolour) + $notify_linkcolour = "#333"; + if (! $notify_bghover) + $notify_bghover = "#e7e7e7"; + if (! $notifyseen_bgcolour) + $notifyseen_bgcolour = "#ddd"; + if (! $notifyseen_linkcolour) + $notifyseen_linkcolour = "#333"; + if (! $notifyseen_bghover) + $notifyseen_bghover = "#e7e7e7"; + if (! $notifyseen_linkhover) + $notifyseen_linkhover = "#333"; + if (! $notify_topmargin) + $notify_topmargin = "1px"; + if (! $input_bgsubmit) + $input_bgsubmit = "#F0F0F0"; + if (! $input_linksubmit) + $input_linksubmit = "#0080FF"; + if (! $input_border) + $input_border = "#666"; + if (! $input_colourhover) + $input_colourhover = "#333"; + if (! $input_decohover) + $input_decohover = "none"; if (! $radius) - $radius = "0"; + $radius = "4"; if (! $shadow) $shadow = "0"; if(! $active_colour) - $active_colour = '#FFFFFF'; - if (! $converse_width) - $converse_width="1024px"; + $active_colour = "#fff"; + if (! $converse_width) { + $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; @@ -141,6 +261,8 @@ if(! $a->install) { if(file_exists('view/theme/redbasic/css/style.css')) { $x = file_get_contents('view/theme/redbasic/css/style.css'); +$body_width = (231 + $converse_width) . 'px'; // aside is 231px + converse width; have to find a way for calculation with 'px', cannot handle '%' + $options = array ( '$nav_bg' => $nav_bg, '$nav_gradient_top' => $nav_gradient_top, @@ -150,30 +272,92 @@ $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, +'$navtabs_linkcolour' => $navtabs_linkcolour, +'$navtabs_linkchover' => $navtabs_linkchover, +'$navtabs_bgchover' => $navtabs_bgchover, +'$navtabs_decohover' => $navtabs_decohover, '$link_colour' => $link_colour, '$banner_colour' => $banner_colour, '$search_background' => $search_background, '$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, '$toolicon_colour' => $toolicon_colour, '$toolicon_activecolour' => $toolicon_activecolour, '$font_size' => $font_size, '$font_colour' => $font_colour, +'$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, +'$acpopup_hovercolour' => $acpopup_hovercolour, +'$notify_bgcolour' => $notify_bgcolour, +'$notify_linkcolour' => $notify_linkcolour, +'$notify_bghover' => $notify_bghover, +'$notifyseen_bgcolour' => $notifyseen_bgcolour, +'$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, +'$input_colourhover' => $input_colourhover, +'$input_decohover' => $input_decohover, '$radius' => $radius, '$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, -'$comment_indent' => $comment_indent +'$comment_indent' => $comment_indent, +'$body_width' => $body_width ); echo str_replace(array_keys($options), array_values($options), $x); @@ -185,3 +369,7 @@ if($sloppy_photos && file_exists('view/theme/redbasic/css/sloppy_photos.css')) { if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { echo file_get_contents('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); +} diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php index 12f49efa7..2da04a389 100644 --- a/view/theme/redbasic/php/theme_init.php +++ b/view/theme/redbasic/php/theme_init.php @@ -5,10 +5,15 @@ head_add_css('library/bootstrap/css/bootstrap-theme.min.css'); head_add_css('library/bootstrap/css/bootstrap.min.css'); head_add_css('view/css/bootstrap-red.css'); head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css'); - +//head_add_css('library/colorpicker/css/colorpicker.css'); +head_add_css('library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css'); require_once('view/php/theme_init.php'); head_add_js('library/bootstrap/js/bootstrap.min.js'); head_add_js('library/bootstrap/js/bootbox.min.js'); head_add_js('library/bootstrap-datetimepicker/js/moment.js'); head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js'); +//head_add_js('library/colorpicker/js/colorpicker.js'); +head_add_js('library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js'); +//head_add_js('library/bootstrap-colorpicker/src/js/docs.js'); + diff --git a/view/theme/redbasic/schema/BS-Default.php b/view/theme/redbasic/schema/BS-Default.php index f93e879e3..ce464fe2c 100644 --- a/view/theme/redbasic/schema/BS-Default.php +++ b/view/theme/redbasic/schema/BS-Default.php @@ -18,3 +18,5 @@ $nav_active_icon_colour = "#555"; if (! $radius) $radius = "4"; + if (! $banner_colour) + $banner_colour = "#777"; diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index bd3642914..4da020116 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -1,10 +1,156 @@ <?php - if (! $nav_colour) - $nav_colour = "black"; + if (! $nav_bg) + $nav_bg = "#000"; + if (! $nav_gradient_top) + $nav_gradient_top = "#000"; + if (! $nav_gradient_bottom) + $nav_gradient_bottom = "#000"; + if (! $nav_active_gradient_top) + $nav_active_gradient_top = "#333"; + if (! $nav_active_gradient_bottom) + $nav_active_gradient_bottom = "#111"; + if (! $nav_bd) + $nav_bd = "#111"; + if (! $nav_icon_colour) + $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) + $navtabs_fontcolour = "#fff"; + if (! $navtabs_bgcolour) + $navtabs_bgcolour = "#111"; + if (! $navtabs_linkcolour) + $navtabs_linkcolour = "color: #ccc;"; + if (! $navtabs_linkchover) + $navtabs_linkchover = "color: #fff;"; + if (! $navtabs_bgchover) + $navtabs_bgchover = "#222"; + if (! $navtabs_decohover) + $navtabs_decohover = "underline"; + if (! $link_colour) + $link_colour = "#fff"; + if (! $selected_active_colour) + $selected_active_colour = "#fff"; + if (! $selected_active_deco) + $selected_active_deco = "underline"; + if (! $banner_colour) + $banner_colour = "#999"; + if (! $search_background) + $search_background = "#999"; if (! $bgcolour) - $bgcolour = '#010101'; + $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 = '#fff'; + $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) + $notif_itemcolour = "#ccc"; + if (! $notif_itemhovercolour) + $notif_itemhovercolour = "#fff"; + if (! $acpopup_bgcolour) + $acpopup_bgcolour = "#222"; + if (! $acpopup_bordercolour) + $acpopup_bordercolour = "#333"; + if (! $acpopup_tgbl_bgcolour) + $acpopup_tgbl_bgcolour = "#333"; + if (! $acpopup_hovercolour) + $acpopup_hovercolour = "#fff"; + if (! $editbuttons_bgcolour) + $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) + $notifyseen_linkcolour = "#222"; + if (! $notifyseen_bghover) + $notifyseen_bghover = "#222"; + if (! $notifyseen_linkhover) + $notifyseen_linkhover = "#CCC"; + if (! $input_bgsubmit) + $input_bgsubmit = "#333"; + if (! $input_linksubmit) + $input_linksubmit = "#fff"; + if (! $input_border) + $input_border = "#222"; + if (! $input_colourhover) + $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 34c04e91c..effdc6705 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -4,33 +4,45 @@ </div> {{if $expert}} + {{include file="field_checkbox.tpl" field=$narrow_navbar}} -{{include file="field_input.tpl" field=$nav_bg}} -{{include file="field_input.tpl" field=$nav_gradient_top}} -{{include file="field_input.tpl" field=$nav_gradient_bottom}} -{{include file="field_input.tpl" field=$nav_active_gradient_top}} -{{include file="field_input.tpl" field=$nav_active_gradient_bottom}} -{{include file="field_input.tpl" field=$nav_bd}} -{{include file="field_input.tpl" field=$nav_icon_colour}} -{{include file="field_input.tpl" field=$nav_active_icon_colour}} -{{include file="field_input.tpl" field=$banner_colour}} -{{include file="field_input.tpl" field=$link_colour}} -{{include file="field_input.tpl" field=$bgcolour}} -{{include file="field_input.tpl" field=$background_image}} -{{include file="field_input.tpl" field=$item_colour}} +{{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=$item_opacity}} -{{include file="field_input.tpl" field=$toolicon_colour}} -{{include file="field_input.tpl" field=$toolicon_activecolour}} +{{include file="field_colorinput.tpl" field=$toolicon_colour}} +{{include file="field_colorinput.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_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_input.tpl" field=$nav_min_opacity *}} +{{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}} +<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_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_comment_item_colour,#id_redbasic_comment_border_colour,#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker(); + }); +</script> + <div class="settings-submit-wrapper"> <input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" /> </div> |
