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

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2014-03-08 12:40:46 -08:00
commit 6a5c2fb9da
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
boot.php
View File

@ -491,7 +491,7 @@ define ( 'ACCOUNT_PENDING', 0x0010 );
define ( 'ACCOUNT_ROLE_ALLOWCODE', 0x0001 ); define ( 'ACCOUNT_ROLE_ALLOWCODE', 0x0001 );
define ( 'ACCOUNT_ROLE_SYSTEM', 0x0002 ); define ( 'ACCOUNT_ROLE_SYSTEM', 0x0002 );
define ( 'ACCOUNT_ROLE_DEVELOPER', 0x0004 );
define ( 'ACCOUNT_ROLE_ADMIN', 0x1000 ); define ( 'ACCOUNT_ROLE_ADMIN', 0x1000 );
/** /**
@ -1704,6 +1704,15 @@ function is_site_admin() {
return false; return false;
} }
function is_developer() {
$a = get_app();
if((intval($_SESSION['authenticated']))
&& (is_array($a->account))
&& ($a->account['account_roles'] & ACCOUNT_ROLE_DEVELOPER))
return true;
return false;
}
function load_contact_links($uid) { function load_contact_links($uid) {

2
view/css/default.css
View File

@ -21,5 +21,5 @@ section {
width: 100%; width: 100%;
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
padding: 65px 0px 200px 10px; padding: 65px 15px 200px 10px;
} }

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

@ -2253,6 +2253,10 @@ blockquote {
border-color: $nav_bd; border-color: $nav_bd;
} }
.navbar-inverse .navbar-collapse {
border-color: $nav_bd;
}
.navbar-inverse .navbar-nav > .active > a { .navbar-inverse .navbar-nav > .active > a {
background-image: -webkit-linear-gradient(top, $nav_active_gradient_top 0%, $nav_active_gradient_bottom 100%); background-image: -webkit-linear-gradient(top, $nav_active_gradient_top 0%, $nav_active_gradient_bottom 100%);
background-image: linear-gradient(to bottom, $nav_active_gradient_top 0%, $nav_active_gradient_bottom 100%); background-image: linear-gradient(to bottom, $nav_active_gradient_top 0%, $nav_active_gradient_bottom 100%);
@ -2283,12 +2287,24 @@ blockquote {
color: $nav_active_icon_colour; color: $nav_active_icon_colour;
} }
.navbar-inverse .navbar-toggle {
border-color: $nav_bd;
}
.navbar-inverse .navbar-toggle:hover,
.navbar-inverse .navbar-toggle:focus {
background-color: $nav_bg;
}
.navbar-inverse .navbar-toggle .icon-bar {
background-color: $nav_active_icon_colour;
}
#expand-aside { #expand-aside {
color: $nav_active_icon_colour; color: $nav_active_icon_colour;
padding: 7px 10px; padding: 7px 10px;
} }
@media screen and (max-width:767px) { @media (max-width:767px) {
aside#region_1 { aside#region_1 {
background: rgba(0, 0, 0, .1); background: rgba(0, 0, 0, .1);
border-right: 1px solid $nav_bd; border-right: 1px solid $nav_bd;

2
view/theme/redbasic/php/style.php
View File

@ -81,7 +81,7 @@ if(! $a->install) {
if (! $nav_active_gradient_bottom) if (! $nav_active_gradient_bottom)
$nav_active_gradient_bottom = "#282828"; $nav_active_gradient_bottom = "#282828";
if (! $nav_bd) if (! $nav_bd)
$nav_bd = "#080808"; $nav_bd = "#222";
if (! $nav_icon_colour) if (! $nav_icon_colour)
$nav_icon_colour = "#999"; $nav_icon_colour = "#999";
if (! $nav_active_icon_colour) if (! $nav_active_icon_colour)