harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs 2017-08-01 18:20:34 -07:00
commit 6e9fb9b9fd
9 changed files with 9803 additions and 10388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Zotlabs/Lib/Apps.php
View File

@ -169,7 +169,15 @@ class Apps {
$requires = explode(',',$ret['requires']);
foreach($requires as $require) {
$require = trim(strtolower($require));
$config = false;
if(substr($require, 0, 7) == 'config:') {
$config = true;
$require = ltrim($require, 'config:');
}
$toggle = (($require[0] == '!') ? 0 : 1);
switch($require) {
case 'nologin':
if(local_channel())
@ -192,9 +200,10 @@ class Apps {
unset($ret);
break;
default:
$unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true);
$unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true);
if($config)
$unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true);
else
$unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true);
if($unset)
unset($ret);
break;
@ -308,9 +317,18 @@ class Apps {
if($k === 'requires') {
$requires = explode(',',$v);
foreach($requires as $require) {
$require = trim(strtolower($require));
$config = false;
if(substr($require, 0, 7) == 'config:') {
$config = true;
$require = ltrim($require, 'config:');
}
$toggle = (($require[0] == '!') ? 0 : 1);
switch($require) {
case 'nologin':
if(local_channel())
@ -334,9 +352,10 @@ class Apps {
return '';
break;
default:
$unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true);
$unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true);
if($config)
$unset = ((get_config('system', ltrim($require, '!')) == $toggle) ? false : true);
else
$unset = ((local_channel() && feature_enabled(local_channel(),$require)) ? false : true);
if($unset)
return '';
break;

4
Zotlabs/Module/Ping.php
View File

@ -147,11 +147,13 @@ class Ping extends \Zotlabs\Web\Controller {
$pubs = q("SELECT count(id) as total from item
WHERE uid = %d
AND author_xchan != '%s'
AND obj_type != '%s'
AND item_unseen = 1
AND created > '" . datetime_convert('UTC','UTC',$_SESSION['static_loadtime']) . "'
$item_normal",
intval($sys['channel_id']),
dbesc(get_observer_hash())
dbesc(get_observer_hash()),
dbesc(ACTIVITY_OBJ_FILE)
);
if($pubs)

2
app/pubstream.apd
View File

@ -1,6 +1,6 @@
version: 1
url: $baseurl/pubstream
requires: !disable_discover_tab
requires: config:!disable_discover_tab
name: Public Stream
photo: icon:globe
categories: Social

133
include/attach.php
View File

@ -1605,7 +1605,10 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
$folder_hash = $object['folder'];
$r_perms = recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny_cid, $arr_deny_gid, $folder_hash);
$r_perms = attach_recursive_perms($arr_allow_cid, $arr_allow_gid, $arr_deny_cid, $arr_deny_gid, $folder_hash);
if($r_perms === false) //nobody has recursive perms - nobody must be notified
return;
//split up returned perms
$arr_allow_cid = $r_perms['allow_cid'];
@ -1768,7 +1771,7 @@ function get_file_activity_object($channel_id, $hash, $url) {
}
/**
* @brief Returns array of channels which have recursive permission for a file
* @brief Returns recursive permissions array or false if nobody has recursive permissions
*
* @param array $arr_allow_cid
* @param array $arr_allow_gid
@ -1776,19 +1779,20 @@ function get_file_activity_object($channel_id, $hash, $url) {
* @param array $arr_deny_gid
* @param string $folder_hash
*/
function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny_cid, $arr_deny_gid, $folder_hash) {
function attach_recursive_perms($arr_allow_cid, $arr_allow_gid, $arr_deny_cid, $arr_deny_gid, $folder_hash) {
$ret = array();
$parent_arr = array();
$count_values = array();
$poster = App::get_observer();
//turn allow_gid into allow_cid's
foreach($arr_allow_gid as $gid) {
$in_group = group_get_members($gid);
//lookup all channels in sharee group and add them to sharee $arr_allow_cid
if($arr_allow_gid) {
$in_group = expand_groups($arr_allow_gid);
$arr_allow_cid = array_unique(array_merge($arr_allow_cid, $in_group));
}
//count existing parent folders - we will compare to that count later
$count = 0;
while($folder_hash) {
$x = q("SELECT allow_cid, allow_gid, deny_cid, deny_gid, folder FROM attach WHERE hash = '%s' LIMIT 1",
@ -1797,30 +1801,20 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny
//only process private folders
if($x[0]['allow_cid'] || $x[0]['allow_gid'] || $x[0]['deny_cid'] || $x[0]['deny_gid']) {
$parent_arr['allow_cid'][] = expand_acl($x[0]['allow_cid']);
$parent_arr['allow_gid'][] = expand_acl($x[0]['allow_gid']);
/**
* @TODO should find a much better solution for the allow_cid <-> allow_gid problem.
* Do not use allow_gid for now. Instead lookup the members of the group directly and add them to allow_cid.
* */
if($parent_arr['allow_gid']) {
foreach($parent_arr['allow_gid'][$count] as $gid) {
$in_group = group_get_members($gid);
$parent_arr['allow_cid'][$count] = array_unique(array_merge($parent_arr['allow_cid'][$count], $in_group));
}
}
$parent_arr['deny_cid'][] = expand_acl($x[0]['deny_cid']);
$parent_arr['deny_gid'][] = expand_acl($x[0]['deny_gid']);
//this is the number of all existing parent folders - we will compare to that count later
$count++;
}
$folder_hash = $x[0]['folder'];
}
//logger(EOL . 'parent_arr: ' . print_r($parent_arr,true));
//if none of the parent folders is private just return file perms
if(!$parent_arr['allow_cid'] && !$parent_arr['allow_gid'] && !$parent_arr['deny_cid'] && !$parent_arr['deny_gid']) {
$ret['allow_gid'] = $arr_allow_gid;
@ -1831,7 +1825,7 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny
return $ret;
}
//if there are no perms on the file we get them from the first parent folder
//if there are no perms on the file we will work with the perms from the first parent folder
if(!$arr_allow_cid && !$arr_allow_gid && !$arr_deny_cid && !$arr_deny_gid) {
$arr_allow_cid = $parent_arr['allow_cid'][0];
$arr_allow_gid = $parent_arr['allow_gid'][0];
@ -1839,51 +1833,82 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny
$arr_deny_gid = $parent_arr['deny_gid'][0];
}
//allow_cid
$r_arr_allow_cid = false;
foreach ($parent_arr['allow_cid'] as $folder_arr_allow_cid) {
foreach ($folder_arr_allow_cid as $ac_hash) {
$count_values[$ac_hash]++;
/***
*
* check if sharee has perms for all parent folders
*
***/
$r_arr_allow_cid = [];
if($parent_arr['allow_cid']) {
//check sharee arr_allow_cid against allow_cid of all parent folders
foreach($parent_arr['allow_cid'] as $folder_arr_allow_cid) {
foreach($folder_arr_allow_cid as $ac_hash) {
$count_values[$ac_hash]++;
}
}
}
foreach ($arr_allow_cid as $fac_hash) {
if($count_values[$fac_hash] == $count)
$r_arr_allow_cid[] = $fac_hash;
foreach($arr_allow_cid as $fac_hash) {
if($count_values[$fac_hash] == $count)
$r_arr_allow_cid[] = $fac_hash;
}
//logger(EOL . 'r_arr_allow_cid: ' . print_r($r_arr_allow_cid,true));
}
//allow_gid
$r_arr_allow_gid = false;
foreach ($parent_arr['allow_gid'] as $folder_arr_allow_gid) {
foreach ($folder_arr_allow_gid as $ag_hash) {
$count_values[$ag_hash]++;
if($parent_arr['allow_gid']) {
//check sharee arr_allow_cid against members of allow_gid of all parent folders
foreach($parent_arr['allow_gid'] as $folder_arr_allow_gid) {
//get the group members
$folder_arr_allow_cid = expand_groups($folder_arr_allow_gid);
foreach($folder_arr_allow_cid as $ac_hash) {
$count_values[$ac_hash]++;
}
}
foreach($arr_allow_cid as $fac_hash) {
if($count_values[$fac_hash] == $count)
$r_arr_allow_cid[] = $fac_hash;
}
//logger(EOL . 'groups - r_arr_allow_cid: ' . print_r($r_arr_allow_cid,true));
}
foreach ($arr_allow_gid as $fag_hash) {
if($count_values[$fag_hash] == $count)
$r_arr_allow_gid[] = $fag_hash;
/***
*
* check if sharee is denied somewhere in parent folders and deny him if so
*
***/
//deny_cid
$r_arr_deny_cid = [];
if($parent_arr['deny_cid']) {
foreach($parent_arr['deny_cid'] as $folder_arr_deny_cid) {
$r_arr_deny_cid = array_merge($arr_deny_cid, $folder_arr_deny_cid);
}
$r_arr_deny_cid = array_unique($r_arr_deny_cid);
//logger(EOL . 'r_arr_deny_cid: ' . print_r($r_arr_deny_cid,true));
}
//deny_gid
foreach($parent_arr['deny_gid'] as $folder_arr_deny_gid) {
$r_arr_deny_gid = array_merge($arr_deny_gid, $folder_arr_deny_gid);
}
$r_arr_deny_gid = array_unique($r_arr_deny_gid);
$r_arr_deny_gid = [];
//deny_cid
foreach($parent_arr['deny_cid'] as $folder_arr_deny_cid) {
$r_arr_deny_cid = array_merge($arr_deny_cid, $folder_arr_deny_cid);
if($parent_arr['deny_cid']) {
foreach($parent_arr['deny_gid'] as $folder_arr_deny_gid) {
$r_arr_deny_gid = array_merge($arr_deny_gid, $folder_arr_deny_gid);
}
$r_arr_deny_gid = array_unique($r_arr_deny_gid);
//logger(EOL . 'r_arr_deny_gid: ' . print_r($r_arr_dr_arr_deny_gideny_cid,true));
}
$r_arr_deny_cid = array_unique($r_arr_deny_cid);
//if none is allowed restrict to self
if(($r_arr_allow_gid === false) && ($r_arr_allow_cid === false)) {
$ret['allow_cid'] = [$poster['xchan_hash']];
} else {
$ret['allow_gid'] = $r_arr_allow_gid;
$ret['allow_cid'] = $r_arr_allow_cid;
$ret['deny_gid'] = $r_arr_deny_gid;
$ret['deny_cid'] = $r_arr_deny_cid;
}
//if no channel is allowed return false
if(! $r_arr_allow_cid)
return false;
$ret['allow_gid'] = []; // eventual group members are already collected in $r_arr_allow_cid
$ret['allow_cid'] = $r_arr_allow_cid;
$ret['deny_gid'] = $r_arr_deny_gid;
$ret['deny_cid'] = $r_arr_deny_cid;
return $ret;
}

19475
util/hmessages.po
View File

File diff suppressed because it is too large Load Diff

2
view/css/bootstrap-red.css vendored
View File

@ -5,13 +5,13 @@
nav .badge {
position: absolute;
font-size: 0.75rem;
line-height: 0.75;
}
@media screen and (min-width: 767px) {
nav .badge {
top: 0px;
left: 0px;
line-height: 0.75;
}
}

1
view/theme/redbasic/css/style.css
View File

@ -483,6 +483,7 @@ footer {
#nav-search-text {
width: 280px;
padding: .15rem .5rem;
}
#nav-search-text::-webkit-input-placeholder {

515
view/theme/redbasic/schema/bluegrid.css
View File

@ -1,515 +0,0 @@
body {
background-size: auto;
}
.generic-content-wrapper-styled {
background-color: rgba(67,72,138,.8);
color: #FFF;
}
.generic-content-wrapper-styled .btn-default:hover, #profile-jot-wrapper .btn-default:hover {
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);
}
.generic-content-wrapper, .profile-jot-text, .comment-edit-text-empty, .comment-edit-text-full, input.widget-input, .wall-item-content-wrapper, .section-title-wrapper, .section-content-wrapper {
border-radius: 0px !important;
}
.generic-content-wrapper {
background-color: rgba(255,255,255,.8);
color: #4d4d4d;
}
.wall-item-content-wrapper {
background-color: #FFF;
}
.hide-comments-outer, .wall-item-content-wrapper.comment, .wall-item-comment-wrapper {
background-color: transparent;
}
.generic-content-wrapper-styled .generic-content-wrapper {
color: #4D4D4D;
}
.generic-content-wrapper-styled .generic-content-wrapper a {
color: #43488A;
}
.generic-content-wrapper #profile-jot-wrapper {
background-color: transparent;
color: #4D4D4D;
}
.generic-content-wrapper input#jot-title, .generic-content-wrapper input#jot-pagetitle {
color: #4D4D4D;
}
.generic-content-wrapper input#jot-title:hover, .generic-content-wrapper input#jot-title:focus {
color: #4D4D4D;
border-radius: 0px;
}
.fn, .widget h3, .nav-tabs a, .generic-content-wrapper-styled a, .dropdown-menu > li > a, #channels-desc, input#jot-title {
color: #fff;
border-radius: 0px
}
ul.dropdown-menu.acpopup > li.textcomplete-item > a {
color: #43488A;
}
ul.dropdown-menu.acpopup > li.textcomplete-item > a:hover, ul.dropdown-menu.acpopup > li.textcomplete-item > a:focus {
background-color: #43488A;
color: #FFF;
cursor: pointer;
}
input#jot-title:hover, input#jot-title:focus {
color: #43488A;
border-radius: 0px;
}
.navbar-inverse {
background-color: transparent;
border-color: transparent;
background-image: none;
}
.navbar-inverse .navbar-nav > .active > a {
background-image: none;
background: rgba(255,255,255,.5);
}
.navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus {
background: rgba(255,255,255,.5);
}
.navbar-inverse .navbar-nav > li > a:hover,
.navbar-inverse .navbar-nav > li > a:focus {
color: #43488A;
background: rgba(255,255,255,.5);
}
.navbar-inverse .navbar-nav > .open > a,
.navbar-inverse .navbar-nav > .open > a:hover,
.navbar-inverse .navbar-nav > .open > a:focus {
background-color: #43488A;
color: #fff;
}
#nav-search-text {
color: #fff;
background-color: #43488A;
border-radius: 0px;
border-color: transparent;
}
nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dropdown-menu, .section-content-wrapper .dropdown-menu {
background-color: #43488A;
color: #fff;
border-radius: 0;
border: none;
box-shadow: 0px 6px 12px rgba(45,48,92,.176);
}
.dropdown-menu > li > a:focus, .dropdown-menu > li > a:hover {
color: #43488A;
background-color: rgba(255,255,255,.7);
text-decoration: underline;
}
.vcard .dropdown-menu {
background-color: rgba(255,255,255,.97);
border-radius: 0;
border: none;
box-shadow: 0px 6px 12px rgba(169,169,169,.176);
}
.vcard .dropdown-menu a, .fc-today {
color: #43488A;
}
.vcard .dropdown-menu > li > a:focus, .vcard .dropdown-menu > li > a:hover {
color: #43488A;
background-color: rgba( 255,255,255,.7);
text-decoration: underline;
}
nav .badge {
background-color: rgba(255,255,255,.8);
color: #43488A;
border-radius: 0px !important;
}
nav .badge:hover, nav .badge:focus {
background-color: rgba(67,72,138,.8);
color: #FFF;
}
.field.checkbox > div > input:checked + label .onoffswitch-switch {
background-color: #43488A;
}
.widget .field.checkbox:hover label {
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;
}
#adminpage table tr:hover, #adminpage table tr:hover a, #adminpage table tr td.tools a:hover, #adminpage table tr:focus, #adminpage table tr:focus a, #adminpage table tr td.tools a:focus {
color: #43488A;
}
#adminpage table tr:hover .tools a, #adminpage table tr:focus .tools a, .generic-content-wrapper-styled > .descriptive-text {
color: #FFF;
}
.generic-content-wrapper-styled > .sources-links {
font-weight: bold;
}
.wall-item-tools .btn {
border-color: #43488A;
}
.vcard, #contact-block, .widget {
background-color: rgba(67,72,138,.8);
color: #fff;
border-radius: 0;
border: none;
box-shadow: 0px 6px 12px rgba(45,48,92,.176);
}
.tags a {
color: inherit;
}
#profile-photo-wrapper {
border: none;
}
.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
color: #43488A;
text-decoration: none;
border: none;
}
.nav-tabs > li.active {
background-color: rgba(255,255,255,.5);
}
.nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover {
border-color: transparent;
}
.nav-tabs.nav-justified {
background-color: rgba(67,72,138,.8);
border-bottom: 1px solid rgba(255,255,255,.5);
border-radius: 0px;
}
.nav-tabs.nav-justified > li > a {
border-bottom: 1px solid transparent;
border-radius: 0px;
}
.nav > li > a:focus, .nav > li > a:hover {
text-decoration: underline;
background-color: rgba(255,255,255,.5);
color: #43488A;
border-radius: 0;
border-color: transparent;
}
.nav > li > a {
color: #FFF;
border-radius: 0px;
}
.fc-event {
border: none !important;
background-color: rgba(255,255,255,.7) !important;
color: #43488A !important;
text-shadow: none !important;
}
div.rateme {
border-radius: 0px;
font-weight: 400;
}
div.rateme:hover, div.rateme:focus, a.rateme:hover, a.rateme:focus {
background-color: #43488A;
border-radius: 0px;
color: #FFF;
font-weight: 400;
-webkit-transition: all .3s ease-in-out;
-moz-transition: all .3s ease-in-out;
transition: all .3s ease-in-out;
}
.info {
background: rgba(255,255,255,.7) url("/images/hz-32.png") no-repeat scroll 15px center !important;
color: #43488A !important;
}
.notice {
background: rgba(215,43,52,.7) url("/images/hz-white-32.png") no-repeat scroll 15px center !important;
color: #FFF !important;
}
#chatTopBar {
background-color: rgba(255,255,255,.8);
color: #4d4d4d;
height: 500px;
width: 596px;
overflow-y: auto;
}
.chat-item-text {
border-radius: 0px;
padding: 5px;
background-color: #FFF;
}
input {
border-radius: 0px;
}
.home-welcome {
color: #FFF;
margin-bottom: 30px;
}
#login-main {
margin-top: 0;
color: #EEE;
}
#remember_me_container label:hover, #remember_container label:hover {
color: #FFF;
}
#login-main #lost-password-link, #login-main #register-link {
color: #FFF;
}
#nav-login .modal-content {
background-color: #43488A;
background-image: url('/images/bggrid.png');
box-shadow: 0 5px 15px rgba(0,0,0,.3);
-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.3);
}
#nav-login h3, #nav-login button.close {
color: #EEE;
}
#nav-login .modal-header {
border-bottom: none;
}
.directory-item {
margin-bottom: 0px;
padding-bottom: 20px;
background-color: #FFF;
}
.directory-item.lframe {
background-color: transparent !important;
}
.contact-entry-wrapper {
border: 1px solid rgba(255,255,255,.5);
}
.contact-entry-edit:hover a, .contact-entry-edit:focus a, .generic-content-wrapper-styled > p > span.btn.btn-default > a:hover,.generic-content-wrapper-styled > p > span.btn.btn-default > a:focus, div#profile-edit-links a:hover, div#profile-edit-links a:focus {
color: #43488A;
}
.profile-edit-side-link, input#profile-photo-upload, .allcontact-link, #newchannel-form .descriptive-paragraph {
color: #FFF;
}
.profile-edit-side-link:hover, .profile-edit-side-link:focus {
color: #FFF;
text-decoration: none;
}
.section-content-info-wrapper {
color: #fff;
background-color: #43488A;
}
.section-content-info-wrapper a {
color: #fff;
}
.btn, #event-edit-form .btn, input.directory-rating-submit {
border: 1px solid #FFF;
color: #FFF;
background-color: #43488A;
border-radius: 0;
font-weight: 400;
-webkit-transition: all .3s ease-in-out;
-moz-transition: all .3s ease-in-out;
transition: all .3s ease-in-out;
}
.btn:hover, .btn:focus, #event-edit-form .btn:hover, #event-edit-form .btn:focus {
border: 1px solid #FFF;
outline: 0;
color: #43488A;
background-color: #FFF;
}
.btn-default:hover, .btn-default:focus, .open > .dropdown-toggle.btn-default, input.directory-rating-submit:hover, input.directory-rating-submit:focus {
border: 1px solid #43488A;
outline: 0;
color: #43488A;
background-color: #FFF;
}
.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit, input#dbtn-submit, input#newchannel-submit-button, input#contacts-search-submit, input#register-submit-button {
background-color: #FFF;
color: #43488A;
border-radius: 0px;
-webkit-transition: all .3s ease-in-out;
-moz-transition: all .3s ease-in-out;
transition: all .3s ease-in-out;
}
.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover, input#dbtn-submit:hover, input#dbtn-submit:focus, input#newchannel-submit-button:hover, input#newchannel-submit-button:focus, input#contacts-search-submit:hover, input#contacts-search-submit:focus, input#register-submit-button:hover, input#register-submit-button:focus {
border-color: #FFF;
background-color: #43488A;
color: #FFF;
border-radius: 0px;
}
.comment-tools .btn, #prvmail-tools .btn, .generic-content-wrapper .btn {
border: 1px solid #43488A;
color: #43488A;
background-color: #FFF;
}
.comment-tools .btn:hover, .comment-tools .btn:focus, #prvmail-tools .btn:hover, #prvmail-tools .btn:focus, .generic-content-wrapper .btn:hover, .generic-content-wrapper .btn:focus {
border: 1px solid #43488A !important;
color: #FFF;
background-color: #43488A;
}
.comment-tools .btn-primary, #prvmail-submit .btn-primary, .settings-submit-wrapper .btn-primary, .generic-content-wrapper .btn-primary {
background-color: #43488A;
color: #FFF;
border: 1px solid #43488A;
}
.comment-tools .btn-primary:hover, .comment-tools .btn-primary:focus, #prvmail-submit .btn-primary:hover, #prvmail-submit .btn-primary:focus, .settings-submit-wrapper .btn-primary:hover, .settings-submit-wrapper .btn-primary:focus, .generic-content-wrapper .btn-primary:hover, .generic-content-wrapper .btn-primary:focus {
border-color: #43488A;
background-color: #FFF;
color: #43488A;
}
.btn-success {
color: #FFF !important;
background-color: #5CB85C !important;
border-color: #4CAE4C !important;
}
.btn-success:hover, .btn-success:focus {
color: #FFF !important;
background-color: #449D44 !important;
border-color: #398439 !important;
}
.btn-warning {
color: #FFF !important;
background-color: #F0AD4E !important;
border-color: #EEA236 !important;
}
.btn-warning:hover, .btn-warning:focus {
color: #FFF !important;
background-color: #EC971F !important;
border-color: #D58512 !important;
}
.btn-danger, form#chat-destroy > input {
background-color: #D9534F !important;
border-color: #D43F3A !important;
color: #FFF !important;
}
.btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus {
color: #FFF !important;
background-color: #C9302C !important;
border-color: #AC2925 !important;
}
a:hover > .fa-trash-o {
color: #C9302C !important;
}
@media screen and (max-width: 767px) {
.navbar-inverse .navbar-collapse {
background-color: #43488A;
border: none;
}
.navbar-inverse .navbar-toggle {
border-color: #576295;
background-color: #43488A;
border-radius: 0px;
}
.navbar-inverse .navbar-toggle .icon-bar {
background-color: #FFF;
}
.navbar-inverse .navbar-toggle .fa-arrow-circle-down, .navbar-inverse .navbar-toggle .fa-arrow-circle-right, .navbar-inverse .navbar-toggle .fa-arrow-circle-up, .navbar-inverse .navbar-toggle .fa-arrow-circle-left, .navbar-inverse .navbar-toggle .fa-question-circle {
color: #FFF;
}
.navbar-inverse .navbar-toggle:hover .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-left, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-left {
color: #43488A;
}
.navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {
background-color: #FFF !important;
}
.navbar-toggle:hover .icon-bar , .navbar-toggle:focus .icon-bar {
background-color: #43488A !important;
}
}
.help-content {
color: #FFF;
border: none;
}
.help-content a {
color: #FFF;
font-weight: 600;
}
.help-content-open {
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
}

28
view/theme/redbasic/schema/bluegrid.php
View File

@ -1,28 +0,0 @@
<?php
if (! $nav_bg)
$nav_bg = "#FFF";
if (! $nav_active_gradient_top)
$nav_active_gradient_top = "#FFF";
if (! $nav_active_gradient_bottom)
$nav_active_gradient_bottom = "#43488A";
if (! $nav_bd)
$nav_bd = "#fff";
if (! $nav_icon_colour)
$nav_icon_colour = "#FFF";
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#43488A";
if (! $banner_colour)
$banner_colour = "#fff";
if (! $bgcolour)
$bgcolour = "#43488A";
if (! $background_image)
$background_image = "/images/bggrid.png";
if (! $link_colour)
$link_colour = "#43488A";