aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/converse_center.css5
-rw-r--r--view/theme/redbasic/css/narrow_navbar.css8
-rw-r--r--view/theme/redbasic/css/style.css357
-rw-r--r--view/theme/redbasic/js/redbasic.js40
-rw-r--r--view/theme/redbasic/php/config.php5
-rw-r--r--view/theme/redbasic/php/style.php39
-rw-r--r--view/theme/redbasic/php/theme_init.php7
-rw-r--r--view/theme/redbasic/schema/dark.php34
-rw-r--r--view/theme/redbasic/tpl/theme_settings.tpl44
9 files changed, 269 insertions, 270 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 8ad18e6c7..edee90fe6 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -7,6 +7,10 @@
/* generals */
+html {
+ height: 100%;
+}
+
body {
font-family: arial,freesans,sans-serif;
font-size: $body_font_size;
@@ -16,6 +20,7 @@ body {
background-size: cover;
color: $font_colour;
margin: 0px;
+ height: 100%;
}
.jslider {
font-family: arial,freesans,sans-serif;
@@ -74,6 +79,11 @@ input[type="submit"] {
text-decoration: none;
}
+button, input, optgroup, select, textarea {
+ color: #000;
+}
+
+
pre code {
border: none;
}
@@ -103,15 +113,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%;
@@ -128,48 +129,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);
-}
-
-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 {
@@ -200,10 +163,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;
@@ -232,32 +191,6 @@ header #banner #logo-text {
font-size: 22px;
}
-.tabs {
- height: 28px;
- border-bottom: 1px solid #aaaaaa;
- padding:0px;
- width: 90%;
-}
-
-.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;
- padding: 0px;
- padding-right: 8px;
-}
-
/* footer */
footer {
@@ -300,10 +233,6 @@ footer {
color: #444444 !important;
}
-.smalltext {
- font-size: 0.7em;
-}
-
#sysmsg {
margin-bottom: 10px;
}
@@ -415,6 +344,10 @@ footer {
color: #444444;
}
+.vcard {
+ padding: 8px;
+}
+
.vcard .title {
margin-bottom: 5px;
}
@@ -487,9 +420,9 @@ footer {
#profile-photo-wrapper img {
- width:175px;
- height:175px;
padding: 12px;
+ width: 201px;
+ height: 201px;
}
#profile-in-dir-yes-label,
@@ -689,7 +622,7 @@ footer {
#netsearch-box { margin-bottom: 5px; }
#search-save {
- margin-left: 5px;
+ margin: 5px 0 0 5px;
}
#side-follow-wrapper {
@@ -785,6 +718,7 @@ footer {
#contact-block {
margin-top: 25px;
+ padding: 8px;
}
#contact-block-numcontacts {
@@ -794,8 +728,8 @@ footer {
.contact-block-div {
float: left;
- width: 52px;
- height: 52px;
+ width: 50px;
+ height: 50px;
}
.contact-block-textdiv {
float: left;
@@ -880,6 +814,7 @@ footer {
}
#search-text {
+ border: 1px solid #ccc;
font-size: 1em;
}
@@ -1298,7 +1233,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 {
@@ -1488,6 +1423,9 @@ div.jGrowl div.info {
right: 15px;
}
+div.jGrowl div.jGrowl-notification {
+ min-height: 60px;
+}
#id_term_label {
width:75px;
@@ -1503,13 +1441,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;
@@ -1576,7 +1521,7 @@ header {
right: 43%;
margin: 0px;
padding: 0px;
- z-index: 1400;
+ z-index: 1040;
color: #fff;
}
@@ -1607,105 +1552,81 @@ header {
clear: both;
}
-#acl-wrapper {
- width: 690px;
- float:left;
-}
-
#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;
+ display: block;
border: 1px solid #cccccc;
- clear: both;
- margin-top: 30px;
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;
+ width: calc(50% - 10px);
border: 1px solid #cccccc;
- margin: 5px;
+ 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-hide.selected {
- color: #000000;
- background-color: #ff4141;
- background-image: url("../../../../images/hide_on.png");
+.acl-button-show,
+.acl-button-hide {
+ float: right;
+ margin-left: 5px;
}
-.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; }
@@ -1772,7 +1693,6 @@ header {
div#pagelist-content-wrapper {
width: 80%;
-background: #fff;
margin-left: auto;
margin-right: auto;
}
@@ -1940,55 +1860,23 @@ 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 */
.thread-wrapper .wall-item-comment-wrapper,
.wall-item-content-wrapper.comment {
margin-left: $comment_indent;
- border-left: 2px solid #eee;
}
.thread-wrapper.toplevel_item {
@@ -1999,6 +1887,14 @@ img.mail-list-sender-photo {
border-radius: $radiuspx;
background-color: $item_colour;
opacity: $item_opacity;
+ border-left: 2px solid #f4f4f4;
+ border-bottom: 1px solid #f4f4f4;
+}
+
+.wall-item-comment-wrapper {
+ margin-top: 10px;
+ border-left: 2px solid #f4f4f4;
+ border-bottom: 1px solid #f4f4f4;
}
.wallwall .wwto {
@@ -2067,7 +1963,6 @@ img.mail-list-sender-photo {
color: darkgreen;
}
-
.wall-item-ago {
color: #777;
font-size: 0.8em;
@@ -2164,7 +2059,7 @@ img.mail-list-sender-photo {
list-style-type: none;
}
-#sidebar-group-list ul {
+#sidebar-group-list ul, #posted-date-selector {
list-style-type: none;
}
@@ -2296,14 +2191,72 @@ blockquote {
background-color: $nav_active_icon_colour;
}
-#expand-aside {
+#expand-aside,
+#expand-tabs {
color: $nav_active_icon_colour;
padding: 7px 10px;
}
-@media (max-width:767px) {
+#tabs-collapse-1 {
+ padding: 0px;
+ margin-bottom: 25px;
+ border-top: none;
+ box-shadow: none;
+}
+
+@media screen and (max-width: 767px) {
aside#region_1 {
background: rgba(0, 0, 0, .1);
border-right: 1px solid $nav_bd;
}
+
+ main {
+ -webkit-transition: all 0.25s ease-out;
+ -moz-transition: all 0.25s ease-out;
+ transition: all 0.25s ease-out;
+ }
+
+ main {
+ left: -231px;
+ width: calc( 100% + 231px );
+ }
+
+ main.region_1-on {
+ left: 0px;
+ }
+
+ .thread-wrapper.toplevel_item {
+ width: 100%;
+ }
+
+ .thread-wrapper .wall-item-comment-wrapper,
+ .wall-item-content-wrapper.comment {
+ margin-left: 24px;
+ }
+
+ .wall-item-info {
+ margin-right: 10px;
+ }
+
+ .hide-comments-outer {
+ margin-left: 24px;
+ }
+
+ .comment-edit-photo {
+ margin: 10px;
+ }
+
+ .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/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 7e957a4f4..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=show_hide]').click(function() {
+$('#expand-aside').click(function() {
$('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
- $('#region_1').toggleClass('hidden-xs');
+ $('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..ab819f05b 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' );
@@ -29,6 +29,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");
@@ -64,6 +65,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']);
@@ -118,6 +120,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 8fb4de381..49852036b 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -18,20 +18,21 @@ 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");
+ $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');
@@ -116,10 +117,11 @@ if(! $a->install) {
$shadow = "0";
if(! $active_colour)
$active_colour = '#FFFFFF';
- if (! $converse_width)
- $converse_width="1024px";
+ if (! $converse_width) {
+ $converse_width="1024px";
+ }
if(! $top_photo)
- $top_photo = '64px';
+ $top_photo = '48px';
$pmenu_top = intval($top_photo) - 16 . 'px';
$wwtop = intval($top_photo) - 15 . 'px';
$comment_indent = intval($top_photo) + 10 . 'px';
@@ -141,6 +143,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,
@@ -173,7 +177,8 @@ $options = array (
'$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 +190,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/dark.php b/view/theme/redbasic/schema/dark.php
index bd3642914..24ed4f418 100644
--- a/view/theme/redbasic/schema/dark.php
+++ b/view/theme/redbasic/schema/dark.php
@@ -1,10 +1,34 @@
<?php
- if (! $nav_colour)
- $nav_colour = "black";
+ if (! $nav_bg)
+ $nav_bg = "#000000";
+ if (! $nav_gradient_top)
+ $nav_gradient_top = "#000000";
+ if (! $nav_gradient_bottom)
+ $nav_gradient_bottom = "#000000";
+ if (! $nav_active_gradient_top)
+ $nav_active_gradient_top = "#333333";
+ if (! $nav_active_gradient_bottom)
+ $nav_active_gradient_bottom = "#111111";
+ if (! $nav_bd)
+ $nav_bd = "#111111";
+ if (! $nav_icon_colour)
+ $nav_icon_colour = "#999999";
+ if (! $nav_active_icon_colour)
+ $nav_active_icon_colour = "#ffffff";
+ if (! $link_colour)
+ $link_colour = "#ffffff";
+ if (! $banner_colour)
+ $banner_colour = "#999999";
+ if (! $search_background)
+ $search_background = "#999999";
if (! $bgcolour)
- $bgcolour = '#010101';
+ $bgcolour = "#111111";
if (! $item_colour)
- $item_colour = '#111';
+ $item_colour = "#111111";
+ if (! $toolicon_colour)
+ $toolicon_colour = '#999999';
+ if (! $toolicon_activecolour)
+ $toolicon_activecolour = '#ffffff';
if (! $font_colour)
- $font_colour = '#fff';
+ $font_colour = "#cccccc";
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 34c04e91c..b20d17804 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -4,33 +4,43 @@
</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_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_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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-11 13:28:59 +0000