aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/redbasic
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme/redbasic')
-rw-r--r--view/theme/redbasic/css/style.css229
-rw-r--r--view/theme/redbasic/js/redbasic.js20
-rw-r--r--view/theme/redbasic/php/config.php3
-rw-r--r--view/theme/redbasic/php/style.php10
-rw-r--r--view/theme/redbasic/schema/bluegrid.css17
-rw-r--r--view/theme/redbasic/schema/boxy.css6
-rw-r--r--view/theme/redbasic/schema/dark.css30
-rw-r--r--view/theme/redbasic/schema/simple_black_on_white.css13
-rw-r--r--view/theme/redbasic/schema/simple_green_on_black.css26
-rw-r--r--view/theme/redbasic/schema/simple_white_on_black.css21
-rw-r--r--view/theme/redbasic/tpl/theme_settings.tpl2
11 files changed, 226 insertions, 151 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 5fcf901fb..903900e7f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -128,8 +128,6 @@ pre {
.heart {
color: #FF0000;
- font-size: 100%;
- margin-right: 5px;
}
nav,
@@ -174,6 +172,7 @@ header #banner {
z-index: 1040;
margin-top: 14px;
text-align: center;
+ text-shadow: 1px 1px 2px rgba(0,0,0,.5);
font-size: 14px;
font-family: tahoma, "Lucida Sans", sans;
color: $banner_colour;
@@ -259,34 +258,6 @@ footer {
clear: both;
}
-#profile-edit-links {
- padding-top: 15px;
- padding-bottom: 15px;
-}
-
-#profile-edit-links .btn {
- margin: 0 10px 15px 0;
-}
-
-.profile-import {
- vertical-align: top;
- text-align: left;
-}
-
-.profile-import b {
- color: $link_colour;
-}
-
-.profile-import input {
- color: $font_colour;
- border: none;
-}
-
-#profile-edit-drop-link {
- color: #FFF;
- font-weight: normal;
-}
-
.fn {
font-weight: bold;
font-size: 16px;
@@ -295,9 +266,9 @@ footer {
.vcard {
margin-bottom: 10px;
- padding: 10px;
+ padding: 0px 10px 10px 10px;
background-color: rgba(254,254,254,0.5);
- border-bottom: 1px solid rgba(238,238,238,0.8);
+ border: 1px solid rgba(254,254,254,0.5);
-moz-border-radius: $radiuspx;
-webkit-border-radius: $radiuspx;
border-radius: $radiuspx;
@@ -310,6 +281,11 @@ footer {
margin-bottom: 0px;
}
+.connect-btn-wrapper {
+ margin-bottom: 10px;
+
+}
+
.profile-edit-side-link {
padding: 3px 0px;
opacity: 0;
@@ -336,9 +312,7 @@ footer {
#profile-photo-wrapper {
width: 251px;
height: 251px;
- margin-top: -10px;
margin-bottom: 10px;
- border: 1px solid #ccc;
border-radius: $radiuspx;
}
@@ -354,37 +328,6 @@ footer {
margin-bottom: 15px;
}
-.profile-listing-photo-wrapper {
- float: left;
-}
-
-.profile-listing-edit-buttons-wrapper {
- clear: both;
-}
-.profile-listing-photo-edit-link {
- float: left;
- width: 125px;
-}
-.profile-listing-end {
- clear: both;
-}
-.profile-listing-edit-buttons-wrapper img{
- border: none;
- margin-right: 20px;
-}
-.profile-listing {
- margin-top: 25px;
-}
-.profile-listing-name {
- float: left;
- margin-left: 32px;
- margin-top: 10px;
- color: #3172BD;
- font-weight: bold;
- width: 200px;
-
-}
-
.app-name {
overflow: none;
}
@@ -475,53 +418,15 @@ footer {
float: right;
}
-.rconnect {
- display: block;
- 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;
-}
-
-a.rateme, div.rateme {
- display: block;
- color: $nav_active_icon_colour;
- 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;
right: 5px;
}
-#vcard-end {
- clear: both;
-}
-
#contact-block {
width: 100%;
float: left;
- background-color: rgba(254,254,254,0.5);
- border-bottom: 1px solid rgba(238,238,238,0.8);
- -moz-border-radius: $radiuspx;
- -webkit-border-radius: $radiuspx;
- border-radius: $radiuspx;
- padding: 10px;
- margin-bottom:10px;
}
#contact-block-numcontacts {
@@ -995,6 +900,9 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
margin-bottom: 18px;
}
+#jot-preview-content {
+ margin-top: 10px;
+}
.acl-list-item {
width: 48%; /* fallback if browser does not support calc() */
width: calc(50% - 10px);
@@ -1007,7 +915,15 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
border-radius: $radiuspx;
}
-.acl-list-item img{
+.acl-list-item.grouphide {
+ border: 1px solid red;
+}
+
+.acl-list-item.groupshow {
+ border: 1px solid green;
+}
+
+.acl-list-item img {
width: 40px;
height: 40px;
float: left;
@@ -1172,7 +1088,6 @@ img.mail-conv-sender-photo {
.jothidden {
font-weight: bold;
- border-radius: $radiuspx;
}
.jothidden input::-webkit-input-placeholder {
@@ -1183,23 +1098,26 @@ img.mail-conv-sender-photo {
font-weight: bold;
}
-.jothidden > input {
- border: 1px solid transparent;
- background-color: transparent;
-}
-.jothidden > input:hover,
-.jothidden > input:focus {
- border: 1px solid #cccccc;
- background-color: #fff;
+
+
+#profile-jot-wrapper {
+ background-color: rgba(254,254,254,1);
+ border: 1px solid #ccc;
+ border-radius: $radiuspx;
+
}
#profile-jot-text {
- color:#000;
- border: 1px solid #cccccc;
- -moz-border-radius: $radiuspx;
+ resize: none;
+ border-width: 0px;
border-radius: $radiuspx;
}
+#profile-jot-text:focus {
+ resize: vertical;
+}
+
+
#profile-jot-text::-webkit-input-placeholder {
font-size:16px;
}
@@ -1266,6 +1184,11 @@ img.mail-conv-sender-photo {
font-size: $font_size;
}
+.wall-item-footer {
+ font-size: $body_font_size;
+ margin-top: 2em;
+}
+
.wall-item-content-wrapper {
background-color: $item_colour;
border-top-right-radius: $radiuspx;
@@ -1340,7 +1263,9 @@ img.mail-conv-sender-photo {
.wall-item-content,
.mail-conv-body,
-.page-body {
+.page-body,
+.chat-item-text,
+.chat-item-text-self {
font-size: $font_size;
clear: both;
}
@@ -1394,8 +1319,8 @@ img.mail-conv-sender-photo {
/* widgets */
.widget {
- background-color: rgba(254,254,254,0.5);
- border-bottom: 1px solid rgba(238,238,238,0.8);
+ background-color: rgba(254,254,254,.5);
+ border: 1px solid rgba(254,254,254,.5);
-moz-border-radius: $radiuspx;
-webkit-border-radius: $radiuspx;
border-radius: $radiuspx;
@@ -1439,13 +1364,19 @@ img.mail-conv-sender-photo {
cursor: pointer;
}
-.chat-item-photo {
+.chat-item-photo,
+.chat-item-photo-self {
border-radius: $radiuspx;
}
-.chat-item-text {
+.chat-item-title,
+.chat-item-title-self {
+ border-radius: $radiuspx;
+ background-color: $item_colour;
+}
+
+#chatMembers img {
border-radius: $radiuspx;
- background-color: #eee;
}
/* nav bootstrap */
@@ -1533,7 +1464,7 @@ nav .dropdown-menu {
.section-content-tools-wrapper {
padding: 7px 10px;
background-color: $comment_item_colour;
- border-bottom: 3px solid $comment_item_colour;
+ border-bottom: 3px solid comment_item_colour;
}
.section-content-info-wrapper {
@@ -1567,6 +1498,7 @@ nav .dropdown-menu {
.section-content-tools-wrapper .section-content-danger-wrapper,
.section-content-wrapper .section-content-danger-wrapper {
margin-bottom: 10px;
+ border-bottom: none;
border-radius: $radiuspx;
}
@@ -1586,6 +1518,36 @@ nav .dropdown-menu {
word-wrap: break-word;
}
+main.fullscreen {
+ left: 0px;
+ width: 100%;
+ height: 100%;
+ max-width: none;
+}
+
+main.fullscreen .generic-content-wrapper {
+ position: absolute;
+ width: 100%;
+ top: 0px;
+ left: 0px;
+ border-radius: 0px;
+}
+
+main.fullscreen .section-title-wrapper {
+ border-radius: 0px;
+}
+
+main.fullscreen .section-content-wrapper,
+main.fullscreen .section-content-wrapper-np {
+ border-radius: 0px;
+}
+
+#inline-btn {
+ display: none;
+}
+
+.chatroom-index-row:hover td,
+.locs-index-row:hover td,
[id^="cloud-index-"]:hover td,
.cloud-index-active {
background-color: $item_colour;
@@ -1724,6 +1686,12 @@ nav .badge.mail-update:hover {
padding: 7px 10px;
}
+.nav-tabs.nav-justified {
+ background-color: rgba(254,254,254,.5);
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+}
+
.nav-tabs.nav-justified > .active > a,
.nav-tabs.nav-justified > .active > a:hover,
.nav-tabs.nav-justified > .active > a:focus {
@@ -1761,9 +1729,7 @@ nav .badge.mail-update:hover {
}
main {
- -webkit-transition: all 0.25s ease-out;
- -moz-transition: all 0.25s ease-out;
- transition: all 0.25s ease-out;
+ transition: all 0.25s ease-in-out;
}
main {
@@ -1834,13 +1800,13 @@ nav .badge.mail-update:hover {
/* Modified original CSS to match input in Redbasic */
.jothidden .bootstrap-tagsinput {
- border-color: $bgcolour;
- background-color: $bgcolour;
+ border: 0px solid transparent;
+ margin-bottom: 0px;
box-shadow: none;
display: inline-block;
border-radius: $radiuspx;
cursor: text;
- padding: 0px 8px;
+ padding: 0px 10px;
width: 100%;
}
@@ -1848,11 +1814,6 @@ nav .badge.mail-update:hover {
font-size: 100%;
}
-.jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus {
- border: 1px solid #ccc;
- background-color: #fff;
-}
-
/* Abusing theme-green is less work than makeing a new new one */
.theme-green .back-bar .selected-bar { background-color: #000000; background-image: none; !important }
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 302efc365..877bcd840 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -2,12 +2,13 @@
* redbasic theme specific JavaScript
*/
$(document).ready(function() {
+
// CSS3 calc() fallback (for unsupported browsers)
$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
if( $('#css3-calc').width() == 10) {
$(window).resize(function() {
if($(window).width() < 767) {
- $('main').css('width', $(window).width() + 285 );
+ $('main').css('width', $(window).width() + 287 );
} else {
$('main').css('width', '100%' );
}
@@ -38,9 +39,7 @@ $(document).ready(function() {
$("input[data-role=cat-tagsinput]").tagsinput({
tagClass: 'label label-primary'
});
-});
-$(document).ready(function(){
var doctitle = document.title;
function checkNotify() {
var notifyUpdateElem = document.getElementById('notify-update');
@@ -53,3 +52,18 @@ $(document).ready(function(){
}
setInterval(function () {checkNotify();}, 10 * 1000);
});
+
+function makeFullScreen(full) {
+ if(typeof full=='undefined' || full == true) {
+ $('main').css({'transition': 'none'}).addClass('fullscreen');
+ $('#fullscreen-btn, header, nav, aside').css({'display': 'none'});
+ $('#inline-btn').show();
+
+ }
+ else {
+ $('main').removeClass('fullscreen');
+ $('#fullscreen-btn, header, nav, aside').css({'display': ''});
+ $('#inline-btn').hide();
+ $('main').css({'transition': ''});
+ }
+}
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 6bea5bddb..04cf4f904 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -97,7 +97,8 @@ if(feature_enabled(local_channel(),'expert'))
$t = get_markup_template('theme_settings.tpl');
$o .= replace_macros($t, array(
'$submit' => t('Submit'),
- '$baseurl' => $a->get_baseurl(),
+ '$baseurl' => z_root(),
+ '$theme' => App::$channel['channel_theme'],
'$expert' => $expert,
'$title' => t("Theme settings"),
'$schema' => array('redbasic_schema', t('Select scheme'), $arr['schema'], '', $scheme_choices),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index a0da5e302..83c35935a 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -1,6 +1,6 @@
<?php
-if(! $a->install) {
+if(! App::$install) {
// Get the UID of the channel owner
$uid = get_theme_uid();
@@ -40,7 +40,6 @@ if(! $a->install) {
$nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity');
$top_photo=get_pconfig($uid,'redbasic','top_photo');
$reply_photo=get_pconfig($uid,'redbasic','reply_photo');
-
}
// Now load the scheme. If a value is changed above, we'll keep the settings
@@ -154,7 +153,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
$x = file_get_contents('view/theme/redbasic/css/style.css');
- $aside_width = 285;
+ $aside_width = 287;
// left aside and right aside are 285px + converse width
if($align_left) {
@@ -216,3 +215,8 @@ if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) {
if($schemecss) {
echo $schemecss;
}
+
+// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this.
+
+if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic')
+ set_pconfig(local_channel(), 'redbasic', 'schema', '---');
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index 820e84baa..36e26302a 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -2,7 +2,7 @@ body {
background-size: auto;
}
-.generic-content-wrapper-styled, #profile-jot-wrapper {
+.generic-content-wrapper-styled {
background-color: rgba(67,72,138,.8);
color: #FFF;
}
@@ -11,6 +11,11 @@ body {
border: 1px solid #FFF;
}
+#profile-jot-wrapper {
+ background-color: inherit;
+ border: none;
+}
+
.generic-content-wrapper-styled a:hover, .generic-content-wrapper-styled a:focus, .generic-content-wrapper-styled .field.checkbox:hover label, .generic-content-wrapper-styled .field.checkbox:focus label, .allcontact-link:hover, .allcontact-link:focus {
color: rgba(255,255,255,.8);
}
@@ -160,6 +165,14 @@ nav .badge:hover, nav .badge:focus {
color: rgba(255,255,255,.8);
}
+.widget .conv-participants {
+ color: #BBB;
+}
+
+.widget .active:hover .conv-participants, .widget .active:focus .conv-participants {
+ color: inherit;
+}
+
.help-block, .comment-icon, .jot-icons, .admin-icons {
color: inherit;
}
@@ -450,3 +463,5 @@ a:hover > .icon-trash {
background-color: #43488A !important;
}
}
+
+
diff --git a/view/theme/redbasic/schema/boxy.css b/view/theme/redbasic/schema/boxy.css
index ad3e587f0..43ef3e34e 100644
--- a/view/theme/redbasic/schema/boxy.css
+++ b/view/theme/redbasic/schema/boxy.css
@@ -3,9 +3,5 @@
}
.wall-item-content-wrapper.comment {
- border-width: 0px 0px 1px 0px;
-}
-
-.hide-comments-outer {
- border-width: 1px 0px 1px 0px;
+ border-bottom: 1px solid #ccc;
}
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 936f74761..6ed2501e1 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -5,12 +5,19 @@
.vcard, #contact-block, .widget {
background-color: transparent;
+ border: none;
border-bottom: 1px solid #333;
border-radius: 0px
}
#profile-photo-wrapper {
- border:none;
+ border: none;
+}
+
+#profile-edit-default-desc {
+ background-color: #665029;
+ color: #FFF;
+ padding: 20px;
}
.photo {
@@ -88,7 +95,7 @@
background-color: #111;
}
-.jotnets-wrapper > a.btn {
+a.btn, aside a {
font-weight: 400 !important;
}
@@ -330,11 +337,26 @@ pre {
text-decoration: underline;
}
-
-
@media (min-width: 768px) {
.nav-tabs.nav-justified > li > a {
border-bottom: 1px solid #333;
}
}
+#profile-jot-wrapper {
+ background-color: inherit;
+ border: none;
+}
+
+.nav-tabs.nav-justified {
+ background-color: inherit;
+ border: none;
+}
+
+.table-striped > tbody > tr:nth-of-type(2n+1), .table-hover > tbody > tr:hover {
+ background-color: #191919;
+}
+
+.table > tbody > tr > td {
+ border-color: #888;
+}
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index f69ba3450..ba9771a40 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -5,6 +5,7 @@
.vcard, #contact-block, .widget {
background-color: transparent;
+ border: none;
border-bottom: 1px solid #fff;
}
@@ -75,6 +76,10 @@
background-color: #fff;
}
+a.btn, aside a {
+ font-weight: 400 !important;
+}
+
.btn-default {
background-color: #fff;
border-color: #000;
@@ -261,4 +266,12 @@ pre {
}
}
+#profile-jot-wrapper {
+ background-color: inherit;
+ border: none;
+}
+.nav-tabs.nav-justified {
+ background-color: inherit;
+ border: none;
+}
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index 1f0a2f1e6..e6901143b 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -5,6 +5,7 @@
.vcard, #contact-block, .widget {
background-color: transparent;
+ border: none;
border-bottom: 1px solid #fff;
}
@@ -75,6 +76,10 @@
background-color: #000;
}
+a.btn, aside a {
+ font-weight: 400 !important;
+}
+
.btn-default {
background-color: #000;
border-color: #143D12;
@@ -197,6 +202,7 @@ a.rconnect, a.rateme, div.rateme {
text-decoration: underline;
background-color: #000;
color: #50f148;
+ border-color: #143D12;
}
aside .nav > li > a:hover, aside .nav > li > a:focus {
@@ -278,4 +284,24 @@ pre {
}
}
+#profile-jot-wrapper {
+ background-color: inherit;
+ border: none;
+}
+
+.nav-tabs.nav-justified {
+ background-color: inherit;
+ border: none;
+}
+
+.table-striped > tbody > tr:nth-of-type(2n+1) {
+ background-color: #000;
+}
+.table-hover > tbody > tr:hover {
+ background-color: #143D12;
+}
+
+.table > tbody > tr > td {
+ border-color: #143D12;
+}
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index 627f3ee5c..a2d024881 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -5,6 +5,7 @@
.vcard, #contact-block, .widget {
background-color: transparent;
+ border: none;
border-bottom: 1px solid #fff;
}
@@ -71,6 +72,10 @@
background-color: #000;
}
+a.btn, aside a {
+ font-weight: 400 !important;
+}
+
.btn-default {
background-color: #000;
border-color: #fff;
@@ -257,4 +262,20 @@ pre {
}
}
+#profile-jot-wrapper {
+ background-color: inherit;
+ border: none;
+}
+
+.nav-tabs.nav-justified {
+ background-color: inherit;
+ border: none;
+}
+.table-striped > tbody > tr:nth-of-type(2n+1), .table-hover > tbody > tr:hover {
+ background-color: #030303;
+}
+
+.table > tbody > tr > td {
+ border-color: #FFF;
+}
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index cdc9de489..0ec6d1741 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -1,4 +1,6 @@
+{{if $theme == redbasic}}
{{include file="field_select.tpl" field=$schema}}
+{{/if}}
{{include file="field_checkbox.tpl" field=$align_left}}
{{include file="field_checkbox.tpl" field=$narrow_navbar}}
{{include file="field_input.tpl" field=$converse_width}}