mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 10:15:12 +00:00
Merge branch 'dev' into red
This commit is contained in:
commit
4c526c7d3d
3 changed files with 27 additions and 3 deletions
|
@ -575,7 +575,7 @@ class Channel {
|
|||
'$removeme' => t('Remove Channel'),
|
||||
'$removechannel' => t('Remove this channel.'),
|
||||
'$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);
|
||||
|
|
|
@ -152,7 +152,7 @@ EOT;
|
|||
if(! local_channel()) {
|
||||
$nav['rusermenu'] = array(
|
||||
$homelink,
|
||||
t('Get me home'),
|
||||
t('Take me home'),
|
||||
'logout',
|
||||
t('Log me out of this site')
|
||||
);
|
||||
|
|
|
@ -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 {
|
||||
background-color: rgba(67,72,138,.97);
|
||||
background-color: #43488A;
|
||||
color: #fff;
|
||||
border-radius: 0;
|
||||
border: none;
|
||||
|
@ -304,6 +304,30 @@ input {
|
|||
|
||||
#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 {
|
||||
|
|
Loading…
Reference in a new issue