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

Merge branch 'dev' into red

Browse Source
This commit is contained in:
zotlabs 2017-03-11 18:02:59 -08:00
commit 4c526c7d3d
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Settings/Channel.php
View File

@ -575,7 +575,7 @@ class Channel {
'$removeme' => t('Remove Channel'), '$removeme' => t('Remove Channel'),
'$removechannel' => t('Remove this channel.'), '$removechannel' => t('Remove this channel.'),
'$firefoxshare' => t('Firefox Share $Projectname provider'), '$firefoxshare' => t('Firefox Share $Projectname provider'),
'$cal_first_day' => array('first_day', t('Start calendar week on monday'), ((get_pconfig(local_channel(),'system','cal_first_day')) ? 1 : ''), '', $yes_no), '$cal_first_day' => array('first_day', t('Start calendar week on Monday'), ((get_pconfig(local_channel(),'system','cal_first_day')) ? 1 : ''), '', $yes_no),
)); ));
call_hooks('settings_form',$o); call_hooks('settings_form',$o);

2
include/nav.php
View File

@ -152,7 +152,7 @@ EOT;
if(! local_channel()) { if(! local_channel()) {
$nav['rusermenu'] = array( $nav['rusermenu'] = array(
$homelink, $homelink,
t('Get me home'), t('Take me home'),
'logout', 'logout',
t('Log me out of this site') t('Log me out of this site')
); );

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

@ -116,7 +116,7 @@ input#jot-title:hover, input#jot-title:focus {
} }
nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dropdown-menu, .section-content-wrapper .dropdown-menu { nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dropdown-menu, .section-content-wrapper .dropdown-menu {
background-color: rgba(67,72,138,.97); background-color: #43488A;
color: #fff; color: #fff;
border-radius: 0; border-radius: 0;
border: none; border: none;
@ -304,6 +304,30 @@ input {
#login-main { #login-main {
margin-top: 0; 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 { .directory-item {